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: Page objects for PAGES already contain the proper `url` attribute.
 Having the templates with /pages/ causes the generated links to be wrong.

---
 notmyidea-cms-fr/templates/base.html  | 2 +-
 notmyidea-cms-fr/templates/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'notmyidea-cms-fr/templates')

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 %}
-- 
cgit 


From ba5c5163ae8ba42d54c3b8b49d3045cd691ce37b Mon Sep 17 00:00:00 2001
From: Miguel Ventura <miguel.ventura@gmail.com>
Date: Mon, 3 Sep 2012 01:14:59 +0100
Subject: Removed too much on last commit...

---
 notmyidea-cms-fr/templates/base.html  | 2 +-
 notmyidea-cms-fr/templates/index.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'notmyidea-cms-fr/templates')

diff --git a/notmyidea-cms-fr/templates/base.html b/notmyidea-cms-fr/templates/base.html
index 6cc6394..5e6d291 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 }}{{ 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 e5b8319..c98d82f 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 }}{{ page.url }}">{{ page.title }}</a></li>
+    <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
 {% endfor %}
 </section>
 {% endif %}
-- 
cgit