From c66917c9a07a05d8e78943bcfb19b834d145fa9e Mon Sep 17 00:00:00 2001 From: kevin tessier Date: Thu, 21 Feb 2019 04:02:36 +0100 Subject: [PATCH] update + add list_taxonomy --- CHANGELOG.md | 9 +++- system/defines.php | 2 +- system/src/Grav/Common/Page/Pages.php | 2 +- system/src/Grav/Common/User/User.php | 4 ++ user/config/plugins/admin.yaml | 54 +++++++++++++++++++ user/pages/02.projets/nom-du-projets/item.md | 3 -- .../02.projets/tous-des-sang-meles-2/item.md | 2 + .../02.projets/tous-des-sang-meles-3/item.md | 2 + .../02.projets/tous-des-sang-meles-4/item.md | 2 + .../02.projets/tous-des-sang-meles/item.md | 4 +- .../templates/partials/archives.html.twig | 13 ----- .../templates/partials/sidebar.html.twig | 49 ++--------------- .../templates/partials/taxonomylist.html.twig | 17 +++++- 13 files changed, 98 insertions(+), 65 deletions(-) create mode 100644 user/config/plugins/admin.yaml delete mode 100644 user/themes/figureslibres/templates/partials/archives.html.twig diff --git a/CHANGELOG.md b/CHANGELOG.md index 614d2c7..088dd41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ +# v1.5.8 +## 02/07/2019 + +1. [](#improved) + * Improved `User` unserialize to not to break the object if serialized data is not what expected + * Removed unused parameter [#2357](https://github.com/getgrav/grav/pull/2357) + # v1.5.7 -## 01/25/2018 +## 01/25/2019 1. [](#new) * Support for AWS Cloudfront forwarded scheme header [#2297](https://github.com/getgrav/grav/pull/2297) diff --git a/system/defines.php b/system/defines.php index 516c2b6..0c21d8d 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,7 +8,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.5.7'); +define('GRAV_VERSION', '1.5.8'); define('GRAV_TESTING', false); define('DS', '/'); diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php index ac0e41c..0c527d1 100644 --- a/system/src/Grav/Common/Page/Pages.php +++ b/system/src/Grav/Common/Page/Pages.php @@ -946,7 +946,7 @@ class Pages $this->grav['debugger']->addMessage('Page cache missed, rebuilding pages..'); // recurse pages and cache result - $this->resetPages($pages_dir, $this->pages_cache_id); + $this->resetPages($pages_dir); } else { // If pages was found in cache, set the taxonomy diff --git a/system/src/Grav/Common/User/User.php b/system/src/Grav/Common/User/User.php index 9cce364..c6f5dac 100644 --- a/system/src/Grav/Common/User/User.php +++ b/system/src/Grav/Common/User/User.php @@ -306,6 +306,10 @@ class User extends Data $this->gettersVariable = 'items'; $this->nestedSeparator = '.'; + if (null === $this->items) { + $this->items = []; + } + if (null === $this->blueprints) { $blueprints = new Blueprints; $this->blueprints = $blueprints->get('user/account'); diff --git a/user/config/plugins/admin.yaml b/user/config/plugins/admin.yaml new file mode 100644 index 0000000..01acf61 --- /dev/null +++ b/user/config/plugins/admin.yaml @@ -0,0 +1,54 @@ +enabled: true +route: /admin +cache_enabled: false +theme: grav +content_padding: true +twofa_enabled: true +sidebar: + activate: tab + hover_delay: 100 + size: auto +dashboard: + days_of_stats: 7 +widgets: + dashboard-maintenance: true + dashboard-statistics: true + dashboard-notifications: true + dashboard-feed: true + dashboard-pages: true +pages: + show_parents: both + show_modular: true +session: + timeout: 1800 +warnings: + delete_page: true +edit_mode: normal +frontend_preview_target: inline +show_github_msg: true +pages_list_display_field: title +google_fonts: false +admin_icons: line-awesome +enable_auto_updates_check: true +notifications: + feed: true + dashboard: true + plugins: true + themes: true +popularity: + enabled: true + ignore: + - '/test*' + - /modular + history: + daily: '30' + monthly: '12' + visitors: '20' +pagemedia: + resize_width: 0 + resize_height: 0 + res_min_width: 0 + res_min_height: 0 + res_max_width: 0 + res_max_height: 0 + resize_quality: 0.8 diff --git a/user/pages/02.projets/nom-du-projets/item.md b/user/pages/02.projets/nom-du-projets/item.md index 2f78819..7126bdf 100644 --- a/user/pages/02.projets/nom-du-projets/item.md +++ b/user/pages/02.projets/nom-du-projets/item.md @@ -1,8 +1,5 @@ --- title: 'Nom du projets' -taxonomy: - category: - - social --- blablablablabla diff --git a/user/pages/02.projets/tous-des-sang-meles-2/item.md b/user/pages/02.projets/tous-des-sang-meles-2/item.md index 4ff32ea..b99c623 100644 --- a/user/pages/02.projets/tous-des-sang-meles-2/item.md +++ b/user/pages/02.projets/tous-des-sang-meles-2/item.md @@ -2,6 +2,8 @@ title: 'Comprendre des migrations internationales' media_order: 'OSC_2779_01.jpg,OSC_2748_01.jpg,OSC_2785.jpg,OSC_2793.jpg,OSC_2800.jpg,OSC_2802.jpg,OSC_2820.jpg' taxonomy: + category: + - Éditions tag: - sociale --- diff --git a/user/pages/02.projets/tous-des-sang-meles-3/item.md b/user/pages/02.projets/tous-des-sang-meles-3/item.md index 7b50d98..4c564df 100644 --- a/user/pages/02.projets/tous-des-sang-meles-3/item.md +++ b/user/pages/02.projets/tous-des-sang-meles-3/item.md @@ -1,6 +1,8 @@ --- title: 'L’Encyclopédie de la Parole' taxonomy: + category: + - 'Site web' tag: - culturelle --- diff --git a/user/pages/02.projets/tous-des-sang-meles-4/item.md b/user/pages/02.projets/tous-des-sang-meles-4/item.md index 61cefc8..ee8e890 100644 --- a/user/pages/02.projets/tous-des-sang-meles-4/item.md +++ b/user/pages/02.projets/tous-des-sang-meles-4/item.md @@ -2,6 +2,8 @@ title: 'Les spectacles de l’Encyclopédie' media_order: '1.jpg,2.jpg,3.jpg,4.jpg' taxonomy: + category: + - Éditions tag: - culturelle --- diff --git a/user/pages/02.projets/tous-des-sang-meles/item.md b/user/pages/02.projets/tous-des-sang-meles/item.md index f13b7a6..9db88a7 100644 --- a/user/pages/02.projets/tous-des-sang-meles/item.md +++ b/user/pages/02.projets/tous-des-sang-meles/item.md @@ -2,6 +2,8 @@ title: 'Tous, des sang-mêlés' media_order: 'OSC_2566.jpg,OSC_2539.jpg,OSC_2703_01.jpg,OSC_2614_01.jpg,OSC_2618_01.jpg,OSC_2625_02.jpg,OSC_2649.jpg,OSC_2672.jpg' taxonomy: + category: + - Éditions tag: - culturelle --- @@ -12,4 +14,4 @@ Catalogue d’exposition L’ouvrage met en lumière l’exposition à travers cinq carnets de tailles et de couleurs différentes, dont les titrages mélangent plusieurs polices de caractères. La diversité des formats et des couleurs exprime la notion de différence, de singularité et de multi culturalité, sujets transversaux de l’exposition. Cet objet modulable, multipliant les approches, génère plusieurs lectures différentes. Une expérience éditoriale menée par Maud Boyer pour le design, Bachir Soussi-Chiadmi et Kevin Tessier pour le développement du HTML2Print -Fabriqué par nos soins sous Scribus pour la maquette de principe puis développée en HTML2Print \ No newline at end of file +Fabriqué par nos soins sous Scribus pour la maquette de principe puis développée en HTML2Print diff --git a/user/themes/figureslibres/templates/partials/archives.html.twig b/user/themes/figureslibres/templates/partials/archives.html.twig deleted file mode 100644 index af862d3..0000000 --- a/user/themes/figureslibres/templates/partials/archives.html.twig +++ /dev/null @@ -1,13 +0,0 @@ - diff --git a/user/themes/figureslibres/templates/partials/sidebar.html.twig b/user/themes/figureslibres/templates/partials/sidebar.html.twig index e136713..6a42549 100644 --- a/user/themes/figureslibres/templates/partials/sidebar.html.twig +++ b/user/themes/figureslibres/templates/partials/sidebar.html.twig @@ -1,47 +1,6 @@ {% set feed_url = blog.url == '/' or blog.url == base_url_relative ? (base_url_relative~'/'~blog.slug) : blog.url %} {% set new_base_url = blog.url == '/' ? '' : blog.url %} -{% if config.plugins.simplesearch.enabled %} -
- {% include 'partials/simplesearch_searchbox.html.twig' %} -
-{% endif %} -{% if config.plugins.relatedpages.enabled and related_pages|length > 0 %} -
-

{{ 'THEME_QUARK.SIDEBAR.RELATED_POSTS.HEADLINE'|t }}

- {% include 'partials/relatedpages.html.twig' %} -
-{% endif %} -{% if config.plugins.random.enabled %} -
-

{{ 'THEME_QUARK.SIDEBAR.RANDOM_ARTICLE.HEADLINE'|t }}

- {{ 'THEME_QUARK.SIDEBAR.RANDOM_ARTICLE.FEELING_LUCKY'|t }} -
-{% endif %} - -{{ page.find('/modules/sidebar').content|raw }} - -{% if config.plugins.taxonomylist.enabled %} -
-

{{ 'THEME_QUARK.SIDEBAR.POPULAR_TAGS.HEADLINE'|t }}

- {% include 'partials/taxonomylist.html.twig' with {'base_url':new_base_url, 'taxonomy':'tag'} %} -
-{% endif %} -{% if config.plugins.archives.enabled %} -
-

{{ 'THEME_QUARK.SIDEBAR.ARCHIVES.HEADLINE'|t }}

- {% include 'partials/archives.html.twig' with {'base_url':new_base_url} %} -
-{% endif %} -{% if config.plugins.feed.enabled %} -
-

{{ 'THEME_QUARK.SIDEBAR.SYNDICATE.HEADLINE'|t }}

- Atom 1.0 - RSS - {% if config.plugins.feed.enable_json_feed %} JSON{% endif %} -
-{% endif %} -
{% set options = { items: {'@page': '/contact' } } %} {% set my_collection = page.collection(options) %} @@ -55,9 +14,11 @@
{% set options = { items: {'@page': '/projets' } } %} {% set my_collection = page.collection(options) %} +
    - {% for p in my_collection %} -
  • {{ p.title }}
    •  - {% endfor %} + {% include 'partials/taxonomylist.html.twig' with {'base_url': new_base_url, 'taxonomy':'category'} %} +
diff --git a/user/themes/figureslibres/templates/partials/taxonomylist.html.twig b/user/themes/figureslibres/templates/partials/taxonomylist.html.twig index d0e0267..cdd8a98 100644 --- a/user/themes/figureslibres/templates/partials/taxonomylist.html.twig +++ b/user/themes/figureslibres/templates/partials/taxonomylist.html.twig @@ -1,8 +1,23 @@ {% set taxlist = children_only is defined ? taxonomylist.getChildPagesTags() : taxonomylist.get() %} + {% if taxlist %} + {% endif %}