Merge pull request #289 from bbinet/fix_index_template

Fix index.html template

pelican/themes/notmyidea/templates/index.html

@@ -44,17 +44,17 @@
            or not articles_page.has_previous() and loop.length > 1) %}
             {% include 'pagination.html' %}
         {% endif %}
-{% endfor %}
+        {% if loop.last %}
-    {% if loop.length > 1 or articles_page.has_previous() %}
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
-{% endif %}
+        {% endif %}
+    {% endfor %}
 {% else %}
 <section id="content" class="body">    
 <h2>Pages</h2>
-{% for page in PAGES %}
+    {% for page in PAGES %}
         <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
-{% endfor %}
+    {% endfor %}
 </section>
 {% endif %}
 {% endblock content %}

tests/output/basic/author/alexis-metaireau.html

@@ -93,6 +93,7 @@ YEAH !</p>
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -125,12 +126,12 @@ as well as <strong>inline markup</strong>.
             
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
         

tests/output/basic/author/bruno.html

@@ -82,6 +82,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
@@ -116,6 +117,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
@@ -150,6 +152,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
@@ -184,6 +187,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
@@ -223,6 +227,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -255,12 +260,12 @@ Translations:
             
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
         

tests/output/basic/category/bar.html

@@ -86,6 +86,9 @@ YEAH !</p>
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

tests/output/basic/category/cat1.html

@@ -82,6 +82,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
@@ -116,6 +117,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
@@ -150,6 +152,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
@@ -182,12 +185,12 @@
             
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
         

tests/output/basic/category/content.html

@@ -88,6 +88,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -120,12 +121,12 @@ Translations:
             
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
         

tests/output/basic/category/yeah.html

@@ -87,6 +87,9 @@
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

tests/output/basic/index.html

@@ -88,6 +88,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./a-markdown-powered-article.html" rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>
@@ -121,6 +122,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
@@ -155,6 +157,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
@@ -189,6 +192,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
@@ -223,6 +227,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -257,6 +262,7 @@ as well as <strong>inline markup</strong>.
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
@@ -301,6 +307,7 @@ YEAH !</p>
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -333,12 +340,12 @@ YEAH !</p>
             
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
         

tests/output/basic/tag/bar.html

@@ -88,6 +88,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
@@ -127,6 +128,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -161,6 +163,7 @@ as well as <strong>inline markup</strong>.
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
@@ -203,12 +206,12 @@ YEAH !</p>
             
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
         

tests/output/basic/tag/baz.html

@@ -88,6 +88,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
@@ -125,12 +126,12 @@ Translations:
             
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
         

tests/output/basic/tag/foo.html

@@ -88,6 +88,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
@@ -127,6 +128,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -159,12 +161,12 @@ as well as <strong>inline markup</strong>.
             
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
         

tests/output/basic/tag/foobar.html

@@ -87,6 +87,9 @@
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

tests/output/basic/tag/oh.html

@@ -86,6 +86,9 @@ YEAH !</p>
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

tests/output/basic/tag/yeah.html

@@ -86,6 +86,9 @@ YEAH !</p>
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

tests/output/custom/author/alexis-metaireau.html

@@ -90,6 +90,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
@@ -124,6 +125,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
@@ -158,6 +160,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
@@ -198,12 +201,12 @@
 
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
                 <div class="blogroll">

tests/output/custom/author/alexis-metaireau2.html

@@ -103,6 +103,7 @@ YEAH !</p>
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
@@ -142,6 +143,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -176,6 +178,7 @@ as well as <strong>inline markup</strong>.
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -218,12 +221,12 @@ as well as <strong>inline markup</strong>.
 
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
                 <div class="blogroll">

tests/output/custom/category/bar.html

@@ -100,6 +100,9 @@ YEAH !</p>
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

tests/output/custom/category/cat1.html

@@ -90,6 +90,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
@@ -124,6 +125,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
@@ -158,6 +160,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././article-3.html" rel="bookmark" title="Permalink to Article 3">Article 3</a></h1>
@@ -196,12 +199,12 @@
 
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
                 <div class="blogroll">

tests/output/custom/category/content.html

@@ -96,6 +96,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -134,12 +135,12 @@ Translations:
 
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
                 <div class="blogroll">

tests/output/custom/category/yeah.html

@@ -101,6 +101,9 @@
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

tests/output/custom/index.html

@@ -96,6 +96,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./a-markdown-powered-article.html" rel="bookmark" title="Permalink to A markdown powered article">A markdown powered article</a></h1>
@@ -129,6 +130,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./article-1.html" rel="bookmark" title="Permalink to Article 1">Article 1</a></h1>
@@ -163,6 +165,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./article-2.html" rel="bookmark" title="Permalink to Article 2">Article 2</a></h1>
@@ -203,12 +206,12 @@ Translations:
 
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
                 <div class="blogroll">

tests/output/custom/index2.html

@@ -93,6 +93,7 @@
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -127,6 +128,7 @@ as well as <strong>inline markup</strong>.
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
@@ -171,6 +173,7 @@ YEAH !</p>
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href="./unbelievable.html" rel="bookmark" title="Permalink to Unbelievable !">Unbelievable !</a></h1>
@@ -213,12 +216,12 @@ YEAH !</p>
 
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
                 <div class="blogroll">

tests/output/custom/tag/bar.html

@@ -96,6 +96,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
@@ -135,6 +136,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -169,6 +171,7 @@ as well as <strong>inline markup</strong>.
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././oh-yeah.html" rel="bookmark" title="Permalink to Oh yeah !">Oh yeah !</a></h1>
@@ -217,12 +220,12 @@ YEAH !</p>
 
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
                 <div class="blogroll">

tests/output/custom/tag/baz.html

@@ -96,6 +96,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
@@ -139,12 +140,12 @@ Translations:
 
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
                 <div class="blogroll">

tests/output/custom/tag/foo.html

@@ -96,6 +96,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././second-article.html" rel="bookmark" title="Permalink to Second article">Second article</a></h1>
@@ -135,6 +136,7 @@ Translations:
 
         
          
+            
             <li><article class="hentry">    
                 <header>
                         <h1><a href=".././this-is-a-super-article.html" rel="bookmark" title="Permalink to This is a super article !">This is a super article !</a></h1>
@@ -173,12 +175,12 @@ as well as <strong>inline markup</strong>.
 
         
         
-    
             </ol><!-- /#posts-list -->
             </section><!-- /#content -->
         
     
 
+
         <section id="extras" class="body">
         
                 <div class="blogroll">

tests/output/custom/tag/foobar.html

@@ -101,6 +101,9 @@
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

tests/output/custom/tag/oh.html

@@ -100,6 +100,9 @@ YEAH !</p>
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        
     
 
 

tests/output/custom/tag/yeah.html

@@ -100,6 +100,9 @@ YEAH !</p>
         
         
         
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+