Upgrade Tipue to Tipue 7.0

1 files changed, 252 insertions, 164 deletions

diff --git a/pelican-bootstrap3/static/tipuesearch/tipuesearch.js b/pelican-bootstrap3/static/tipuesearch/tipuesearch.js
index 60e5281..e616686 100644
--- a/pelican-bootstrap3/static/tipuesearch/tipuesearch.js
+++ b/pelican-bootstrap3/static/tipuesearch/tipuesearch.js
@@ -1,7 +1,7 @@
 
 /*
-Tipue Search 5.0
-Copyright (c) 2015 Tipue
+Tipue Search 7.0
+Copyright (c) 2018 Tipue
 Tipue Search is released under the MIT License
 http://www.tipue.com/search
 */
@@ -13,79 +13,28 @@ http://www.tipue.com/search
 
           var set = $.extend( {
           
-               'show'                   : 7,
-               'newWindow'              : false,
-               'showURL'                : true,
-               'showTitleCount'         : true,
-               'minimumLength'          : 3,
-               'descriptiveWords'       : 25,
-               'highlightTerms'         : true,
-               'highlightEveryTerm'     : false,
-               'mode'                   : 'static',
-               'liveDescription'        : '*',
-               'liveContent'            : '*',
-               'contentLocation'        : 'tipuesearch/tipuesearch_content.json',
-               'debug'                  : false
-          
+          'contextBuffer'          : 60,
+          'contextLength'          : 60,
+          'contextStart'           : 90,
+          'debug'                  : false,
+          'descriptiveWords'       : 25,
+          'footerPages'            : 3,
+          'highlightTerms'         : true,
+          'imageZoom'              : true,
+          'minimumLength'          : 3,
+          'newWindow'              : false,
+          'show'                   : 10,
+          'showContext'            : true,
+          'showRelated'            : true,
+          'showTime'               : true,
+          'showTitleCount'         : true,
+          'showURL'                : true,
+          'wholeWords'             : true
           }, options);
           
           return this.each(function() {
-
-               var tipuesearch_in = {
-                    pages: []
-               };
-               $.ajaxSetup({
-                    async: false
-               });
-               var tipuesearch_t_c = 0;
-
-               if (set.mode == 'live')
-               {
-                    for (var i = 0; i < tipuesearch_pages.length; i++)
-                    {
-                         $.get(tipuesearch_pages[i])
-                              .done(function(html)
-                              {
-                                   var cont = $(set.liveContent, html).text();
-                                   cont = cont.replace(/\s+/g, ' ');
-                                   var desc = $(set.liveDescription, html).text();
-                                   desc = desc.replace(/\s+/g, ' ');
-                                                                      
-                                   var t_1 = html.toLowerCase().indexOf('<title>');
-                                   var t_2 = html.toLowerCase().indexOf('</title>', t_1 + 7);
-                                   if (t_1 != -1 && t_2 != -1)
-                                   {
-                                        var tit = html.slice(t_1 + 7, t_2);
-                                   }
-                                   else
-                                   {
-                                        var tit = tipuesearch_string_1;
-                                   }
-
-                                   tipuesearch_in.pages.push(
-                                   {
-                                        "title": tit,
-                                        "text": desc,
-                                        "tags": cont,
-                                        "url": tipuesearch_pages[i] 
-                                   });    
-                              });
-                    }
-               }
                
-               if (set.mode == 'json')
-               {
-                    $.getJSON(set.contentLocation)
-                         .done(function(json)
-                         {
-                              tipuesearch_in = $.extend({}, json);
-                         });
-               }
-
-               if (set.mode == 'static')
-               {
-                    tipuesearch_in = $.extend({}, tipuesearch);
-               }                              
+               var tipuesearch_t_c = 0;                         
                
                var tipue_search_w = '';
                if (set.newWindow)
@@ -95,8 +44,20 @@ http://www.tipue.com/search
 
                function getURLP(name)
                {
-                    return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.search)||[,""])[1].replace(/\+/g, '%20')) || null;
+                    var locSearch = location.search;
+                    var splitted = (new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(locSearch)||[,""]);
+                    var searchString = splitted[1].replace(/\+/g, '%20');
+                    try
+                    {
+                         searchString = decodeURIComponent(searchString);
+                    }
+                    catch(e)
+                    {
+                         searchString = unescape(searchString);
+                    }
+                    return searchString || null;
                }
+               
                if (getURLP('q'))
                {
                     $('#tipue_search_input').val(getURLP('q'));
@@ -114,29 +75,30 @@ http://www.tipue.com/search
 
                function getTipueSearch(start, replace)
                {
-                    $('#tipue_search_content').hide();
-                    $('#tipue_search_content').html('<div class="tipue_search_spinner"><div class="tipue_search_rect1"></div><div class="tipue_search_rect2"></div><div class="rect3"></div></div>');
-                    $('#tipue_search_content').show();
+                    window.scrollTo(0, 0);
                     
                     var out = '';
-                    var results = '';
                     var show_replace = false;
                     var show_stop = false;
                     var standard = true;
                     var c = 0;
-                    found = [];
+                    var found = [];
                     
-                    var d = $('#tipue_search_input').val().toLowerCase();
-                    d = $.trim(d);
+                    var d_o = $('#tipue_search_input').val();
+                    d_o = d_o.replace(/\+/g, ' ').replace(/\s\s+/g, ' ');
+ 
+                    d_o = $.trim(d_o);
+                    var d = d_o.toLowerCase();
                     
                     if ((d.match("^\"") && d.match("\"$")) || (d.match("^'") && d.match("'$")))
                     {
                          standard = false;
                     }
                     
+                    var d_w = d.split(' ');
+                    
                     if (standard)
                     {
-                         var d_w = d.split(' ');
                          d = '';
                          for (var i = 0; i < d_w.length; i++)
                          {
@@ -196,44 +158,39 @@ http://www.tipue.com/search
                               }
                               d_w = d_t.split(' ');
 
-                              for (var i = 0; i < tipuesearch_in.pages.length; i++)
+                              for (var i = 0; i < tipuesearch.pages.length; i++)
                               {
                                    var score = 0;
-                                   var s_t = tipuesearch_in.pages[i].text;
+                                   var s_t = tipuesearch.pages[i].text;
                                    for (var f = 0; f < d_w.length; f++)
                                    {
-                                        var pat = new RegExp(d_w[f], 'gi');
-                                        if (tipuesearch_in.pages[i].title.search(pat) != -1)
+                                        if (set.wholeWords)
+                                        {
+                                             var pat = new RegExp('\\b' + d_w[f] + '\\b', 'gi');
+                                        }
+                                        else
                                         {
-                                             var m_c = tipuesearch_in.pages[i].title.match(pat).length;
+                                             var pat = new RegExp(d_w[f], 'gi');
+                                        }
+                                        if (tipuesearch.pages[i].title.search(pat) != -1)
+                                        {
+                                             var m_c = tipuesearch.pages[i].title.match(pat).length;
                                              score += (20 * m_c);
                                         }
-                                        if (tipuesearch_in.pages[i].text.search(pat) != -1)
+                                        if (tipuesearch.pages[i].text.search(pat) != -1)
                                         {
-                                             var m_c = tipuesearch_in.pages[i].text.match(pat).length;
+                                             var m_c = tipuesearch.pages[i].text.match(pat).length;
                                              score += (20 * m_c);
                                         }
-                                        
-                                        if (set.highlightTerms)
+                                        if (tipuesearch.pages[i].tags)
                                         {
-                                             if (set.highlightEveryTerm) 
-                                             {
-                                                  var patr = new RegExp('(' + d_w[f] + ')', 'gi');
-                                             }
-                                             else
+                                             if (tipuesearch.pages[i].tags.search(pat) != -1)
                                              {
-                                                  var patr = new RegExp('(' + d_w[f] + ')', 'i');
+                                                  var m_c = tipuesearch.pages[i].tags.match(pat).length;
+                                                  score += (10 * m_c);
                                              }
-                                             s_t = s_t.replace(patr, "<span class=\"h01\">$1</span>");
                                         }
-                                        
-                                        if (tipuesearch_in.pages[i].tags.search(pat) != -1)
-                                        {
-                                             var m_c = tipuesearch_in.pages[i].tags.match(pat).length;
-                                             score += (10 * m_c);
-                                        }
-
-                                        if (tipuesearch_in.pages[i].url.search(pat) != -1)
+                                        if (tipuesearch.pages[i].url.search(pat) != -1)
                                         {
                                              score += 20;
                                         }
@@ -242,7 +199,7 @@ http://www.tipue.com/search
                                         {
                                              for (var e = 0; e < tipuesearch_weight.weight.length; e++)
                                              {
-                                                  if (tipuesearch_in.pages[i].url == tipuesearch_weight.weight[e].url)
+                                                  if (tipuesearch.pages[i].url == tipuesearch_weight.weight[e].url)
                                                   {
                                                        score += tipuesearch_weight.weight[e].score;
                                                   }
@@ -252,7 +209,7 @@ http://www.tipue.com/search
                                         if (d_w[f].match('^-'))
                                         {
                                              pat = new RegExp(d_w[f].substring(1), 'i');
-                                             if (tipuesearch_in.pages[i].title.search(pat) != -1 || tipuesearch_in.pages[i].text.search(pat) != -1 || tipuesearch_in.pages[i].tags.search(pat) != -1)
+                                             if (tipuesearch.pages[i].title.search(pat) != -1 || tipuesearch.pages[i].text.search(pat) != -1 || tipuesearch.pages[i].tags.search(pat) != -1)
                                              {
                                                   score = 0;     
                                              }    
@@ -264,9 +221,11 @@ http://www.tipue.com/search
                                         found.push(
                                         {
                                              "score": score,
-                                             "title": tipuesearch_in.pages[i].title,
+                                             "title": tipuesearch.pages[i].title,
                                              "desc": s_t,
-                                             "url": tipuesearch_in.pages[i].url 
+                                             "img": tipuesearch.pages[i].img, 
+                                             "url": tipuesearch.pages[i].url,
+                                             "note": tipuesearch.pages[i].note
                                         });
                                         c++;                                                                   
                                    }
@@ -274,42 +233,30 @@ http://www.tipue.com/search
                          }
                          else
                          {
-                              for (var i = 0; i < tipuesearch_in.pages.length; i++)
+                              for (var i = 0; i < tipuesearch.pages.length; i++)
                               {
                                    var score = 0;
-                                   var s_t = tipuesearch_in.pages[i].text;
+                                   var s_t = tipuesearch.pages[i].text;
                                    var pat = new RegExp(d, 'gi');
-                                   if (tipuesearch_in.pages[i].title.search(pat) != -1)
+                                   if (tipuesearch.pages[i].title.search(pat) != -1)
                                    {
-                                        var m_c = tipuesearch_in.pages[i].title.match(pat).length;
+                                        var m_c = tipuesearch.pages[i].title.match(pat).length;
                                         score += (20 * m_c);
                                    }
-                                   if (tipuesearch_in.pages[i].text.search(pat) != -1)
+                                   if (tipuesearch.pages[i].text.search(pat) != -1)
                                    {
-                                        var m_c = tipuesearch_in.pages[i].text.match(pat).length;
+                                        var m_c = tipuesearch.pages[i].text.match(pat).length;
                                         score += (20 * m_c);
                                    }
-                                   
-                                   if (set.highlightTerms)
+                                   if (tipuesearch.pages[i].tags)
                                    {
-                                        if (set.highlightEveryTerm) 
-                                        {
-                                             var patr = new RegExp('(' + d + ')', 'gi');
-                                        }
-                                        else
+                                        if (tipuesearch.pages[i].tags.search(pat) != -1)
                                         {
-                                             var patr = new RegExp('(' + d + ')', 'i');
+                                             var m_c = tipuesearch.pages[i].tags.match(pat).length;
+                                             score += (10 * m_c);
                                         }
-                                        s_t = s_t.replace(patr, "<span class=\"h01\">$1</span>");
-                                   }
-                                   
-                                   if (tipuesearch_in.pages[i].tags.search(pat) != -1)
-                                   {
-                                        var m_c = tipuesearch_in.pages[i].tags.match(pat).length;
-                                        score += (10 * m_c);
                                    }
-                              
-                                   if (tipuesearch_in.pages[i].url.search(pat) != -1)
+                                   if (tipuesearch.pages[i].url.search(pat) != -1)
                                    {
                                         score += 20;
                                    }
@@ -318,7 +265,7 @@ http://www.tipue.com/search
                                    {
                                         for (var e = 0; e < tipuesearch_weight.weight.length; e++)
                                         {
-                                             if (tipuesearch_in.pages[i].url == tipuesearch_weight.weight[e].url)
+                                             if (tipuesearch.pages[i].url == tipuesearch_weight.weight[e].url)
                                              {
                                                   score += tipuesearch_weight.weight[e].score;
                                              }
@@ -330,9 +277,11 @@ http://www.tipue.com/search
                                         found.push(
                                         {
                                              "score": score,
-                                             "title": tipuesearch_in.pages[i].title,
+                                             "title": tipuesearch.pages[i].title,
                                              "desc": s_t,
-                                             "url": tipuesearch_in.pages[i].url
+                                             "img": tipuesearch.pages[i].img,
+                                             "url": tipuesearch.pages[i].url,
+                                             "note": tipuesearch.pages[i].note
                                         });
                                         c++;                                                                  
                                    }                              
@@ -347,28 +296,80 @@ http://www.tipue.com/search
                                    document.title = '(' + c + ') ' + title;
                                    tipuesearch_t_c++;
                               }                         
-                         
-                              if (show_replace == 1)
-                              {
-                                   out += '<div id="tipue_search_warning">' + tipuesearch_string_2 + ' ' + d + '. ' + tipuesearch_string_3 + ' <a id="tipue_search_replaced">' + d_r + '</a></div>';
-                              }
+
                               if (c == 1)
                               {
-                                   out += '<div id="tipue_search_results_count">' + tipuesearch_string_4 + '</div>';
+                                   out += '<div id="tipue_search_results_count">' + tipuesearch_string_4;
                               }
                               else
                               {
-                                   c_c = c.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
-                                   out += '<div id="tipue_search_results_count">' + c_c + ' ' + tipuesearch_string_5 + '</div>';
+                                   var c_c = c.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+                                   out += '<div id="tipue_search_results_count">' + c_c + ' ' + tipuesearch_string_5;
+                              }
+                              if (set.showTime)
+                              {
+                                   var endTimer = new Date().getTime();
+                                   var time = (endTimer - startTimer) / 1000;
+                                   out += ' (' + time.toFixed(2) + ' ' + tipuesearch_string_14 + ')';
+                                   set.showTime = false;
+                              }
+                              out += '</div>';
+                                   
+                              if (set.showRelated && standard)
+                              {
+                                   f = 0;
+                                   for (var i = 0; i < tipuesearch_related.Related.length; i++)
+                                   {
+                                        if (d == tipuesearch_related.Related[i].search)
+                                        {
+                                             if (!f)
+                                             {
+                                                  out += '<div class="tipue_search_related">' + tipuesearch_string_10 + '</div><div class="tipue_search_related_block">';
+                                             }
+                                             if (show_replace)
+                                             {
+                                                  d_o = d;
+                                             }
+                                             
+                                             if (tipuesearch_related.Related[i].include)
+                                             {
+                                                  var r_d = d_o + ' ' + tipuesearch_related.Related[i].related;
+                                             }
+                                             else
+                                             {
+                                                  var r_d = tipuesearch_related.Related[i].related;
+                                             }                                             
+                                             
+                                             out += '<a class="tipue_search_related_btn" id="' + r_d + '">' + tipuesearch_related.Related[i].related + '</a>';
+                                             f++;         
+                                        }
+                                   }
+                                   if (f)
+                                   {
+                                        out += '</div>';
+                                   }   
+                              }
+
+                              if (show_replace)
+                              {
+                                   out += '<div id="tipue_search_replace">' + tipuesearch_string_2 + ' ' + d + '. ' + tipuesearch_string_3 + ' <a id="tipue_search_replaced">' + d_r + '</a></div>';
                               }
                               
                               found.sort(function(a, b) { return b.score - a.score } );
                               
                               var l_o = 0;
+                              
+                              if (set.imageZoom)
+                              {
+                                   out += '<div id="tipue_search_image_modal"><div class="tipue_search_image_close">&#10005;</div><div class="tipue_search_image_block"><a id="tipue_search_zoom_url"><img id="tipue_search_zoom_img"></a><div id="tipue_search_zoom_text"></div></div></div>';    
+                              }
+                              
                               for (var i = 0; i < found.length; i++)
                               {
                                    if (l_o >= start && l_o < set.show + start)
-                                   {                                   
+                                   {
+                                        out += '<div class="tipue_search_result">';
+                                                                           
                                         out += '<div class="tipue_search_content_title"><a href="' + found[i].url + '"' + tipue_search_w + '>' +  found[i].title + '</a></div>';
  
                                         if (set.debug)
@@ -379,16 +380,65 @@ http://www.tipue.com/search
                                         if (set.showURL)
                                         {
                                              var s_u = found[i].url.toLowerCase();
-                                             if(s_u.indexOf('http://') == 0)
+                                             if (s_u.indexOf('http://') == 0)
                                              {
                                                   s_u = s_u.slice(7);
                                              }                                             
                                              out += '<div class="tipue_search_content_url"><a href="' + found[i].url + '"' + tipue_search_w + '>' + s_u + '</a></div>';
                                         }
                                         
+                                        if (found[i].img)
+                                        {
+                                             if (set.imageZoom)
+                                             {
+                                                  out += '<div class="tipue_search_image"><img class="tipue_search_img tipue_search_image_zoom" src="' + found[i].img + '" alt="' + found[i].title + '" data-url="' + found[i].url + '"></div>';     
+                                             }
+                                             else
+                                             {
+                                                  out += '<div class="tipue_search_image"><a href="' + found[i].url + '"' + tipue_search_w + '><img class="tipue_search_img" src="' + found[i].img + '" alt="' + found[i].title + '"></a></div>';
+                                             }
+                                        }
+                                        
                                         if (found[i].desc)
                                         {                                        
                                              var t = found[i].desc;
+
+                                             if (set.showContext)
+                                             {
+                                                  d_w = d.split(' ');
+                                                  var s_1 = found[i].desc.toLowerCase().indexOf(d_w[0]);
+                                                  if (s_1 > set.contextStart)
+                                                  {
+                                                       var t_1 = t.substr(s_1 - set.contextBuffer);
+                                                       var s_2 = t_1.indexOf(' ');
+                                                       t_1 = t.substr(s_1 - set.contextBuffer + s_2);
+                                                       t_1 = $.trim(t_1);
+                                                       
+                                                       if (t_1.length > set.contextLength)
+                                                       {                                                      
+                                                            t = '... ' + t_1;
+                                                       }
+                                                  }   
+                                             }
+                                             
+                                             if (standard)
+                                             {
+                                                  d_w = d.split(' ');
+                                                  for (var f = 0; f < d_w.length; f++)
+                                                  {
+                                                       if (set.highlightTerms)
+                                                       {
+                                                            var patr = new RegExp('(' + d_w[f] + ')', 'gi');
+                                                            t = t.replace(patr, "<h0011>$1<h0012>");
+                                                       }
+                                                  }
+                                             }
+                                             else if (set.highlightTerms)
+                                             {
+                                                  var patr = new RegExp('(' + d + ')', 'gi');
+                                                  t = t.replace(patr, "<span class=\"tipue_search_content_bold\">$1</span>");
+                                             }
+                                                                                  
                                              var t_d = '';
                                              var t_w = t.split(' ');
                                              if (t_w.length < set.descriptiveWords)
@@ -407,45 +457,61 @@ http://www.tipue.com/search
                                              {
                                                   t_d += ' ...';
                                              }
+                                             
+                                             t_d = t_d.replace(/h0011/g, 'span class=\"tipue_search_content_bold\"');
+                                             t_d = t_d.replace(/h0012/g, '/span');
+                                             
                                              out += '<div class="tipue_search_content_text">' + t_d + '</div>';
                                         }
+                                        
+                                        if (found[i].note)
+                                        {
+                                             out += '<div class="tipue_search_note">' + found[i].note + '</div>';    
+                                        }                                       
+                                        
+                                        out += '</div>';
                                    }
                                    l_o++;     
-                              }
-                              
+                              }                              
+
                               if (c > set.show)
                               {
                                    var pages = Math.ceil(c / set.show);
                                    var page = (start / set.show);
+                                   if (set.footerPages < 3)
+                                   {
+                                        set.footerPages = 3;
+                                   }
+                                   
                                    out += '<div id="tipue_search_foot"><ul id="tipue_search_foot_boxes">';
                                    
                                    if (start > 0)
                                    {
-                                       out += '<li><a class="tipue_search_foot_box" id="' + (start - set.show) + '_' + replace + '">' + tipuesearch_string_6 + '</a></li>'; 
+                                       out += '<li role="navigation"><a class="tipue_search_foot_box" accesskey="b" id="' + (start - set.show) + '_' + replace + '">' + tipuesearch_string_6 + '</a></li>'; 
                                    }
                                                        
                                    if (page <= 2)
                                    {
                                         var p_b = pages;
-                                        if (pages > 3)
+                                        if (pages > set.footerPages)
                                         {
-                                             p_b = 3;
+                                             p_b = set.footerPages;
                                         }                    
                                         for (var f = 0; f < p_b; f++)
                                         {
                                              if (f == page)
                                              {
-                                                  out += '<li class="current">' + (f + 1) + '</li>';
+                                                  out += '<li class="current" role="navigation">' + (f + 1) + '</li>';
                                              }
                                              else
                                              {
-                                                  out += '<li><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
+                                                  out += '<li role="navigation"><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
                                              }
                                         }
                                    }
                                    else
                                    {
-                                        var p_b = page + 2;
+                                        var p_b = page + set.footerPages - 1;
                                         if (p_b > pages)
                                         {
                                              p_b = pages; 
@@ -454,55 +520,77 @@ http://www.tipue.com/search
                                         {
                                              if (f == page)
                                              {
-                                                  out += '<li class="current">' + (f + 1) + '</li>';
+                                                  out += '<li class="current" role="navigation">' + (f + 1) + '</li>';
                                              }
                                              else
                                              {
-                                                  out += '<li><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
+                                                  out += '<li role="navigation"><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>';
                                              }
                                         }
                                    }                         
                                                       
                                    if (page + 1 != pages)
                                    {
-                                       out += '<li><a class="tipue_search_foot_box" id="' + (start + set.show) + '_' + replace + '">' + tipuesearch_string_7 + '</a></li>'; 
+                                       out += '<li role="navigation"><a class="tipue_search_foot_box" accesskey="m" id="' + (start + set.show) + '_' + replace + '">' + tipuesearch_string_7 + '</a></li>'; 
                                    }                    
                                    
                                    out += '</ul></div>';
-                              }                        
+                              }
+
                          }
                          else
                          {
-                              out += '<div id="tipue_search_warning">' + tipuesearch_string_8 + '</div>'; 
+                              out += '<div id="tipue_search_error">' + tipuesearch_string_8 + '</div>'; 
                          }
                     }
                     else
                     {
                          if (show_stop)
                          {
-                              out += '<div id="tipue_search_warning">' + tipuesearch_string_8 + '. ' + tipuesearch_string_9 + '</div>';     
+                              out += '<div id="tipue_search_error">' + tipuesearch_string_8 + ' ' + tipuesearch_string_9 + '</div>';     
                          }
                          else
                          {
-                              out += '<div id="tipue_search_warning">' + tipuesearch_string_10 + '</div>';
                               if (set.minimumLength == 1)
                               {
-                                   out += '<div id="tipue_search_warning">' + tipuesearch_string_11 + '</div>';
+                                   out += '<div id="tipue_search_error">' + tipuesearch_string_11 + '</div>';
                               }
                               else
                               {
-                                   out += '<div id="tipue_search_warning">' + tipuesearch_string_12 + ' ' + set.minimumLength + ' ' + tipuesearch_string_13 + '</div>';
+                                   out += '<div id="tipue_search_error">' + tipuesearch_string_12 + ' ' + set.minimumLength + ' ' + tipuesearch_string_13 + '</div>';
                               }
                          }
                     }                
                     
-                    $('#tipue_search_content').hide();
-                    $('#tipue_search_content').html(out);
-                    $('#tipue_search_content').slideDown(200);
+                    $('#tipue_search_content').hide().html(out).slideDown(200);
                     
                     $('#tipue_search_replaced').click(function()
                     {
                          getTipueSearch(0, false);
+                    });
+                    
+                    $('.tipue_search_related_btn').click(function()
+                    {
+                         $('#tipue_search_input').val($(this).attr('id'));
+                         getTipueSearch(0, true);
+                    });
+                    
+                    $('.tipue_search_image_zoom').click(function()
+                    {
+                         $('#tipue_search_image_modal').fadeIn(300);
+                         $('#tipue_search_zoom_img').attr('src', this.src);
+                         
+                         var z_u = $(this).attr('data-url');
+                         $('#tipue_search_zoom_url').attr('href', z_u);
+                         
+                         var z_o = this.alt + '<div class="tipue_search_zoom_options"><a href="' + this.src + '" target="_blank">' + tipuesearch_string_15 + '</a>&nbsp; <a href="' + z_u + '">' + tipuesearch_string_16 + '</a></div>';
+                         
+                         $('#tipue_search_zoom_text').html(z_o);
+                    });
+                    
+                    $('.tipue_search_image_close').click(function()
+                    {
+                         $('#tipue_search_image_modal').fadeOut(300);
                     });                
                
                     $('.tipue_search_foot_box').click(function()