From 25ebdfcd7a0795009f8f704d68e6e73c4b79a5de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Orze=C5=82?= Date: Wed, 18 Feb 2015 18:03:05 +0100 Subject: [PATCH 1/4] Fixes #1 --- templates/partials/simplesearch_searchbox.html.twig | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 templates/partials/simplesearch_searchbox.html.twig diff --git a/templates/partials/simplesearch_searchbox.html.twig b/templates/partials/simplesearch_searchbox.html.twig new file mode 100644 index 0000000..0c060f1 --- /dev/null +++ b/templates/partials/simplesearch_searchbox.html.twig @@ -0,0 +1,13 @@ + + From c0eafa93590dd7fc96529cb27bcf4fdc7a450da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Orze=C5=82?= Date: Wed, 18 Feb 2015 18:41:41 +0100 Subject: [PATCH 2/4] Simple search issues fix --- .../partials/simplesearch_base.html.twig | 92 +++++++++++++++++++ templates/simplesearch_results.html.twig | 17 ++++ 2 files changed, 109 insertions(+) create mode 100644 templates/partials/simplesearch_base.html.twig create mode 100644 templates/simplesearch_results.html.twig diff --git a/templates/partials/simplesearch_base.html.twig b/templates/partials/simplesearch_base.html.twig new file mode 100644 index 0000000..da59909 --- /dev/null +++ b/templates/partials/simplesearch_base.html.twig @@ -0,0 +1,92 @@ + + + +{% block head %} + + {% if header.title %}{{ header.title }} | {% endif %}{{ site.title }} + {% include 'partials/metadata.html.twig' %} + + + + {% block stylesheets %} + {% do assets.addCss('theme://css-compiled/nucleus.css',102) %} + {% do assets.addCss('theme://css-compiled/template.css',101) %} + {% do assets.addCss('theme://css/custom.css',100) %} + {% do assets.addCss('theme://css/font-awesome.min.css',100) %} + {% do assets.addCss('theme://css/slidebars.min.css') %} + {% do assets.addCss('theme://css/slideme.css') %} + {% if browser.getBrowser == 'msie' and browser.getVersion == 10 %} + {% do assets.addCss('theme://css/nucleus-ie10.css') %} + {% endif %} + {% if browser.getBrowser == 'msie' and browser.getVersion >= 8 and browser.getVersion <= 9 %} + {% do assets.addCss('theme://css/nucleus-ie9.css') %} + {% do assets.addCss('theme://css/pure-0.5.0/grids-min.css') %} + {% do assets.addCss('theme://js/html5shiv-printshiv.min.js') %} + {% endif %} + {% endblock %} + {{ assets.css() }} + + {% block javascripts %} + {% do assets.addJs('theme://js/jquery-2.1.1.min.js',101) %} + {% do assets.addJs('theme://js/modernizr.custom.71422.js',100) %} + {% do assets.addJs('theme://js/deliver.js') %} + {% do assets.addJs('theme://js/slidebars.min.js') %} + {% do assets.addJs('theme://js/jquery.slideme2.js') %} + {% endblock %} + {{ assets.js() }} + +{% endblock head%} + + +
+ {% block header %} + + {% endblock %} + + {% block showcase %}{% endblock %} + + {% block body %} +
+ {% block content %}{% endblock %} + + {% block footer %} + {% include 'modular/footer.html.twig' %} + {% endblock %} +
+ {% endblock %} + +
+
+
+ {% include 'partials/navigation.html.twig' %} +
+
+ {% block bottom %} + + {% endblock %} + + diff --git a/templates/simplesearch_results.html.twig b/templates/simplesearch_results.html.twig new file mode 100644 index 0000000..db82bf5 --- /dev/null +++ b/templates/simplesearch_results.html.twig @@ -0,0 +1,17 @@ +{% extends 'partials/simplesearch_base.html.twig' %} + +{% block content %} +
+

Search Results

+
+ {% include 'partials/simplesearch_searchbox.html.twig' %} + +
+{% set body_classes = 'bar' %} + +

Query: {{ query }} found {{ search_results.count }} {{ 'result'|pluralize(search_results.count) }}

+ {% for page in search_results %} + {% include 'partials/simplesearch_item.html.twig' with {'page':page} %} + {% endfor %} +
+{% endblock %} From ea2b5d7c23f420e248b404767e0d3c806e2ddd47 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 18 Feb 2015 16:14:33 -0700 Subject: [PATCH 3/4] updated with new param separator --- templates/partials/blog_item.html.twig | 2 +- templates/partials/taxonomylist.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/partials/blog_item.html.twig b/templates/partials/blog_item.html.twig index 19b4ab2..268540c 100644 --- a/templates/partials/blog_item.html.twig +++ b/templates/partials/blog_item.html.twig @@ -34,7 +34,7 @@ {% endif %} diff --git a/templates/partials/taxonomylist.html.twig b/templates/partials/taxonomylist.html.twig index 2e5be8e..2361a6f 100644 --- a/templates/partials/taxonomylist.html.twig +++ b/templates/partials/taxonomylist.html.twig @@ -5,7 +5,7 @@ From d0befff330b737dd59ff3255b88003606a51136c Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 19 Feb 2015 16:26:03 -0700 Subject: [PATCH 4/4] version update --- CHANGELOG.md | 7 +++++++ blueprints.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 97a3753..f078961 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v1.0.2 +## 02/19/2015 + +2. [](#improved) + * Added SimpleSearch capability + * Implemented new `param_sep` variable from Grav 0.9.18 + # v1.0.1 ## 02/10/2015 diff --git a/blueprints.yaml b/blueprints.yaml index 6babbb7..138eaed 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Deliver -version: 1.0.1 +version: 1.0.2 description: "Deliver theme is a port of the Michael Reimer's Deliver Free PSD theme." icon: newspaper-o author: