Merge branch 'release/1.5.0'

getgrav · Jan 6, 2016 · 671a735 · 671a735
2 parents 4199bd1 + fa5e94a
commit 671a735
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v1.5.0
+## 01/06/2016
+
+1. [](#new)
+    * Added a default XSL file for the sitemap
+1. [](#improved)
+    * Added a note to the README on how to only allow the link to the .xml sitemap
+1. [](#bugfix)
+    * Fixed saving the `priority` option when adding it to a page through the Admin Plugin
+
 # v1.4.2
 ## 11/11/2015
 

diff --git a/README.md b/README.md
@@ -40,3 +40,9 @@ ignores:
 ```
 
 You can ignore your own pages by providing a list of routes to ignore.
+
+## Only allow access to the .xml file
+
+If you want your sitemap to only be accessible via `sitemap.xml` for example, set the route to `/sitemap` and add this to your `.htaccess` file:
+
+`Redirect 301 /sitemap /sitemap.xml`
diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Sitemap
-version: 1.4.2
+version: 1.5.0
 description: "Provide automatically generated **XML sitemaps** with this very useful, but simple to configure, Grav plugin."
 icon: map-marker
 author:

diff --git a/blueprints/sitemap.yaml b/blueprints/sitemap.yaml
@@ -44,4 +44,4 @@ form:
                     '0.9': 0.9
                     '1.0': 1.0
                   validate:
-                    type: float
+                    type: string
diff --git a/sitemap.xsl b/sitemap.xsl
@@ -0,0 +1,29 @@
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:s="http://www.sitemaps.org/schemas/sitemap/0.9"
+ exclude-result-prefixes="s"
+>
+ <xsl:template match="/">
+  <html>
+    <body>
+      <h2>Sitemap</h2>
+      <table border="1">
+        <tr bgcolor="#9acd32">
+          <th>Location</th>
+          <th>Last Modified</th>
+          <th>Update Frequency</th>
+          <th>Priority</th>
+        </tr>
+        <xsl:for-each select="s:urlset/s:url">
+          <tr>
+            <td><xsl:value-of select="s:loc"/></td>
+            <td><xsl:value-of select="s:lastmod"/></td>
+            <td><xsl:value-of select="s:changefreq"/></td>
+            <td><xsl:value-of select="s:priority"/></td>
+          </tr>
+        </xsl:for-each>
+      </table>
+    </body>
+  </html>
+ </xsl:template>
+</xsl:stylesheet>
diff --git a/templates/sitemap.xml.twig b/templates/sitemap.xml.twig
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="{{ base_url }}/user/plugins/sitemap/sitemap.xsl"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     {% for entry in sitemap %}
     <url>