Merge branch 'release/1.3.2'

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v1.3.2
+## 09/07/2015
+
+2. [](#improved)
+  * Added blueprints for Grav Admin plugin
+  * Corrected some variable names in languages.yaml [#5](https://github.com/Sommerregen/grav-plugin-archive-plus/pull/5)
+3. [](#bugfix)
+  * Fixed not working with Grav's Admin Panel [#4](https://github.com/Sommerregen/grav-plugin-archive-plus/issues/4)
+
 # v1.3.1
 ## 08/17/2015
 

README.md

@@ -14,12 +14,13 @@
 
 ## About
 
-`Archive Plus` shares many features with the [`Grav Archives plugin`](https://github.com/getgrav/grav-plugin-archives), e.g. it automatically appends a `year` and `month_year` taxonomy to all pages and provides a `partials\archive_plus.html.twig` template, which you can include in a blog sidebar to render links into a year/month/post format useful for blogs, but enhances them in an intuitive way.
+`Archive Plus` shares many features with the [`Grav Archives plugin`](https://github.com/getgrav/grav-plugin-archives), e.g. it automatically appends a "year/month" taxonomy to all pages and provides a `partials\archive_plus.html.twig` template, which you can include in a blog sidebar to render links into a year/month/post format useful for blogs, but enhances them in an intuitive way.
 
 Currently it
 
  - [x] adds a blogger like hierarchical (year/month/post) archive menu
- - [x] has multi-language support **(requires Grav 0.9.33
+ - [x] has (full) multi-language support **(requires Grav 0.9.33+)**
+ - [x] integrates in Admin panel
  - [ ] provides a custom archive page (under development)
  - [x] and a per site configuration
 

archive_plus.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Archive Plus v1.3.1
+ * Archive Plus v1.3.2
  *
  * An enhanced version of the Grav Archives plugin with more
  * configuration options and the ability to show a blogger-like
@@ -10,7 +10,7 @@
  * http://benjamin-regler.de/license/
  *
  * @package     Archive Plus
- * @version     1.3.1
+ * @version     1.3.2
  * @link        <https://github.com/sommerregen/grav-plugin-archive-plus>
  * @author      Benjamin Regler <[email protected]>
  * @copyright   2015, Benjamin Regler

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Archive Plus
-version: 1.3.1
+version: 1.3.2
 description: "The **Archive Plus** plugin is an enhanced version of the [Grav Archives plugin](https://github.com/getgrav/grav-plugin-archives) with more configuration options and the ability to show a blogger like hierarchical archive menu for links grouped by month and/or year."
 icon: university
 author:
@@ -16,132 +16,142 @@ form:
   fields:
     global:
       type: section
-      title: "Global plugin configurations"
+      title: PLUGINS.ARCHIVE_PLUS.GLOBAL_CONFIG
       underline: 1
 
       fields:
         enabled:
           type: toggle
-          label: "Plugin status"
+          label: PLUGINS.ARCHIVE_PLUS.PLUGIN_STATUS
           highlight: 1
           default: 1
           options:
-              1: Enabled
-              0: Disabled
+            1: PLUGIN_ADMIN.ENABLED
+            0: PLUGIN_ADMIN.DISABLED
           validate:
-               type: bool
+            type: bool
 
         built_in_css:
           type: toggle
-          label: "Use built in CSS"
+          label: PLUGINS.ARCHIVE_PLUS.BUILTIN_CSS
           highlight: 1
           default: 1
           options:
-            1: "Yes"
-            0: "No"
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
           validate:
             type: bool
 
     default:
       type: section
-      title: "Default values for Archive Plus configuration"
+      title: PLUGINS.ARCHIVE_PLUS.DEFAULT_CONFIG
       underline: 1
 
       fields:
         show.counter:
           type: toggle
-          label: "Show number of posts"
+          label: PLUGINS.ARCHIVE_PLUS.SHOW_NUMBER_OF_POSTS
           default: 1
           options:
-            1: "Yes"
-            0: "No"
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
           validate:
             type: bool
 
         show.year:
           type: toggle
-          label: "Show year"
+          label: PLUGINS.ARCHIVE_PLUS.SHOW_YEAR
           default: 1
           options:
-            1: "Yes"
-            0: "No"
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
           validate:
             type: bool
 
         show.month:
           type: toggle
-          label: "Show month"
+          label: PLUGINS.ARCHIVE_PLUS.SHOW_MONTH
           default: 1
           options:
-            1: "Yes"
-            0: "No"
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
+          validate:
+            type: bool
+
+        show.items:
+          type: toggle
+          label: PLUGINS.ARCHIVE_PLUS.SHOW_POSTS
+          default: 1
+          options:
+            1: PLUGIN_ADMIN.YES
+            0: PLUGIN_ADMIN.NO
           validate:
             type: bool
 
         limit.year:
           type: text
           size: x-small
-          label: "Year limit"
+          label: PLUGINS.ARCHIVE_PLUS.YEAR_LIMIT
           default: 2
-          help: "Set to zero to switch off year limit."
+          help: PLUGINS.ARCHIVE_PLUS.YEAR_LIMIT_HELP
           validate:
             type: number
             min: 0
 
         limit.month:
           type: text
           size: x-small
-          label: "Month limit"
+          label: PLUGINS.ARCHIVE_PLUS.MONTH_LIMIT
           default: 12
-          help: "Set to zero to switch off month limit."
+          help: PLUGINS.ARCHIVE_PLUS.MONTH_LIMIT_HELP
           validate:
             type: number
             min: 0
 
         limit.items:
           type: text
           size: x-small
-          label: "Post item limit"
+          label: PLUGINS.ARCHIVE_PLUS.POST_ITEM_LIMIT
           default: 40
-          help: "Set to zero to switch off item limit."
+          help: PLUGINS.ARCHIVE_PLUS.POST_ITEM_LIMIT_HELP
           validate:
             type: number
             min: 0
 
         order.dir:
           type: toggle
-          label: "Order Direction"
+          label: PLUGINS.ARCHIVE_PLUS.ORDER_DIRECTION
           highlight: asc
           default: desc
           options:
-            asc: Ascending
-            desc: Descending
+            asc: PLUGIN_ADMIN.ASCENDING
+            desc: PLUGIN_ADMIN.DESCENDING
 
         order.by:
           type: select
-          size: medium
+          size: large
           classes: fancy
-          label: "Order Type"
+          label: PLUGINS.ARCHIVE_PLUS.ORDER_TYPE
           options:
-            default: Default - based on folder name
-            folder: Folder - based on prefix-less folder name
-            help: Title - based on title field in header
-            date: Date - based on date field in header
+            default: PLUGIN_ADMIN.DEFAULT_ORDERING_DEFAULT
+            folder: PLUGIN_ADMIN.DEFAULT_ORDERING_FOLDER
+            title: PLUGIN_ADMIN.DEFAULT_ORDERING_TITLE
+            date: PLUGIN_ADMIN.DEFAULT_ORDERING_DATE
 
         filters:
-          type: text
-          size: medium
-          label: "Category filter"
-          help: "Comma separated list of category names"
-          validate:
-            type: commalist
+          type: array
+          size: large
+          label: PLUGINS.ARCHIVE_PLUS.FILTER
+          help: PLUGINS.ARCHIVE_PLUS.FILTER_HELP
+          placeholder_key: PLUGINS.ARCHIVE_PLUS.FILTER_PLACEHOLDER_KEY
+          placeholder_value: PLUGINS.ARCHIVE_PLUS.FILTER_PLACEHOLDER_VALUE
 
         filter_combinator:
           type: select
           size: medium
           classes: fancy
-          label: "Filter Combinator"
+          label: PLUGINS.ARCHIVE_PLUS.FILTER_COMBINATOR
           default: and
           options:
-            and: And - Boolean &&
-            or: Or - Boolean ||
+            and: PLUGINS.ARCHIVE_PLUS.FILTER_COMBINATOR_AND
+            or: PLUGINS.ARCHIVE_PLUS.FILTER_COMBINATOR_OR

languages.yaml

@@ -15,14 +15,37 @@ de:
       SHOW_MORE: "Mehr anzeigen »"
       MONTHS: ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"]
       SHORT_MONTHS: ["Jan", "Febr", "März", "Apr", "Mai", "Juni", "Juli", "Aug", "Sept", "Okt", "Nov", "Dez"]
+      GLOBAL_CONFIG: "Globale Einstellungen"
+      DEFAULT_CONFIG: "Standardeinstellungen für Archive Plus"
+      PLUGIN_STATUS: "Plugin Status"
+      BUILTIN_CSS: "Verwende mitgeliefertes CSS"
+      SHOW_NUMBER_OF_POSTS: "Zeige Gesamtanzahl der Beiträge"
+      SHOW_YEAR: "Zeige Jahr"
+      SHOW_MONTH: "Zeige Monat"
+      SHOW_POSTS: "Zeige Beiträge"
+      YEAR_LIMIT: "Anzahl vergangener Jahre"
+      YEAR_LIMIT_HELP: "Null setzen um alle Jahre anzuzeigen."
+      MONTH_LIMIT: "Anzahl vergangener Monate"
+      MONTH_LIMIT_HELP: "Null setzen um alle Monate anzuzeigen."
+      POST_ITEM_LIMIT: "Anzahl alter Beiträge"
+      POST_ITEM_LIMIT_HELP: "Null setzen um alle Beiträge anzuzeigen."
+      ORDER_DIRECTION: "Reihenfolge"
+      ORDER_TYPE: "Sortierung"
+      FILTER: "Filter"
+      FILTER_HELP: "Komma getrennte Liste von Kategorien-Werte Paare."
+      FILTER_PLACEHOLDER_KEY: "Kategorie"
+      FILTER_PLACEHOLDER_VALUE: "Blog"
+      FILTER_COMBINATOR: "Verknüpfung"
+      FILTER_COMBINATOR_AND: "Und - Boolsches &&"
+      FILTER_COMBINATOR_OR: "Oder - Boolsches ||"
 
 # Greek
 el:
   PLUGINS:
     ARCHIVE_PLUS:
       NAME: "αρχεία"
       SHOW_MORE: "Εμφάνιση περισσότερων »"
-      MONTHS_OF_THE_YEAR: ["Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"]
+      MONTHS: ["Ιανουάριος", "Φεβρουάριος", "Μάρτιος", "Απρίλιος", "Μάιος", "Ιούνιος", "Ιούλιος", "Αύγουστος", "Σεπτέμβριος", "Οκτώβριος", "Νοέμβριος", "Δεκέμβριος"]
       SHORT_MONTHS: ["Iαν","Φεβ","Μαρ","Απρ","Μαι","Ιουν","Ιουλ","Αυγ","Σεπ","Οκτ","Νοε","Δεκ"]
 
 # English
@@ -33,14 +56,37 @@ en:
       SHOW_MORE: "Show more »"
       MONTHS: ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]
       SHORT_MONTHS: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+      GLOBAL_CONFIG: "Global plugin configurations"
+      DEFAULT_CONFIG: "Default values for Archive Plus configuration"
+      PLUGIN_STATUS: "Plugin status"
+      BUILTIN_CSS: "Use built in CSS"
+      SHOW_NUMBER_OF_POSTS: "Show number of posts"
+      SHOW_YEAR: "Show year"
+      SHOW_MONTH: "Show month"
+      SHOW_POSTS: "Show Posts"
+      YEAR_LIMIT: "Year limit"
+      YEAR_LIMIT_HELP: "Set to zero to switch off year limit."
+      MONTH_LIMIT: "Month limit"
+      MONTH_LIMIT_HELP: "Set to zero to switch off month limit."
+      POST_ITEM_LIMIT: "Post item limit"
+      POST_ITEM_LIMIT_HELP: "Set to zero to switch off item limit."
+      ORDER_DIRECTION: "Order Direction"
+      ORDER_TYPE: "Order Type"
+      FILTER: "Filter"
+      FILTER_HELP: "Comma separated list of taxonomy name pairs."
+      FILTER_PLACEHOLDER_KEY: "category"
+      FILTER_PLACEHOLDER_VALUE: "blog"
+      FILTER_COMBINATOR: "Filter Combinator"
+      FILTER_COMBINATOR_AND: "And - Boolean &&"
+      FILTER_COMBINATOR_OR: "Or - Boolean ||"
 
 # Spanish
 es:
   PLUGINS:
     ARCHIVE_PLUS:
       NAME: "archivo"
       SHOW_MORE: "Mostrar más »"
-      MONTHS_OF_THE_YEAR: ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"]
+      MONTHS: ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"]
       SHORT_MONTHS: ["Enero", "Feb", "Marzo", "Abr", "Mayo", "Jun", "Jul", "Agosto", "Sept", "Oct", "Nov", "Dic"]
 
 
@@ -50,7 +96,7 @@ fr:
     ARCHIVE_PLUS:
       NAME: "archives"
       SHOW_MORE: "Afficher plus »"
-      MONTHS_OF_THE_YEAR: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"]
+      MONTHS: ["Janvier", "Février", "Mars", "Avril", "Mai", "Juin", "Juillet", "Août", "Septembre", "Octobre", "Novembre", "Décembre"]
       SHORT_MONTHS: ["Janv", "Févr", "Mars", "Avril", "Mai", "Juin", "Juil", "Août", "Sept", "Oct", "Nov", "Déc"]
 
 # Italian
@@ -59,7 +105,7 @@ it:
     ARCHIVE_PLUS:
       NAME: "archivio"
       SHOW_MORE: "Mostra più »"
-      MONTHS_OF_THE_YEAR: ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"]
+      MONTHS: ["Gennaio", "Febbraio", "Marzo", "Aprile", "Maggio", "Giugno", "Luglio", "Agosto", "Settembre", "Ottobre", "Novembre", "Dicembre"]
       SHORT_MONTHS: ["Genn", "Febbr", "Mar", "Apr", "Magg", "Giugno", "Luglio", "Ag", "Sett", "Ott", "Nov", "Dic"]
 
 # Dutch
@@ -68,7 +114,7 @@ nl:
     ARCHIVE_PLUS:
       NAME: "archief"
       SHOW_MORE: "Meer bekijk »"
-      MONTHS_OF_THE_YEAR: ["Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli", "Augustus", "September", "Oktober", "November", "December"]
+      MONTHS: ["Januari", "Februari", "Maart", "April", "Mei", "Juni", "Juli", "Augustus", "September", "Oktober", "November", "December"]
       SHORT_MONTHS: ["Jan", "Feb", "Maart", "Apr", "Mei", "Juni", "Juli", "Aug", "Sept", "Okt", "Nov", "Dec"]
 
 
@@ -78,7 +124,7 @@ pl:
     ARCHIVE_PLUS:
       NAME: "archiwa"
       SHOW_MORE: "Pokaż więcej »"
-      MONTHS_OF_THE_YEAR: ["Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"]
+      MONTHS: ["Styczeń", "Luty", "Marzec", "Kwiecień", "Maj", "Czerwiec", "Lipiec", "Sierpień", "Wrzesień", "Październik", "Listopad", "Grudzień"]
       SHORT_MONTHS: ["Stycz", "Luty", "Mar", "Kwiec", "Maj", "Czerw", "Lip", "Sierp", "Wrzes", "Paźdz", "Listop", "Grudz"]
 
 
@@ -88,7 +134,7 @@ pt:
     ARCHIVE_PLUS:
       NAME: "arquivo"
       SHOW_MORE: "Mostrar mais »"
-      MONTHS_OF_THE_YEAR: ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agôsto", "Setembro", "Outubro", "Novembro", "Dezembro"]
+      MONTHS: ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agôsto", "Setembro", "Outubro", "Novembro", "Dezembro"]
       SHORT_MONTHS: ["Jan", "Fev", "Março", "Abril", "Maio", "Junho", "Julho", "Agôsto", "Set", "Out", "Nov", "Dez"]
 
 # Romanian
@@ -97,7 +143,7 @@ ro:
     ARCHIVE_PLUS:
       NAME: "arhive"
       SHOW_MORE: "Afiseare tot »"
-      MONTHS_OF_THE_YEAR: ["Ianuarie", "Februarie", "Martie", "Aprilue", "Mai", "Iunie", "Iulie", "August", "Septembrie", "Octombrie", "Noiembrie", "Decembrie"]
+      MONTHS: ["Ianuarie", "Februarie", "Martie", "Aprilue", "Mai", "Iunie", "Iulie", "August", "Septembrie", "Octombrie", "Noiembrie", "Decembrie"]
       SHORT_MONTHS: ["Ian", "Feb", "Mar", "Apr", "Mai", "Iunie", "Iulie", "Aug", "Sept", "Oct", "Noem", "Dec"]
 
 # Russian
@@ -106,7 +152,7 @@ ru:
     ARCHIVE_PLUS:
       NAME: "архив"
       SHOW_MORE: "Показать еще »"
-      MONTHS_OF_THE_YEAR: ["Январь", "Февраль", "Март", "Апрель", "Май", "Июнь", "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"]
+      MONTHS: ["Январь", "Февраль", "Март", "Апрель", "Май", "Июнь", "Июль", "Август", "Сентябрь", "Октябрь", "Ноябрь", "Декабрь"]
       SHORT_MONTHS: ["Ianv", "Fev", "Mart", "Apr", "Mai", "Iiun", "Iiul", "Avg", "Sent", "Okt", "Noiabr", "Dek"]
 
 # Ukrainian