diff options
Diffstat (limited to 'pelican-bootstrap3')
| -rw-r--r-- | pelican-bootstrap3/static/tipuesearch/img/loader.gif | bin | 4178 -> 0 bytes | |||
| -rwxr-xr-x | pelican-bootstrap3/static/tipuesearch/tipuesearch.css | 131 | ||||
| -rw-r--r-- | pelican-bootstrap3/static/tipuesearch/tipuesearch.js | 314 | ||||
| -rw-r--r-- | pelican-bootstrap3/static/tipuesearch/tipuesearch.min.js | 169 | ||||
| -rw-r--r-- | pelican-bootstrap3/static/tipuesearch/tipuesearch_content.js | 26 | ||||
| -rw-r--r-- | pelican-bootstrap3/static/tipuesearch/tipuesearch_set.js | 58 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/base.html | 15 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/aboutme.html | 4 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/pagination.html | 2 | ||||
| -rw-r--r-- | pelican-bootstrap3/templates/includes/sidebar.html | 11 |
10 files changed, 524 insertions, 206 deletions
diff --git a/pelican-bootstrap3/static/tipuesearch/img/loader.gif b/pelican-bootstrap3/static/tipuesearch/img/loader.gif Binary files differdeleted file mode 100644 index 9c97738..0000000 --- a/pelican-bootstrap3/static/tipuesearch/img/loader.gif +++ /dev/null diff --git a/pelican-bootstrap3/static/tipuesearch/tipuesearch.css b/pelican-bootstrap3/static/tipuesearch/tipuesearch.css index ec22d33..79ab356 100755 --- a/pelican-bootstrap3/static/tipuesearch/tipuesearch.css +++ b/pelican-bootstrap3/static/tipuesearch/tipuesearch.css @@ -1,7 +1,7 @@ /* -Tipue Search 4.0 -Copyright (c) 2014 Tipue +Tipue Search 5.0 +Copyright (c) 2015 Tipue Tipue Search is released under the MIT License http://www.tipue.com/search */ @@ -17,7 +17,7 @@ http://www.tipue.com/search border-radius: 0; -moz-appearance: none; -webkit-appearance: none; - box-shadow: none; + box-shadow: none; outline: 0; margin: 0; background: #fff url('img/search.png') no-repeat 15px 15px; @@ -29,42 +29,29 @@ http://www.tipue.com/search padding-top: 15px; margin: 0; } -#tipue_search_loading -{ - padding-top: 60px; - background: #fff url('img/loader.gif') no-repeat left; -} - -#tipue_search_warning_head +#tipue_search_warning { font: 300 15px/1.6 'Open Sans', sans-serif; color: #555; -} -#tipue_search_warning -{ - font: 300 13px/1.6 'Open Sans', sans-serif; - color: #333; margin: 7px 0; } #tipue_search_warning a { - color: #36c; - font-weight: 300; + color: #396; text-decoration: none; } #tipue_search_warning a:hover { - color: #333; + color: #555; } #tipue_search_results_count { - font: 300 13px/1.6 'Open Sans', sans-serif; - color: #333; + font: 300 15px/1.7 'Open Sans', sans-serif; + color: #555; } .tipue_search_content_title { - font: 300 25px/1.7 'Open Sans', sans-serif; - text-rendering: optimizelegibility; + font: 300 21px/1.7 'Open Sans', sans-serif; margin-top: 23px; } .tipue_search_content_title a @@ -78,33 +65,33 @@ http://www.tipue.com/search } .tipue_search_content_url { - font: 300 13px/1.7 'Open Sans', sans-serif; - word-break: break-all; - word-break: break-word; - -webkit-hyphens: auto; - -moz-hyphens: auto; + font: 300 14px/1.9 'Open Sans', sans-serif; + word-wrap: break-word; hyphens: auto; } .tipue_search_content_url a { - color: #06c; + color: #396; text-decoration: none; } .tipue_search_content_url a:hover { - color: #333; + color: #555; } .tipue_search_content_text { font: 300 15px/1.6 'Open Sans', sans-serif; color: #555; - word-break: break-all; - word-break: break-word; - -webkit-hyphens: auto; - -moz-hyphens: auto; + word-wrap: break-word; hyphens: auto; margin-top: 3px; } +.tipue_search_content_debug +{ + font: 300 13px/1.6 'Open Sans', sans-serif; + color: #555; + margin: 5px 0; +} .h01 { color: #333; @@ -119,7 +106,7 @@ http://www.tipue.com/search { padding: 0; margin: 0; - font: 12px/1 'Open Sans', sans-serif; + font: 12px 'Open Sans', sans-serif; } #tipue_search_foot_boxes li { @@ -130,9 +117,9 @@ http://www.tipue.com/search } #tipue_search_foot_boxes li a { - padding: 9px 15px 10px 15px; - background-color: #f1f1f1; - border: 1px solid #dcdcdc; + padding: 10px 17px 11px 17px; + background-color: #fff; + border: 1px solid #e2e2e2; border-radius: 1px; color: #333; margin-right: 7px; @@ -141,9 +128,9 @@ http://www.tipue.com/search } #tipue_search_foot_boxes li.current { - padding: 9px 15px 10px 15px; - background: #fff; - border: 1px solid #dcdcdc; + padding: 10px 17px 11px 17px; + background: #f6f6f6; + border: 1px solid #e2e2e2; border-radius: 1px; color: #333; margin-right: 7px; @@ -151,6 +138,66 @@ http://www.tipue.com/search } #tipue_search_foot_boxes li a:hover { - border: 1px solid #ccc; - background-color: #f3f3f3; + background: #f6f6f6; +} + + +/* spinner */ + + +.tipue_search_spinner +{ + padding: 31px 0; + width: 50px; + height: 28px; +} +.tipue_search_spinner > div +{ + background-color: #777; + height: 100%; + width: 3px; + display: inline-block; + margin-right: 2px; + -webkit-animation: stretchdelay 1.2s infinite ease-in-out; + animation: stretchdelay 1.2s infinite ease-in-out; +} +.tipue_search_spinner .tipue_search_rect2 +{ + -webkit-animation-delay: -1.1s; + animation-delay: -1.1s; +} +.tipue_search_spinner .tipue_search_rect3 +{ + -webkit-animation-delay: -1.0s; + animation-delay: -1.0s; } +@-webkit-keyframes stretchdelay +{ + 0%, 40%, 100% + { + -webkit-transform: scaleY(0.4) + } + 20% + { + -webkit-transform: scaleY(1.0) + } +} +@keyframes stretchdelay +{ + 0%, 40%, 100% + { + transform: scaleY(0.4); + -webkit-transform: scaleY(0.4); + } + 20% + { + transform: scaleY(1.0); + -webkit-transform: scaleY(1.0); + } +} + + + + + + diff --git a/pelican-bootstrap3/static/tipuesearch/tipuesearch.js b/pelican-bootstrap3/static/tipuesearch/tipuesearch.js index 39dfbf6..60e5281 100644 --- a/pelican-bootstrap3/static/tipuesearch/tipuesearch.js +++ b/pelican-bootstrap3/static/tipuesearch/tipuesearch.js @@ -1,7 +1,7 @@ /* -Tipue Search 4.0 -Copyright (c) 2014 Tipue +Tipue Search 5.0 +Copyright (c) 2015 Tipue Tipue Search is released under the MIT License http://www.tipue.com/search */ @@ -12,10 +12,11 @@ http://www.tipue.com/search $.fn.tipuesearch = function(options) { var set = $.extend( { - + 'show' : 7, 'newWindow' : false, 'showURL' : true, + 'showTitleCount' : true, 'minimumLength' : 3, 'descriptiveWords' : 25, 'highlightTerms' : true, @@ -23,10 +24,11 @@ http://www.tipue.com/search 'mode' : 'static', 'liveDescription' : '*', 'liveContent' : '*', - 'contentLocation' : 'tipuesearch/tipuesearch_content.json' - + 'contentLocation' : 'tipuesearch/tipuesearch_content.json', + 'debug' : false + }, options); - + return this.each(function() { var tipuesearch_in = { @@ -35,19 +37,20 @@ http://www.tipue.com/search $.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], '', - function (html) + $.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) @@ -56,39 +59,38 @@ http://www.tipue.com/search } else { - var tit = 'No title'; + var tit = tipuesearch_string_1; } - tipuesearch_in.pages.push({ + tipuesearch_in.pages.push( + { "title": tit, "text": desc, "tags": cont, - "loc": tipuesearch_pages[i] - }); - } - ); + "url": tipuesearch_pages[i] + }); + }); } } - + if (set.mode == 'json') { - $.getJSON(set.contentLocation, - function(json) + $.getJSON(set.contentLocation) + .done(function(json) { tipuesearch_in = $.extend({}, json); - } - ); + }); } if (set.mode == 'static') { tipuesearch_in = $.extend({}, tipuesearch); - } - + } + var tipue_search_w = ''; if (set.newWindow) { - tipue_search_w = ' target="_blank"'; + tipue_search_w = ' target="_blank"'; } function getURLP(name) @@ -99,8 +101,8 @@ http://www.tipue.com/search { $('#tipue_search_input').val(getURLP('q')); getTipueSearch(0, true); - } - + } + $(this).keyup(function(event) { if(event.keyCode == '13') @@ -108,26 +110,30 @@ http://www.tipue.com/search getTipueSearch(0, true); } }); + 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(); + var out = ''; var results = ''; var show_replace = false; var show_stop = false; var standard = true; var c = 0; - found = new Array(); - + found = []; + var d = $('#tipue_search_input').val().toLowerCase(); d = $.trim(d); - + if ((d.match("^\"") && d.match("\"$")) || (d.match("^'") && d.match("'$"))) { standard = false; } - + if (standard) { var d_w = d.split(' '); @@ -140,7 +146,7 @@ http://www.tipue.com/search if (d_w[i] == tipuesearch_stop_words[f]) { a_w = false; - show_stop = true; + show_stop = true; } } if (a_w) @@ -155,7 +161,7 @@ http://www.tipue.com/search { d = d.substring(1, d.length - 1); } - + if (d.length >= set.minimumLength) { if (standard) @@ -175,8 +181,8 @@ http://www.tipue.com/search } } d_w = d.split(' '); - } - + } + var d_t = d; for (var i = 0; i < d_w.length; i++) { @@ -192,23 +198,25 @@ http://www.tipue.com/search for (var i = 0; i < tipuesearch_in.pages.length; i++) { - var score = 1000000000; + var score = 0; var s_t = tipuesearch_in.pages[i].text; for (var f = 0; f < d_w.length; f++) { - var pat = new RegExp(d_w[f], 'i'); + var pat = new RegExp(d_w[f], 'gi'); if (tipuesearch_in.pages[i].title.search(pat) != -1) { - score -= (200000 - i); + var m_c = tipuesearch_in.pages[i].title.match(pat).length; + score += (20 * m_c); } if (tipuesearch_in.pages[i].text.search(pat) != -1) { - score -= (150000 - i); + var m_c = tipuesearch_in.pages[i].text.match(pat).length; + score += (20 * m_c); } - + if (set.highlightTerms) { - if (set.highlightEveryTerm) + if (set.highlightEveryTerm) { var patr = new RegExp('(' + d_w[f] + ')', 'gi'); } @@ -218,24 +226,49 @@ http://www.tipue.com/search } s_t = s_t.replace(patr, "<span class=\"h01\">$1</span>"); } + if (tipuesearch_in.pages[i].tags.search(pat) != -1) { - score -= (100000 - i); + var m_c = tipuesearch_in.pages[i].tags.match(pat).length; + score += (10 * m_c); } - if (d_w[f].match("^-")) + if (tipuesearch_in.pages[i].url.search(pat) != -1) + { + score += 20; + } + + if (score != 0) + { + for (var e = 0; e < tipuesearch_weight.weight.length; e++) + { + if (tipuesearch_in.pages[i].url == tipuesearch_weight.weight[e].url) + { + score += tipuesearch_weight.weight[e].score; + } + } + } + + 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) { - score = 1000000000; - } + score = 0; + } } } - - if (score < 1000000000) + + if (score != 0) { - found[c++] = score + '^' + tipuesearch_in.pages[i].title + '^' + s_t + '^' + tipuesearch_in.pages[i].loc; + found.push( + { + "score": score, + "title": tipuesearch_in.pages[i].title, + "desc": s_t, + "url": tipuesearch_in.pages[i].url + }); + c++; } } } @@ -243,21 +276,23 @@ http://www.tipue.com/search { for (var i = 0; i < tipuesearch_in.pages.length; i++) { - var score = 1000000000; + var score = 0; var s_t = tipuesearch_in.pages[i].text; - var pat = new RegExp(d, 'i'); + var pat = new RegExp(d, 'gi'); if (tipuesearch_in.pages[i].title.search(pat) != -1) { - score -= (200000 - i); + var m_c = tipuesearch_in.pages[i].title.match(pat).length; + score += (20 * m_c); } if (tipuesearch_in.pages[i].text.search(pat) != -1) { - score -= (150000 - i); + var m_c = tipuesearch_in.pages[i].text.match(pat).length; + score += (20 * m_c); } - + if (set.highlightTerms) { - if (set.highlightEveryTerm) + if (set.highlightEveryTerm) { var patr = new RegExp('(' + d + ')', 'gi'); } @@ -267,91 +302,135 @@ http://www.tipue.com/search } s_t = s_t.replace(patr, "<span class=\"h01\">$1</span>"); } + if (tipuesearch_in.pages[i].tags.search(pat) != -1) { - score -= (100000 - i); + var m_c = tipuesearch_in.pages[i].tags.match(pat).length; + score += (10 * m_c); } - - if (score < 1000000000) + + if (tipuesearch_in.pages[i].url.search(pat) != -1) { - found[c++] = score + '^' + tipuesearch_in.pages[i].title + '^' + s_t + '^' + tipuesearch_in.pages[i].loc; + score += 20; } + + if (score != 0) + { + for (var e = 0; e < tipuesearch_weight.weight.length; e++) + { + if (tipuesearch_in.pages[i].url == tipuesearch_weight.weight[e].url) + { + score += tipuesearch_weight.weight[e].score; + } + } + } + + if (score != 0) + { + found.push( + { + "score": score, + "title": tipuesearch_in.pages[i].title, + "desc": s_t, + "url": tipuesearch_in.pages[i].url + }); + c++; + } } - } - + } + if (c != 0) { + if (set.showTitleCount && tipuesearch_t_c == 0) + { + var title = document.title; + document.title = '(' + c + ') ' + title; + tipuesearch_t_c++; + } + if (show_replace == 1) { - out += '<div id="tipue_search_warning_head">Showing results for ' + d + '</div>'; - out += '<div id="tipue_search_warning">Search instead for <a href="javascript:void(0)" id="tipue_search_replaced">' + d_r + '</a></div>'; + 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">1 result</div>'; + out += '<div id="tipue_search_results_count">' + tipuesearch_string_4 + '</div>'; } else { c_c = c.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); - out += '<div id="tipue_search_results_count">' + c_c + ' results</div>'; + out += '<div id="tipue_search_results_count">' + c_c + ' ' + tipuesearch_string_5 + '</div>'; } - - found.sort(); + + found.sort(function(a, b) { return b.score - a.score } ); + var l_o = 0; for (var i = 0; i < found.length; i++) { - var fo = found[i].split('^'); if (l_o >= start && l_o < set.show + start) - { - out += '<div class="tipue_search_content_title"><a href="' + fo[3] + '"' + tipue_search_w + '>' + fo[1] + '</a></div>'; - - if (set.showURL) - { - out += '<div class="tipue_search_content_url"><a href="' + fo[3] + '"' + tipue_search_w + '>' + fo[3] + '</a></div>'; + { + out += '<div class="tipue_search_content_title"><a href="' + found[i].url + '"' + tipue_search_w + '>' + found[i].title + '</a></div>'; + + if (set.debug) + { + out += '<div class="tipue_search_content_debug">Score: ' + found[i].score + '</div>'; } - - var t = fo[2]; - var t_d = ''; - var t_w = t.split(' '); - if (t_w.length < set.descriptiveWords) + + if (set.showURL) { - t_d = t; + var s_u = found[i].url.toLowerCase(); + 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>'; } - else - { - for (var f = 0; f < set.descriptiveWords; f++) + + if (found[i].desc) + { + var t = found[i].desc; + var t_d = ''; + var t_w = t.split(' '); + if (t_w.length < set.descriptiveWords) { - t_d += t_w[f] + ' '; + t_d = t; } + else + { + for (var f = 0; f < set.descriptiveWords; f++) + { + t_d += t_w[f] + ' '; + } + } + t_d = $.trim(t_d); + if (t_d.charAt(t_d.length - 1) != '.') + { + t_d += ' ...'; + } + out += '<div class="tipue_search_content_text">' + t_d + '</div>'; } - t_d = $.trim(t_d); - if (t_d.charAt(t_d.length - 1) != '.') - { - t_d += ' ...'; - } - out += '<div class="tipue_search_content_text">' + t_d + '</div>'; } - l_o++; + l_o++; } - + if (c > set.show) { var pages = Math.ceil(c / set.show); var page = (start / set.show); out += '<div id="tipue_search_foot"><ul id="tipue_search_foot_boxes">'; - + if (start > 0) { - out += '<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="' + (start - set.show) + '_' + replace + '">Prev</a></li>'; + out += '<li><a class="tipue_search_foot_box" id="' + (start - set.show) + '_' + replace + '">' + tipuesearch_string_6 + '</a></li>'; } - + if (page <= 2) { var p_b = pages; if (pages > 3) { p_b = 3; - } + } for (var f = 0; f < p_b; f++) { if (f == page) @@ -360,7 +439,7 @@ http://www.tipue.com/search } else { - out += '<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>'; + out += '<li><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>'; } } } @@ -369,7 +448,7 @@ http://www.tipue.com/search var p_b = page + 2; if (p_b > pages) { - p_b = pages; + p_b = pages; } for (var f = page - 1; f < p_b; f++) { @@ -379,62 +458,63 @@ http://www.tipue.com/search } else { - out += '<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>'; + out += '<li><a class="tipue_search_foot_box" id="' + (f * set.show) + '_' + replace + '">' + (f + 1) + '</a></li>'; } } - } - + } + if (page + 1 != pages) { - out += '<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="' + (start + set.show) + '_' + replace + '">Next</a></li>'; - } - + out += '<li><a class="tipue_search_foot_box" id="' + (start + set.show) + '_' + replace + '">' + tipuesearch_string_7 + '</a></li>'; + } + out += '</ul></div>'; - } + } } else { - out += '<div id="tipue_search_warning_head">Nothing found</div>'; + out += '<div id="tipue_search_warning">' + tipuesearch_string_8 + '</div>'; } } else { if (show_stop) { - out += '<div id="tipue_search_warning_head">Nothing found</div><div id="tipue_search_warning">Common words are largely ignored</div>'; + out += '<div id="tipue_search_warning">' + tipuesearch_string_8 + '. ' + tipuesearch_string_9 + '</div>'; } else { - out += '<div id="tipue_search_warning_head">Search too short</div>'; + out += '<div id="tipue_search_warning">' + tipuesearch_string_10 + '</div>'; if (set.minimumLength == 1) { - out += '<div id="tipue_search_warning">Should be one character or more</div>'; + out += '<div id="tipue_search_warning">' + tipuesearch_string_11 + '</div>'; } else { - out += '<div id="tipue_search_warning">Should be ' + set.minimumLength + ' characters or more</div>'; + out += '<div id="tipue_search_warning">' + 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_replaced').click(function() { getTipueSearch(0, false); - }); - + }); + $('.tipue_search_foot_box').click(function() { var id_v = $(this).attr('id'); var id_a = id_v.split('_'); - + getTipueSearch(parseInt(id_a[0]), id_a[1]); - }); - } - + }); + } + }); }; - + })(jQuery); diff --git a/pelican-bootstrap3/static/tipuesearch/tipuesearch.min.js b/pelican-bootstrap3/static/tipuesearch/tipuesearch.min.js index f6cd2b4..6b69c72 100644 --- a/pelican-bootstrap3/static/tipuesearch/tipuesearch.min.js +++ b/pelican-bootstrap3/static/tipuesearch/tipuesearch.min.js @@ -1,14 +1,155 @@ -(function($){$.fn.tipuesearch=function(options){var set=$.extend({"show":7,"newWindow":false,"showURL":true,"minimumLength":3,"descriptiveWords":25,"highlightTerms":true,"highlightEveryTerm":false,"mode":"static","liveDescription":"*","liveContent":"*","contentLocation":"tipuesearch/tipuesearch_content.json"},options);return this.each(function(){var tipuesearch_in={pages:[]};$.ajaxSetup({async:false});if(set.mode=="live")for(var i=0;i<tipuesearch_pages.length;i++)$.get(tipuesearch_pages[i],"",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="No title";tipuesearch_in.pages.push({"title":tit,"text":desc,"tags":cont,"loc":tipuesearch_pages[i]})});if(set.mode=="json")$.getJSON(set.contentLocation,function(json){tipuesearch_in=$.extend({},json)}); -if(set.mode=="static")tipuesearch_in=$.extend({},tipuesearch);var tipue_search_w="";if(set.newWindow)tipue_search_w=' target="_blank"';function getURLP(name){return decodeURIComponent(((new RegExp("[?|&]"+name+"="+"([^&;]+?)(&|#|;|$)")).exec(location.search)||[,""])[1].replace(/\+/g,"%20"))||null}if(getURLP("q")){$("#tipue_search_input").val(getURLP("q"));getTipueSearch(0,true)}$(this).keyup(function(event){if(event.keyCode=="13")getTipueSearch(0,true)});function getTipueSearch(start,replace){$("#tipue_search_content").hide(); -var out="";var results="";var show_replace=false;var show_stop=false;var standard=true;var c=0;found=new Array;var d=$("#tipue_search_input").val().toLowerCase();d=$.trim(d);if(d.match('^"')&&d.match('"$')||d.match("^'")&&d.match("'$"))standard=false;if(standard){var d_w=d.split(" ");d="";for(var i=0;i<d_w.length;i++){var a_w=true;for(var f=0;f<tipuesearch_stop_words.length;f++)if(d_w[i]==tipuesearch_stop_words[f]){a_w=false;show_stop=true}if(a_w)d=d+" "+d_w[i]}d=$.trim(d);d_w=d.split(" ")}else d= -d.substring(1,d.length-1);if(d.length>=set.minimumLength){if(standard){if(replace){var d_r=d;for(var i=0;i<d_w.length;i++)for(var f=0;f<tipuesearch_replace.words.length;f++)if(d_w[i]==tipuesearch_replace.words[f].word){d=d.replace(d_w[i],tipuesearch_replace.words[f].replace_with);show_replace=true}d_w=d.split(" ")}var d_t=d;for(var i=0;i<d_w.length;i++)for(var f=0;f<tipuesearch_stem.words.length;f++)if(d_w[i]==tipuesearch_stem.words[f].word)d_t=d_t+" "+tipuesearch_stem.words[f].stem;d_w=d_t.split(" "); -for(var i=0;i<tipuesearch_in.pages.length;i++){var score=1E9;var s_t=tipuesearch_in.pages[i].text;for(var f=0;f<d_w.length;f++){var pat=new RegExp(d_w[f],"i");if(tipuesearch_in.pages[i].title.search(pat)!=-1)score-=2E5-i;if(tipuesearch_in.pages[i].text.search(pat)!=-1)score-=15E4-i;if(set.highlightTerms){if(set.highlightEveryTerm)var patr=new RegExp("("+d_w[f]+")","gi");else var patr=new RegExp("("+d_w[f]+")","i");s_t=s_t.replace(patr,'<span class="h01">$1</span>')}if(tipuesearch_in.pages[i].tags.search(pat)!= --1)score-=1E5-i;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)score=1E9}}if(score<1E9)found[c++]=score+"^"+tipuesearch_in.pages[i].title+"^"+s_t+"^"+tipuesearch_in.pages[i].loc}}else for(var i=0;i<tipuesearch_in.pages.length;i++){var score=1E9;var s_t=tipuesearch_in.pages[i].text;var pat=new RegExp(d,"i");if(tipuesearch_in.pages[i].title.search(pat)!= --1)score-=2E5-i;if(tipuesearch_in.pages[i].text.search(pat)!=-1)score-=15E4-i;if(set.highlightTerms){if(set.highlightEveryTerm)var patr=new RegExp("("+d+")","gi");else var patr=new RegExp("("+d+")","i");s_t=s_t.replace(patr,'<span class="h01">$1</span>')}if(tipuesearch_in.pages[i].tags.search(pat)!=-1)score-=1E5-i;if(score<1E9)found[c++]=score+"^"+tipuesearch_in.pages[i].title+"^"+s_t+"^"+tipuesearch_in.pages[i].loc}if(c!=0){if(show_replace==1){out+='<div id="tipue_search_warning_head">Showing results for '+ -d+"</div>";out+='<div id="tipue_search_warning">Search instead for <a href="javascript:void(0)" id="tipue_search_replaced">'+d_r+"</a></div>"}if(c==1)out+='<div id="tipue_search_results_count">1 result</div>';else{c_c=c.toString().replace(/\B(?=(\d{3})+(?!\d))/g,",");out+='<div id="tipue_search_results_count">'+c_c+" results</div>"}found.sort();var l_o=0;for(var i=0;i<found.length;i++){var fo=found[i].split("^");if(l_o>=start&&l_o<set.show+start){out+='<div class="tipue_search_content_title"><a href="'+ -fo[3]+'"'+tipue_search_w+">"+fo[1]+"</a></div>";if(set.showURL)out+='<div class="tipue_search_content_url"><a href="'+fo[3]+'"'+tipue_search_w+">"+fo[3]+"</a></div>";var t=fo[2];var t_d="";var t_w=t.split(" ");if(t_w.length<set.descriptiveWords)t_d=t;else for(var f=0;f<set.descriptiveWords;f++)t_d+=t_w[f]+" ";t_d=$.trim(t_d);if(t_d.charAt(t_d.length-1)!=".")t_d+=" ...";out+='<div class="tipue_search_content_text">'+t_d+"</div>"}l_o++}if(c>set.show){var pages=Math.ceil(c/set.show);var page=start/set.show; -out+='<div id="tipue_search_foot"><ul id="tipue_search_foot_boxes">';if(start>0)out+='<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="'+(start-set.show)+"_"+replace+'">Prev</a></li>';if(page<=2){var p_b=pages;if(pages>3)p_b=3;for(var f=0;f<p_b;f++)if(f==page)out+='<li class="current">'+(f+1)+"</li>";else out+='<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="'+f*set.show+"_"+replace+'">'+(f+1)+"</a></li>"}else{var p_b=page+2;if(p_b>pages)p_b=pages;for(var f=page- -1;f<p_b;f++)if(f==page)out+='<li class="current">'+(f+1)+"</li>";else out+='<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="'+f*set.show+"_"+replace+'">'+(f+1)+"</a></li>"}if(page+1!=pages)out+='<li><a href="javascript:void(0)" class="tipue_search_foot_box" id="'+(start+set.show)+"_"+replace+'">Next</a></li>';out+="</ul></div>"}}else out+='<div id="tipue_search_warning_head">Nothing found</div>'}else if(show_stop)out+='<div id="tipue_search_warning_head">Nothing found</div><div id="tipue_search_warning">Common words are largely ignored</div>'; -else{out+='<div id="tipue_search_warning_head">Search too short</div>';if(set.minimumLength==1)out+='<div id="tipue_search_warning">Should be one character or more</div>';else out+='<div id="tipue_search_warning">Should be '+set.minimumLength+" characters or more</div>"}$("#tipue_search_content").html(out);$("#tipue_search_content").slideDown(200);$("#tipue_search_replaced").click(function(){getTipueSearch(0,false)});$(".tipue_search_foot_box").click(function(){var id_v=$(this).attr("id");var id_a= -id_v.split("_");getTipueSearch(parseInt(id_a[0]),id_a[1])})}})}})(jQuery); +(function($){$.fn.tipuesearch=function(options){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},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 tipue_search_w='';if(set.newWindow) +{tipue_search_w=' target="_blank"';} +function getURLP(name) +{return decodeURIComponent((new RegExp('[?|&]'+name+'='+'([^&;]+?)(&|#|;|$)').exec(location.search)||[,""])[1].replace(/\+/g,'%20'))||null;} +if(getURLP('q')) +{$('#tipue_search_input').val(getURLP('q'));getTipueSearch(0,true);} +$(this).keyup(function(event) +{if(event.keyCode=='13') +{getTipueSearch(0,true);}});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();var out='';var results='';var show_replace=false;var show_stop=false;var standard=true;var c=0;found=[];var d=$('#tipue_search_input').val().toLowerCase();d=$.trim(d);if((d.match("^\"")&&d.match("\"$"))||(d.match("^'")&&d.match("'$"))) +{standard=false;} +if(standard) +{var d_w=d.split(' ');d='';for(var i=0;i<d_w.length;i++) +{var a_w=true;for(var f=0;f<tipuesearch_stop_words.length;f++) +{if(d_w[i]==tipuesearch_stop_words[f]) +{a_w=false;show_stop=true;}} +if(a_w) +{d=d+' '+d_w[i];}} +d=$.trim(d);d_w=d.split(' ');} +else +{d=d.substring(1,d.length-1);} +if(d.length>=set.minimumLength) +{if(standard) +{if(replace) +{var d_r=d;for(var i=0;i<d_w.length;i++) +{for(var f=0;f<tipuesearch_replace.words.length;f++) +{if(d_w[i]==tipuesearch_replace.words[f].word) +{d=d.replace(d_w[i],tipuesearch_replace.words[f].replace_with);show_replace=true;}}} +d_w=d.split(' ');} +var d_t=d;for(var i=0;i<d_w.length;i++) +{for(var f=0;f<tipuesearch_stem.words.length;f++) +{if(d_w[i]==tipuesearch_stem.words[f].word) +{d_t=d_t+' '+tipuesearch_stem.words[f].stem;}}} +d_w=d_t.split(' ');for(var i=0;i<tipuesearch_in.pages.length;i++) +{var score=0;var s_t=tipuesearch_in.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) +{var m_c=tipuesearch_in.pages[i].title.match(pat).length;score+=(20*m_c);} +if(tipuesearch_in.pages[i].text.search(pat)!=-1) +{var m_c=tipuesearch_in.pages[i].text.match(pat).length;score+=(20*m_c);} +if(set.highlightTerms) +{if(set.highlightEveryTerm) +{var patr=new RegExp('('+d_w[f]+')','gi');} +else +{var patr=new RegExp('('+d_w[f]+')','i');} +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) +{score+=20;} +if(score!=0) +{for(var e=0;e<tipuesearch_weight.weight.length;e++) +{if(tipuesearch_in.pages[i].url==tipuesearch_weight.weight[e].url) +{score+=tipuesearch_weight.weight[e].score;}}} +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) +{score=0;}}} +if(score!=0) +{found.push({"score":score,"title":tipuesearch_in.pages[i].title,"desc":s_t,"url":tipuesearch_in.pages[i].url});c++;}}} +else +{for(var i=0;i<tipuesearch_in.pages.length;i++) +{var score=0;var s_t=tipuesearch_in.pages[i].text;var pat=new RegExp(d,'gi');if(tipuesearch_in.pages[i].title.search(pat)!=-1) +{var m_c=tipuesearch_in.pages[i].title.match(pat).length;score+=(20*m_c);} +if(tipuesearch_in.pages[i].text.search(pat)!=-1) +{var m_c=tipuesearch_in.pages[i].text.match(pat).length;score+=(20*m_c);} +if(set.highlightTerms) +{if(set.highlightEveryTerm) +{var patr=new RegExp('('+d+')','gi');} +else +{var patr=new RegExp('('+d+')','i');} +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) +{score+=20;} +if(score!=0) +{for(var e=0;e<tipuesearch_weight.weight.length;e++) +{if(tipuesearch_in.pages[i].url==tipuesearch_weight.weight[e].url) +{score+=tipuesearch_weight.weight[e].score;}}} +if(score!=0) +{found.push({"score":score,"title":tipuesearch_in.pages[i].title,"desc":s_t,"url":tipuesearch_in.pages[i].url});c++;}}} +if(c!=0) +{if(set.showTitleCount&&tipuesearch_t_c==0) +{var title=document.title;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>';} +else +{c_c=c.toString().replace(/\B(?=(\d{3})+(?!\d))/g,",");out+='<div id="tipue_search_results_count">'+c_c+' '+tipuesearch_string_5+'</div>';} +found.sort(function(a,b){return b.score-a.score});var l_o=0;for(var i=0;i<found.length;i++) +{if(l_o>=start&&l_o<set.show+start) +{out+='<div class="tipue_search_content_title"><a href="'+found[i].url+'"'+tipue_search_w+'>'+found[i].title+'</a></div>';if(set.debug) +{out+='<div class="tipue_search_content_debug">Score: '+found[i].score+'</div>';} +if(set.showURL) +{var s_u=found[i].url.toLowerCase();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].desc) +{var t=found[i].desc;var t_d='';var t_w=t.split(' ');if(t_w.length<set.descriptiveWords) +{t_d=t;} +else +{for(var f=0;f<set.descriptiveWords;f++) +{t_d+=t_w[f]+' ';}} +t_d=$.trim(t_d);if(t_d.charAt(t_d.length-1)!='.') +{t_d+=' ...';} +out+='<div class="tipue_search_content_text">'+t_d+'</div>';}} +l_o++;} +if(c>set.show) +{var pages=Math.ceil(c / set.show);var page=(start / set.show);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>';} +if(page<=2) +{var p_b=pages;if(pages>3) +{p_b=3;} +for(var f=0;f<p_b;f++) +{if(f==page) +{out+='<li class="current">'+(f+1)+'</li>';} +else +{out+='<li><a class="tipue_search_foot_box" id="'+(f*set.show)+'_'+replace+'">'+(f+1)+'</a></li>';}}} +else +{var p_b=page+2;if(p_b>pages) +{p_b=pages;} +for(var f=page-1;f<p_b;f++) +{if(f==page) +{out+='<li class="current">'+(f+1)+'</li>';} +else +{out+='<li><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+='</ul></div>';}} +else +{out+='<div id="tipue_search_warning">'+tipuesearch_string_8+'</div>';}} +else +{if(show_stop) +{out+='<div id="tipue_search_warning">'+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>';} +else +{out+='<div id="tipue_search_warning">'+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_replaced').click(function() +{getTipueSearch(0,false);});$('.tipue_search_foot_box').click(function() +{var id_v=$(this).attr('id');var id_a=id_v.split('_');getTipueSearch(parseInt(id_a[0]),id_a[1]);});}});};})(jQuery); diff --git a/pelican-bootstrap3/static/tipuesearch/tipuesearch_content.js b/pelican-bootstrap3/static/tipuesearch/tipuesearch_content.js index 4508067..606dd4c 100644 --- a/pelican-bootstrap3/static/tipuesearch/tipuesearch_content.js +++ b/pelican-bootstrap3/static/tipuesearch/tipuesearch_content.js @@ -1,12 +1,18 @@ + var tipuesearch = {"pages": [ - {"title": "Tipue Search, a site search engine jQuery plugin", "text": "Tipue Search is a site search engine jQuery plugin. Tipue Search is open source and released under the MIT License, which means it's free for both commercial and non-commercial use. Tipue Search is responsive and works on all reasonably modern browsers.", "tags": "JavaScript", "loc": "http://www.tipue.com/search"}, - {"title": "Tipue Search Static mode demo", "text": "This is a demo of Tipue Search Static mode.", "tags": "", "loc": "http://www.tipue.com/search/demos/static"}, - {"title": "Tipue Search Live mode demo", "text": "This is a demo of Tipue Search Live mode.", "tags": "", "loc": "http://www.tipue.com/search/demos/live"}, - {"title": "Tipue Search docs", "text": "If you haven't already done so, download Tipue Search. Copy the tipuesearch folder to your site.", "tags": "documentation", "loc": "http://www.tipue.com/search/docs"}, - {"title": "Tipue jQuery plugins Support", "text": "If you're stuck we offer a range of flexible support plans for our jQuery plugins.", "tags": "", "loc": "http://www.tipue.com/support"}, - {"title": "Tipue drop, a search suggestion box jQuery plugin", "text": "Tipue drop is a search suggestion box jQuery plugin. Tipue drop is open source and released under the MIT License, which means it's free for both commercial and non-commercial use. Tipue drop is responsive and works on all reasonably modern browsers.", "tags": "JavaScript", "loc": "http://www.tipue.com/drop"}, - {"title": "Tipr, a small and simple jQuery tooltip plugin", "text": "Tipr is a small and simple jQuery tooltip plugin. It's free and open source. Tipr displays attractive tooltips, and it's a shade under 3 KB, CSS included.", "tags": "JavaScript", "loc": "http://www.tipue.com/tipr"}, - {"title": "The Tipue blog", "text": "An occasional blog covering CSS, jQuery and web development.", "tags": "", "loc": "http://www.tipue.com/blog"}, - {"title": "Tipue jQuery plugins", "text": "The Tipue jQuery plugins are free, open source and responsive. We offer a range of flexible support plans for our jQuery plugins, including free.", "tags": "", "loc": "http://www.tipue.com/jquery"}, - {"title": "About Tipue", "text": "Tipue is a small web development studio based in North London. We've been around for over a decade. We design innovative add-ins, plugins, code and features with Perl, MySQL and jQuery.", "tags": "", "loc": "http://www.tipue.com/about"} + {"title": "Tipue", "text": "", "tags": "jQuery HTML5 CSS", "url": "http://www.tipue.com"}, + {"title": "Tipue Search, a site search engine jQuery plugin", "text": "Tipue Search is a site search engine jQuery plugin. It's free, open source, responsive and fast. Tipue Search only needs a browser that supports jQuery. It doesn't need MySQL or similar. In Static mode it doesn't even need a web server.", "tags": "JavaScript", "url": "http://www.tipue.com/search"}, + {"title": "Tipue Search Documentation", "text": "Tipue Search is a site search engine jQuery plugin. It's free, open source and responsive. Tipue Search uses various modes for loading content. Static mode uses a JavaScript object, while JSON mode uses JSON. Live mode grabs content from a list of pages dynamically.", "tags": "docs", "url": "http://www.tipue.com/search/docs"}, + {"title": "Tipue Search Static mode demo", "text": "Tipue Search is a site search engine jQuery plugin. This is a demo of Static mode. Enter tipue into the search box above.", "tags": "", "url": "http://www.tipue.com/search/demos/static"}, + {"title": "Tipue Search Live mode demo", "text": "Tipue Search is a site search engine jQuery plugin. This is a demo of Live mode. Enter tipue into the search box above.", "tags": "", "url": "http://www.tipue.com/search/demos/live"}, + {"title": "Tipue jQuery plugins Support", "text": "If you're stuck we offer a range of flexible support plans for our jQuery plugins.", "tags": "", "url": "http://www.tipue.com/support"}, + {"title": "Tipr, a small and simple jQuery tooltip plugin", "text": "Tipr is a small and simple jQuery tooltip plugin. It's free and open source. Tipr displays attractive tooltips, and it's a shade under 4KB, CSS included.", "tags": "JavaScript", "url": "http://www.tipue.com/tipr"}, + {"title": "The Tipue blog", "text": "An occasional blog covering CSS, web development, etc.", "tags": "HTML5", "url": "http://www.tipue.com/?d=2"}, + {"title": "About Tipue", "text": "Tipue is a small web development studio based in North London. We've been around for well over a decade. We design innovative add-ins, plugins, code and features with heavy-duty Perl, MySQL and jQuery.", "tags": "", "url": "http://www.tipue.com/about"}, + {"title": "The Tipue blog - The complete guide to centering a div", "text": "Every new developer inevitably finds that centering a div isn't as obvious as you'd expect. Centering what's inside a div is easy enough by giving the text-align property a value of center, but then things tend to get a bit sticky. When you get to centering a div vertically, you can end up in a world of CSS hurt.", "tags": "HTML", "url": "http://www.tipue.com/blog/center-a-div"}, + {"title": "The Tipue blog - Native HTML5 autocomplete with input list", "text": "This article shows how with the HTML5 input list attribute and datalist element you can easily set up an input box with a custom autocomplete without jQuery, JavaScript or similar.", "tags": "", "url": "http://www.tipue.com/blog/input-list"}, + {"title": "The Tipue blog - The really simple guide to z-index", "text": "The CSS z-index property often trips up new and even experienced developers. The aim of this article is to boil down a somewhat-complex specification to 3 major points, which should ease most z-index pain.", "tags": "", "url": "http://www.tipue.com/z-index"} ]}; + + + diff --git a/pelican-bootstrap3/static/tipuesearch/tipuesearch_set.js b/pelican-bootstrap3/static/tipuesearch/tipuesearch_set.js index cbbd676..eab3f6e 100644 --- a/pelican-bootstrap3/static/tipuesearch/tipuesearch_set.js +++ b/pelican-bootstrap3/static/tipuesearch/tipuesearch_set.js @@ -1,21 +1,59 @@ /* -Tipue Search 4.0 -Copyright (c) 2014 Tipue +Tipue Search 5.0 +Copyright (c) 2015 Tipue Tipue Search is released under the MIT License http://www.tipue.com/search */ -var tipuesearch_stop_words = ["and", "be", "by", "do", "for", "he", "how", "if", "is", "it", "my", "not", "of", "or", "the", "to", "up", "what", "when"]; +/* +Stop words +Stop words list from http://www.ranks.nl/stopwords +*/ + +var tipuesearch_stop_words = ["a", "about", "above", "after", "again", "against", "all", "am", "an", "and", "any", "are", "aren't", "as", "at", "be", "because", "been", "before", "being", "below", "between", "both", "but", "by", "can't", "cannot", "could", "couldn't", "did", "didn't", "do", "does", "doesn't", "doing", "don't", "down", "during", "each", "few", "for", "from", "further", "had", "hadn't", "has", "hasn't", "have", "haven't", "having", "he", "he'd", "he'll", "he's", "her", "here", "here's", "hers", "herself", "him", "himself", "his", "how", "how's", "i", "i'd", "i'll", "i'm", "i've", "if", "in", "into", "is", "isn't", "it", "it's", "its", "itself", "let's", "me", "more", "most", "mustn't", "my", "myself", "no", "nor", "not", "of", "off", "on", "once", "only", "or", "other", "ought", "our", "ours", "ourselves", "out", "over", "own", "same", "shan't", "she", "she'd", "she'll", "she's", "should", "shouldn't", "so", "some", "such", "than", "that", "that's", "the", "their", "theirs", "them", "themselves", "then", "there", "there's", "these", "they", "they'd", "they'll", "they're", "they've", "this", "those", "through", "to", "too", "under", "until", "up", "very", "was", "wasn't", "we", "we'd", "we'll", "we're", "we've", "were", "weren't", "what", "what's", "when", "when's", "where", "where's", "which", "while", "who", "who's", "whom", "why", "why's", "with", "won't", "would", "wouldn't", "you", "you'd", "you'll", "you're", "you've", "your", "yours", "yourself", "yourselves"]; + + +// Word replace + +var tipuesearch_replace = {'words': [ + {'word': 'tipua', 'replace_with': 'tipue'}, + {'word': 'javscript', 'replace_with': 'javascript'}, + {'word': 'jqeury', 'replace_with': 'jquery'} +]}; -var tipuesearch_replace = {"words": [ - {"word": "tipua", "replace_with": "tipue"}, - {"word": "javscript", "replace_with": "javascript"} + +// Weighting + +var tipuesearch_weight = {'weight': [ + {'url': 'http://www.tipue.com', 'score': 200}, + {'url': 'http://www.tipue.com/search', 'score': 100}, + {'url': 'http://www.tipue.com/about', 'score': 100} ]}; -var tipuesearch_stem = {"words": [ - {"word": "e-mail", "stem": "email"}, - {"word": "javascript", "stem": "script"}, - {"word": "javascript", "stem": "js"} + +// Stemming + +var tipuesearch_stem = {'words': [ + {'word': 'e-mail', 'stem': 'email'}, + {'word': 'javascript', 'stem': 'jquery'}, + {'word': 'javascript', 'stem': 'js'} ]}; + + +// Internal strings + +var tipuesearch_string_1 = 'No title'; +var tipuesearch_string_2 = 'Showing results for'; +var tipuesearch_string_3 = 'Search instead for'; +var tipuesearch_string_4 = '1 result'; +var tipuesearch_string_5 = 'results'; +var tipuesearch_string_6 = 'Prev'; +var tipuesearch_string_7 = 'Next'; +var tipuesearch_string_8 = 'Nothing found'; +var tipuesearch_string_9 = 'Common words are largely ignored'; +var tipuesearch_string_10 = 'Search too short'; +var tipuesearch_string_11 = 'Should be one character or more'; +var tipuesearch_string_12 = 'Should be'; +var tipuesearch_string_13 = 'characters or more'; diff --git a/pelican-bootstrap3/templates/base.html b/pelican-bootstrap3/templates/base.html index 7c041d5..a33496c 100644 --- a/pelican-bootstrap3/templates/base.html +++ b/pelican-bootstrap3/templates/base.html @@ -105,7 +105,7 @@ <div class="navbar {% if BOOTSTRAP_NAVBAR_INVERSE %}navbar-inverse{% else %}navbar-default{% endif %} navbar-fixed-top" role="navigation"> <div class="container{% if BOOTSTRAP_FLUID %}-fluid{% endif %}"> <div class="navbar-header"> - {% if MENUITEMS or (PAGES and DISPLAY_PAGES_ON_MENU) or (categories and DISPLAY_CATEGORIES_ON_MENU) %} + {% if MENUITEMS or (pages and DISPLAY_PAGES_ON_MENU) or (categories and DISPLAY_CATEGORIES_ON_MENU) %} <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> @@ -123,11 +123,16 @@ {% for title, link in MENUITEMS %} <li><a href="{{ link }}">{{ title }}</a></li> {% endfor %} + {% if not PAGES_SORT_ATTRIBUTE -%} + {% set PAGES_SORT_ATTRIBUTE = 'title' %} + {%- endif %} {% if DISPLAY_PAGES_ON_MENU %} - {% for p in pages %} + {% for p in pages | sort(attribute=PAGES_SORT_ATTRIBUTE) %} + {% if p.url %} <li{% if p == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ p.url }}"> {{ p.menulabel|default(p.title) }} </a></li> + {% endif %} {% endfor %} {% endif %} {% if DISPLAY_CATEGORIES_ON_MENU %} @@ -163,7 +168,7 @@ <!-- End Banner --> <div class="container{% if BOOTSTRAP_FLUID %}-fluid{% endif %}"> <div class="row"> - {% if not HIDE_SIDEBAR or ABOUT_ME %} + {% if not HIDE_SIDEBAR or ABOUT_ME or AVATAR %} <div class="col-sm-9"> {% else %} <div class="col-lg-12"> @@ -173,10 +178,10 @@ {% block content %} {% endblock %} </div> - {% if not HIDE_SIDEBAR or ABOUT_ME %} + {% if not HIDE_SIDEBAR or ABOUT_ME or AVATAR %} <div class="col-sm-3" id="sidebar"> <aside> - {% if ABOUT_ME %} + {% if ABOUT_ME or AVATAR %} {% include 'includes/aboutme.html' %} {% endif %} {% if not HIDE_SIDEBAR %} diff --git a/pelican-bootstrap3/templates/includes/aboutme.html b/pelican-bootstrap3/templates/includes/aboutme.html index f38f0bc..3dc1c1c 100644 --- a/pelican-bootstrap3/templates/includes/aboutme.html +++ b/pelican-bootstrap3/templates/includes/aboutme.html @@ -1,11 +1,13 @@ <div id="aboutme"> {% if AVATAR %} <p> - <img width="100%" class="img-thumbnail" src="{{ AVATAR }}"/> + <img width="100%" class="img-thumbnail" src="{{ SITEURL }}/{{ AVATAR }}"/> </p> {% endif %} + {% if ABOUT_ME %} <p> <strong>About {{ AUTHOR }}</strong><br/> {{ ABOUT_ME }} </p> + {% endif %} </div>
\ No newline at end of file diff --git a/pelican-bootstrap3/templates/includes/pagination.html b/pelican-bootstrap3/templates/includes/pagination.html index 9ae4285..e74cdba 100644 --- a/pelican-bootstrap3/templates/includes/pagination.html +++ b/pelican-bootstrap3/templates/includes/pagination.html @@ -24,7 +24,7 @@ {% endif %} {% for num in range( 1, 1 + articles_paginator.num_pages ) %} <li class="{{ 'active' if num == articles_page.number else '' }}"><a - href="{{ SITEURL }}/{{ page_name }}{{ num if num > 1 else '' }}.html">{{ num }}</a></li> + href="{{ SITEURL }}/{{ articles_paginator.page(num).url if num > 1 else articles_paginator.page(1).url }}">{{ num }}</a></li> {% endfor %} {% if articles_page.has_next() %} <li class="next"><a diff --git a/pelican-bootstrap3/templates/includes/sidebar.html b/pelican-bootstrap3/templates/includes/sidebar.html index c59b8f0..4d7e6bb 100644 --- a/pelican-bootstrap3/templates/includes/sidebar.html +++ b/pelican-bootstrap3/templates/includes/sidebar.html @@ -13,7 +13,7 @@ {% else %} {% set name_sanitized = s[0]|lower|replace('+','-plus')|replace(' ','-') %} {% endif %} - {% if name_sanitized in ['flickr', 'slideshare', 'spotify', 'stack-overflow', 'weibo', 'line-chart'] %} + {% if name_sanitized in ['flickr', 'slideshare', 'spotify', 'stack-overflow', 'weibo', 'line-chart', 'home', 'user', 'users', 'envelope', 'envelope-o', 'stack-exchange', 'hacker-news'] %} {% set iconattributes = '"fa fa-' ~ name_sanitized ~ ' fa-lg"' %} {% else %} {% set iconattributes = '"fa fa-' ~ name_sanitized ~ '-square fa-lg"' %} @@ -79,18 +79,18 @@ {% if article.series %} <li class="list-group-item"><h4><i class="fa fa-tags fa-list-ul"></i><span class="icon-label">Series</span></h4> <ul class="list-group"> - <li class="list-group-item"> {% if article.series.previous %} + <li class="list-group-item"> <h5></i> Previous article</h5> <a href="{{ SITEURL }}/{{ article.series.previous.url }}">{{ article.series.previous.title }}</a> - {% endif %} </li> - <li class="list-group-item"> + {% endif %} {% if article.series.next %} + <li class="list-group-item"> <h5>Next article</h5> <a href="{{ SITEURL }}/{{ article.series.next.url }}">{{ article.series.next.title }}</a> - {% endif %} </li> + {% endif %} </ul> </li> {% endif%} @@ -103,4 +103,3 @@ {% include 'includes/sidebar-images.html' %} </ul> </section> - |
