Develop to master. (#1)

Cecilapp · Jun 12, 2016 · baccde4 · baccde4
1 parent 22f2eeb
commit baccde4
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -4,4 +4,8 @@
 
 ![Hyde screenshot](https://f.cloud.github.com/assets/98681/1831228/42af6c6a-7384-11e3-98fb-e0b923ee0468.png)
 
-_WIP_
+## Installation
+
+```
+$ composer require narno/phpoole-theme-hyde:1.1.X-dev
+```
diff --git a/composer.json b/composer.json
@@ -5,13 +5,13 @@
   "keywords": ["PHPoole", "theme", "Hyde"],
   "license": "MIT",
   "require": {
-    "narno/phpoole-installer": "1.0.x-dev",
-    "narno/phpoole-library": "1.0.x-dev"
+    "narno/phpoole-installer": "dev-develop as 1.1.x-dev",
+    "narno/phpoole-library": "dev-develop as 1.1.x-dev"
   },
   "extra": {
     "name": "hyde",
     "branch-alias": {
-      "dev-master": "1.0.x-dev"
+      "dev-develop": "1.1.x-dev"
     }
   },
   "minimum-stability": "dev",

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -9,7 +9,7 @@
 
 <div class="content container">
     <div class="posts">
-        {% for post in site.pages|bySection(page.pathname)|sortByDate %}
+        {% for post in site.pages|filterBySection(page.pathname)|sortByDate %}
         <div class="post">
             <h1 class="post-title">
                 <a href="{{ url(post) }}">
@@ -26,4 +26,4 @@ <h1 class="post-title">
 </div>
 
 </body>
-</html>
+</html>
diff --git a/layouts/_default/terms.html b/layouts/_default/terms.html
@@ -8,7 +8,7 @@
 {% include 'include/sidebar.html' %}
 
 <div class="content container">
-    <h1>{{ plural }}</h1>
+    <h1>{{ page.plural }}</h1>
     <ul>
         {% for name, term in page.terms %}
         <li><h2><a href="{{ url(page.plural ~ '/' ~ name) }}">{{ name }}</a> ({{ term|length }})</h2>
@@ -23,4 +23,4 @@ <h1>{{ plural }}</h1>
 </div>
 
 </body>
-</html>
+</html>
diff --git a/layouts/index.html b/layouts/index.html
@@ -9,7 +9,7 @@
 
 <div class="content container">
     <div class="posts">
-        {% for post in site.pages|bySection('blog')|sortByDate|slice(0, 5) %}
+        {% for post in site.pages|filterBySection('blog')|sortByDate|slice(0, 5) %}
         <div class="post">
             <h1 class="post-title">
                 <a href="{{ url(post) }}">
@@ -26,4 +26,4 @@ <h1 class="post-title">
 </div>
 
 </body>
-</html>
+</html>
diff --git a/layouts/sitemap.xml → layouts/sitemap.html b/layouts/sitemap.xml → layouts/sitemap.html
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-    {% for page in site.pages %}
-    {% if page.id not in ['404', 'sitemap'] %}
+{% for page in site.pages %}
     <url>
         <loc>{{ url(page) }}</loc>
         <lastmod>{{ page.date|date('Y-m-dTH:i:sP') }}</lastmod>
-        {% if page.sitemap.changefreq %}
+{% if page.sitemap is defined %}
+{% if page.sitemap.changefreq %}
         <changefreq>{{ page.sitemap.changefreq }}</changefreq>
-        {% endif %}
-        {% if page.sitemap.priority %}
+{% endif %}
+{% if page.sitemap.priority %}
         <priority>{{ page.sitemap.priority }}</priority>
-        {% endif %}
+{% endif %}
+{% endif %}
     </url>
-    {% endif %}
-    {% endfor %}
+{% endfor %}
 </urlset>