From 282584e035af7888685a5df44b813e759dc49cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Thu, 26 Mar 2015 21:39:01 +0100 Subject: [PATCH 1/6] A bit more consistent formatting in catalog template --- stylesheets/fonts/OpenSans-Light-webfont.eot? | Bin 19084 -> 0 bytes templates/themes/catalog/catalog.html | 117 +++++++++++++------------- 2 files changed, 59 insertions(+), 58 deletions(-) delete mode 100644 stylesheets/fonts/OpenSans-Light-webfont.eot? diff --git a/stylesheets/fonts/OpenSans-Light-webfont.eot? b/stylesheets/fonts/OpenSans-Light-webfont.eot? deleted file mode 100644 index 12430030d3ed751d4db02e61950ce6049fa9981f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19084 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 diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html index 45239c5b..6cc75a7d 100644 --- a/templates/themes/catalog/catalog.html +++ b/templates/themes/catalog/catalog.html @@ -18,74 +18,75 @@
{{ settings.subtitle }}
-
    -
  • {% trans 'Bump order' %}
    • -
  • {% trans 'Creation date' %}
    • -
  • {% trans 'Reply count' %}
    • -
  • {% trans 'Random' %}
    • -
- - {% trans 'Sort by' %}: - - - {% trans 'Image size' %}: - -
-
    - {% for post in recent_posts %} -
  • {% trans 'Bump order' %}
    • +
  • {% trans 'Creation date' %}
    • +
  • {% trans 'Reply count' %}
    • +
  • {% trans 'Random' %}
    • +
+ + {% trans 'Sort by' %}: + + + {% trans 'Image size' %}: + + +
+
    + {% for post in recent_posts %} +
  • -
    - - {% if post.youtube %} - - -
    - R: {{ post.reply_count }} / I: {{ post.image_count }} - {% if post.subject %} -

    - - {{ post.subject|e }} - -

    - {% else %} -
    - {% endif %} +
    + + {% if post.youtube %} + + +
    + R: {{ post.reply_count }} / I: {{ post.image_count }} + {% if post.subject %} +

    + + {{ post.subject|e }} + +

    + {% else %} +
    + {% endif %} + + {{ post.body }} +
    +
    +
    • + {% endfor %} +
+
- {{ post.body }} -
- - - {% endfor %} - - -
- + {% endfilter %} From 20ce6999d2a069919754978a4a6aa32e939b523d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Thu, 26 Mar 2015 21:43:26 +0100 Subject: [PATCH 2/6] Wrap controls on the catalog page in a div --- templates/themes/catalog/catalog.html | 40 ++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html index 6cc75a7d..12b3cd98 100644 --- a/templates/themes/catalog/catalog.html +++ b/templates/themes/catalog/catalog.html @@ -18,27 +18,29 @@
{{ settings.subtitle }}
-
    -
  • {% trans 'Bump order' %}
    • -
  • {% trans 'Creation date' %}
    • -
  • {% trans 'Reply count' %}
    • -
  • {% trans 'Random' %}
    • -
+
+
    +
  • {% trans 'Bump order' %}
    • +
  • {% trans 'Creation date' %}
    • +
  • {% trans 'Reply count' %}
    • +
  • {% trans 'Random' %}
    • +
- {% trans 'Sort by' %}: - + {% trans 'Sort by' %}: + - {% trans 'Image size' %}: - + {% trans 'Image size' %}: + +
    From 32821745c632bff01feb58cd234295dceaeea2a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Thu, 26 Mar 2015 22:32:00 +0100 Subject: [PATCH 3/6] Add a simple search functionality to the catalog Requires commit 20ce699 which adds a wrapper for the controls on the catalog page. --- js/catalog-search.js | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 js/catalog-search.js diff --git a/js/catalog-search.js b/js/catalog-search.js new file mode 100644 index 00000000..07e21f87 --- /dev/null +++ b/js/catalog-search.js @@ -0,0 +1,45 @@ +/* + * catalog-search.js + * https://github.com/mgrabovsky/lainchan/lainchan/blob/catalog-search/js/catalog-search.js + * + * Released under the MIT license + * Copyright (c) 2015 Matěj Grabovský + * + * Usage: + * $config['additional_javascript'][] = 'js/jquery.min.js'; + * $config['additional_javascript'][] = 'js/catalog-search.js'; + */ + +(function() { + +var catalogSearch = function() { + var $controls = $('.controls'), + $threads = $('.threads .thread'), + $searchLabel = $(''), + $searchBox = $(''); + + $controls.append($searchLabel) + .append($searchBox); + + $searchBox.change(function() { + var query = new RegExp(this.value, 'm'), + $found = searchThreads($threads, query); + $threads.hide(); + $found.show(); + }); +}; + +// Filter threads by their content, given a regex. Can be extended later to load data +// remotely and filter by multiple fields +var searchThreads = function($threads, re) { + return $threads.filter(function() { + return re.test($('.replies', this).text()); + }); +}; + +// Only load in the catalog +if (active_page == 'catalog') { + onready(catalogSearch); +} + +}()); From 3d2ddb8c3b3eb0f1d5c697bc9dcf7faf371f6708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Fri, 27 Mar 2015 13:38:45 +0100 Subject: [PATCH 4/6] Make catalog search case-insensitive & instantaneous --- js/catalog-search.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/catalog-search.js b/js/catalog-search.js index 07e21f87..b91fc1ea 100644 --- a/js/catalog-search.js +++ b/js/catalog-search.js @@ -21,9 +21,8 @@ var catalogSearch = function() { $controls.append($searchLabel) .append($searchBox); - $searchBox.change(function() { - var query = new RegExp(this.value, 'm'), - $found = searchThreads($threads, query); + $searchBox.keyup(function() { + var $found = searchThreads($threads, this.value); $threads.hide(); $found.show(); }); @@ -31,7 +30,8 @@ var catalogSearch = function() { // Filter threads by their content, given a regex. Can be extended later to load data // remotely and filter by multiple fields -var searchThreads = function($threads, re) { +var searchThreads = function($threads, query) { + var re = new RegExp(query, 'mi'); return $threads.filter(function() { return re.test($('.replies', this).text()); }); From 6b37abab85ad342fd18e5c09c65248634e7dd194 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Fri, 27 Mar 2015 13:55:01 +0100 Subject: [PATCH 5/6] Allow catalog search by a URL fragment (#s=...) --- js/catalog-search.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/js/catalog-search.js b/js/catalog-search.js index b91fc1ea..3235d1dc 100644 --- a/js/catalog-search.js +++ b/js/catalog-search.js @@ -26,9 +26,14 @@ var catalogSearch = function() { $threads.hide(); $found.show(); }); + + var m = location.hash.match(/[#&]s=([^&]+)/); + if(m) { + $searchBox.val(decodeURIComponent(m[1])).keyup(); + } }; -// Filter threads by their content, given a regex. Can be extended later to load data +// Filter threads by their content, given a regex. Can be extended to load data // remotely and filter by multiple fields var searchThreads = function($threads, query) { var re = new RegExp(query, 'mi'); From 7b33348a16e04f68458d1d2f876fbea27e9cb14d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Fri, 27 Mar 2015 13:59:41 +0100 Subject: [PATCH 6/6] Fix source URL in comment --- js/catalog-search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/catalog-search.js b/js/catalog-search.js index 3235d1dc..ac7ef57a 100644 --- a/js/catalog-search.js +++ b/js/catalog-search.js @@ -1,6 +1,6 @@ /* * catalog-search.js - * https://github.com/mgrabovsky/lainchan/lainchan/blob/catalog-search/js/catalog-search.js + * https://github.com/mgrabovsky/lainchan/blob/catalog-search/js/catalog-search.js * * Released under the MIT license * Copyright (c) 2015 Matěj Grabovský