From d4c5432d304a4a6cf1739337466929f4e553f7a9 Mon Sep 17 00:00:00 2001
From: Miguel Ventura <miguel.ventura@gmail.com>
Date: Mon, 3 Sep 2012 00:39:05 +0100
Subject: [PATCH] Page objects for PAGES already contain the proper `url`
 attribute. Having the templates with /pages/ causes the generated links to be
 wrong.

---
 Just-Read/templates/base.html         | 4 ++--
 bootstrap/templates/base.html         | 2 +-
 brownstone/templates/base.html        | 2 +-
 brownstone/templates/page.html        | 2 +-
 lightweight/templates/menu.html       | 2 +-
 lightweight/templates/page.html       | 2 +-
 mnmlist/templates/base.html           | 2 +-
 notmyidea-cms-fr/templates/base.html  | 2 +-
 notmyidea-cms-fr/templates/index.html | 2 +-
 notmyidea-cms/templates/base.html     | 2 +-
 notmyidea-cms/templates/index.html    | 2 +-
 sneakyidea/templates/base.html        | 2 +-
 sneakyidea/templates/index.html       | 2 +-
 waterspill/templates/base.html        | 2 +-
 waterspill/templates/page.html        | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Just-Read/templates/base.html b/Just-Read/templates/base.html
index 96511ad..a768618 100644
--- a/Just-Read/templates/base.html
+++ b/Just-Read/templates/base.html
@@ -40,7 +40,7 @@
 	<div class="wrapper pages">
 		<ul class="nav">
 		{% for p in PAGES %}
-			<li><a href="{{ SITEURL }}/pages/{{ p.url }}">{{ p.title }}</a></li>
+			<li><a href="{{ SITEURL }}{{ p.url }}">{{ p.title }}</a></li>
 		{% endfor %}
 			<li><a href="{{ SITEURL }}/archives.html">Archive</a></li>
 		</ul>
@@ -65,4 +65,4 @@
 	  s.parentNode.insertBefore(g,s)}(document,'script'));
 	</script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/bootstrap/templates/base.html b/bootstrap/templates/base.html
index 9458d6e..03e00e3 100644
--- a/bootstrap/templates/base.html
+++ b/bootstrap/templates/base.html
@@ -31,7 +31,7 @@
 				{% endfor %}
 				{% if DISPLAY_PAGES_ON_MENU %}
 					{% for page in PAGES %}
-						<li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+						<li><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a></li>
 					{% endfor %}
 				{% endif %}
 				{% for cat, null in categories %}
diff --git a/brownstone/templates/base.html b/brownstone/templates/base.html
index 1da0c60..7ac50ca 100644
--- a/brownstone/templates/base.html
+++ b/brownstone/templates/base.html
@@ -40,7 +40,7 @@ Released   : 20100928
 							<li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
 							{% if DISPLAY_PAGES_ON_MENU %}
                                                         {% for page in PAGES %}
-                                                            <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+                                                            <li><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a></li>
                                                         {% endfor %}
                                                         {% endif %}
 						</ul>
diff --git a/brownstone/templates/page.html b/brownstone/templates/page.html
index 6181ea9..0c29eeb 100644
--- a/brownstone/templates/page.html
+++ b/brownstone/templates/page.html
@@ -3,7 +3,7 @@
 {% block content %}        
 <div id="content">
 <div class="post">    
-    <h2 class="title"><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></h1>
+    <h2 class="title"><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a></h1>
     {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
     the pdf</a>{% endif %}
     <div style="clear: both;">&nbsp;</div>
diff --git a/lightweight/templates/menu.html b/lightweight/templates/menu.html
index 9a9d011..5a6a52d 100644
--- a/lightweight/templates/menu.html
+++ b/lightweight/templates/menu.html
@@ -2,7 +2,7 @@
   <a href="{{ SITEURL }}/index.html">Accueil</a>
   {% if DISPLAY_PAGES_ON_MENU != False%}
     {% for p in PAGES %}
-  <a {% if p == page %}class="active" {% endif %}href="{{ SITEURL }}/pages/{{ p.url }}">{{ p.title }}</a>
+  <a {% if p == page %}class="active" {% endif %}href="{{ SITEURL }}{{ p.url }}">{{ p.title }}</a>
     {% endfor %}
   {% else %}
   <a href="{{ SITEURL }}/categories.html">Catégories</a>
diff --git a/lightweight/templates/page.html b/lightweight/templates/page.html
index 47dc631..875fcf7 100644
--- a/lightweight/templates/page.html
+++ b/lightweight/templates/page.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }}{% endblock %}
 {% block content %}        
-    <h2 class="page_title"><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></h1>
+    <h2 class="page_title"><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a></h1>
     {% if PDF_PROCESSOR %}<a href="{{ SITEURL }}/pdf/{{ page.slug }}.pdf">get
     the pdf</a>{% endif %}
     <div style="clear: both;">&nbsp;</div>
diff --git a/mnmlist/templates/base.html b/mnmlist/templates/base.html
index ad7f23b..2e45ed7 100644
--- a/mnmlist/templates/base.html
+++ b/mnmlist/templates/base.html
@@ -30,7 +30,7 @@
             <nav>
                 <ul>
                 {% for page in PAGES %}
-                    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a>{% if not loop.last %} ::{% endif %}</li>
+                    <li><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a>{% if not loop.last %} ::{% endif %}</li>
                 {% endfor %}
                 {% if categories|length > 1 %}
                     <li>:: <a href="{{ SITEURL }}/categories.html">Catégories</a></li>
diff --git a/notmyidea-cms-fr/templates/base.html b/notmyidea-cms-fr/templates/base.html
index b954762..6cc6394 100644
--- a/notmyidea-cms-fr/templates/base.html
+++ b/notmyidea-cms-fr/templates/base.html
@@ -34,7 +34,7 @@
                 <li><a href="{{ SITEURL }}/index.html">Accueil</a></li>
                 <li><a href="{{ SITEURL }}/archives.html">Archives</a></li>
                 {% for p in PAGES %}
-                    <li {% if p == page %}class="active"{% endif %}><a href="{{ SITEURL }}/pages/{{ p.url }}">{{ p.title }}</a></li>
+                    <li {% if p == page %}class="active"{% endif %}><a href="{{ SITEURL }}{{ p.url }}">{{ p.title }}</a></li>
                 {% endfor %}
                 {% endif %}
                 {#{% for cat, null in categories %}
diff --git a/notmyidea-cms-fr/templates/index.html b/notmyidea-cms-fr/templates/index.html
index 1216f24..e5b8319 100644
--- a/notmyidea-cms-fr/templates/index.html
+++ b/notmyidea-cms-fr/templates/index.html
@@ -59,7 +59,7 @@
 <section id="content" class="body">    
 <h2>Pages</h2>
 {% for page in PAGES %}
-    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+    <li><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a></li>
 {% endfor %}
 </section>
 {% endif %}
diff --git a/notmyidea-cms/templates/base.html b/notmyidea-cms/templates/base.html
index 02833f6..d8f826e 100644
--- a/notmyidea-cms/templates/base.html
+++ b/notmyidea-cms/templates/base.html
@@ -33,7 +33,7 @@
                 {% if DISPLAY_PAGES_ON_MENU != False %}
                 <li><a href="{{ SITEURL }}/index.html">Home</a></li>
                 {% for p in PAGES %}
-                    <li {% if p == page %}class="active"{% endif %}><a href="{{ SITEURL }}/pages/{{ p.url }}">{{ p.title }}</a></li>
+                    <li {% if p == page %}class="active"{% endif %}><a href="{{ SITEURL }}{{ p.url }}">{{ p.title }}</a></li>
                 {% endfor %}
                 {% endif %}
                 {#{% for cat, null in categories %}
diff --git a/notmyidea-cms/templates/index.html b/notmyidea-cms/templates/index.html
index f8e2b2a..3bb5697 100644
--- a/notmyidea-cms/templates/index.html
+++ b/notmyidea-cms/templates/index.html
@@ -36,7 +36,7 @@
 <section id="content" class="body">
 <h2>Pages</h2>
 {% for page in PAGES %}
-    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+    <li><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a></li>
 {% endfor %}
 </section>
 {% endif %}
diff --git a/sneakyidea/templates/base.html b/sneakyidea/templates/base.html
index a6cfb79..cf90b27 100644
--- a/sneakyidea/templates/base.html
+++ b/sneakyidea/templates/base.html
@@ -33,7 +33,7 @@
                 {% if DISPLAY_PAGES_ON_MENU %}
                     {% for current_page in PAGES %}
                         <li {% if page %}{% if page == current_page%}class="active"{% endif %}{% endif %}>
-                            <a href="{{ SITEURL }}/pages/{{ current_page.url }}">{{ current_page.title }}</a>
+                            <a href="{{ SITEURL }}{{ current_page.url }}">{{ current_page.title }}</a>
                         </li>
                     {% endfor %}
                 {% endif %}
diff --git a/sneakyidea/templates/index.html b/sneakyidea/templates/index.html
index 5969e6c..d4e42b2 100644
--- a/sneakyidea/templates/index.html
+++ b/sneakyidea/templates/index.html
@@ -39,7 +39,7 @@
 <section id="content" class="body">    
 <h2>Pages</h2>
 {% for page in PAGES %}
-    <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+    <li><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a></li>
 {% endfor %}
 </section>
 {% endif %}
diff --git a/waterspill/templates/base.html b/waterspill/templates/base.html
index 1f9049d..1f72a5c 100644
--- a/waterspill/templates/base.html
+++ b/waterspill/templates/base.html
@@ -46,7 +46,7 @@
 	<h3>Pages</h3>
 	<ul>
         {% for page in PAGES %}
-            <li><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></li>
+            <li><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a></li>
         {% endfor %}
 	</ul>
         {% endif %}
diff --git a/waterspill/templates/page.html b/waterspill/templates/page.html
index f9a091a..8f2f691 100644
--- a/waterspill/templates/page.html
+++ b/waterspill/templates/page.html
@@ -3,7 +3,7 @@
 {% block content %}        
 
 <div class="blogItem">
-    <h2><a href="{{ SITEURL }}/pages/{{ page.url }}">{{ page.title }}</a></h3>
+    <h2><a href="{{ SITEURL }}{{ page.url }}">{{ page.title }}</a></h3>
 	{{ page.content }}
     {% include 'twitter.html' %}