merge master in prod

2020-09-08 12:00:45 +02:00
parent b925edaa9e
commit 3e5e731c2c
226 changed files with 8516 additions and 4149 deletions
@@ -1,6 +1,8 @@
 name: Sitemap
-version: 1.9.2
+version: 2.0.1
 description: "Provide automatically generated **XML sitemaps** with this very useful, but simple to configure, Grav plugin."
+slug: sitemap
+type: plugin
 icon: map-marker
 author:
  name: Team Grav
@@ -12,7 +14,7 @@ bugs: https://github.com/getgrav/grav-plugin-sitemap/issues
 license: MIT

 dependencies:
-    - { name: grav, version: '>=1.1.6' }
+    - { name: grav, version: '>=1.6.0' }

 form:
  validation: strict
@@ -27,7 +29,6 @@ form:
        0: PLUGIN_ADMIN.DISABLED
      validate:
        type: bool
-  
    changefreq:
      type: select
      label: PLUGIN_SITEMAP.CHANGEFREQ
@@ -66,26 +67,81 @@ form:
      label: PLUGIN_SITEMAP.ROUTE
      placeholder: /sitemap
      validate:
-        pattern: "/([a-z\-_]+/?)+"
+        pattern: "/([a-z-_]+/?)+"
+
+    ignore_external:
+      type: toggle
+      label: PLUGIN_SITEMAP.IGNORE_EXTERNAL
+      help: PLUGIN_SITEMAP.IGNORE_EXTERNAL_HELP
+      highlight: 1
+      default: 1
+      options:
+        1: PLUGIN_ADMIN.ENABLED
+        0: PLUGIN_ADMIN.DISABLED
+      validate:
+        type: bool
+
+    ignore_protected:
+      type: toggle
+      label: PLUGIN_SITEMAP.IGNORE_PROTECTED
+      help: PLUGIN_SITEMAP.IGNORE_PROTECTED_HELP
+      highlight: 1
+      default: 1
+      options:
+        1: PLUGIN_ADMIN.ENABLED
+        0: PLUGIN_ADMIN.DISABLED
+      validate:
+        type: bool

    ignores:
-        type: array
-        label: PLUGIN_SITEMAP.IGNORES
-        help: PLUGIN_SITEMAP.IGNORES_HELP
-        value_only: true
-        placeholder_value: /ignore-this-route
+      type: array
+      label: PLUGIN_SITEMAP.IGNORES
+      help: PLUGIN_SITEMAP.IGNORES_HELP
+      value_only: true
+      placeholder_value: '/ignore-this-route'

    additions:
-        type: list
-        label: PLUGIN_SITEMAP.ADDITIONS
-        help: PLUGIN_SITEMAP.ADDITIONS_HELP
+      type: list
+      label: PLUGIN_SITEMAP.ADDITIONS
+      help: PLUGIN_SITEMAP.ADDITIONS_HELP

-        fields:
-          .location:
-            type: text
-            label: PLUGIN_SITEMAP.LOCATION
-            placeholder: "/not-a-grav-url"
-          .lastmod:
-            type: text
-            label: PLUGIN_SITEMAP.LASTMOD
-            placeholder: "2017-04-06"
+      fields:
+        .location:
+          type: text
+          label: PLUGIN_SITEMAP.LOCATION
+          placeholder: "/not-a-grav-url"
+        .lastmod:
+          type: text
+          label: PLUGIN_SITEMAP.LASTMOD
+          placeholder: "2017-04-06"
+        .changefreq:
+          type: select
+          label: PLUGIN_SITEMAP.CHANGEFREQ
+          default: ''
+          options:
+            '': PLUGIN_SITEMAP.CHANGEFREQ_DEFAULT
+            always: PLUGIN_SITEMAP.CHANGEFREQ_ALWAYS
+            hourly: PLUGIN_SITEMAP.CHANGEFREQ_HOURLY
+            daily: PLUGIN_SITEMAP.CHANGEFREQ_DAILY
+            weekly: PLUGIN_SITEMAP.CHANGEFREQ_WEEKLY
+            monthly: PLUGIN_SITEMAP.CHANGEFREQ_MONTHLY
+            yearly: PLUGIN_SITEMAP.CHANGEFREQ_YEARLY
+            never:  PLUGIN_SITEMAP.CHANGEFREQ_NEVER
+        .priority:
+          type: select
+          label: PLUGIN_SITEMAP.PRIORITY
+          default: ''
+          options:
+            '': PLUGIN_SITEMAP.PRIORITY_USE_GLOBAL
+            '0.1': 0.1
+            '0.2': 0.2
+            '0.3': 0.3
+            '0.4': 0.4
+            '0.5': 0.5
+            '0.6': 0.6
+            '0.7': 0.7
+            '0.8': 0.8
+            '0.9': 0.9
+            '1.0': 1.0
+          validate:
+            type: float