Merge branch 'clean_base' of https://github.com/Gumnos/nikola into lists

Conflicts:
	CHANGES.txt
	nikola/data/themes/base/templates/index_helper.tmpl
	nikola/data/themes/base/templates/post_helper.tmpl

AUTHORS.txt

@@ -21,6 +21,7 @@ Raimon Esteve <https://github.com/raimonesteve>
 Roberto Alsina <https://github.com/ralsina>
 Roman Imankulov <https://github.com/imankulov>
 StyXman <https://github.com/StyXman>
+Tim Chase <https://github.com/Gumnos>
 Tordek <https://github.com/Tordek>
 Troy Toman <https://github.com/troytoman>
 Zhaojun Meng <https://github.com/zhaojunmeng>

CHANGES.txt

@@ -21,6 +21,7 @@ Bugfixes
 * HIDE_SOURCELINK was set to True sometimes (Issue #1004)
 * Properly import cool URIs from WordPress, instead of just slugify-ing the path (Issue #693)
 * Fixed SASS/LESS errors when more than one theme in chain has a targets file (Issue #941)
+* Guard against empty list-items in base templates
 
 New in v6.3.0
 =============

nikola/data/themes/base/templates/base.tmpl

@@ -30,10 +30,14 @@ lang="${lang}">
     <small>${content_footer}</small>
     <!--Sidebar content-->
     <ul class="unstyled">
+    %if license:
     <li>${license}
+    %endif
     ${base.html_social()}
     ${base.html_navigation_links()}
+    %if search_form:
     <li>${search_form}
+    %endif
     </ul>
     ${base.late_load_js()}
     ${social_buttons_code}

nikola/data/themes/base/templates/crumbs.tmpl

@@ -1,9 +1,11 @@
 ## -*- coding: utf-8 -*-
 
 <%def name="bar(crumbs)">
+%if crumbs:
 <ul class="breadcrumb">
     % for link, text in crumbs:
         <li><a href="${link}">${text}</a></li>
     % endfor
 </ul>
+%endif
 </%def>

nikola/data/themes/base/templates/gallery.tmpl

@@ -14,18 +14,22 @@
         ${text}
     </p>
     %endif
+    %if folders:
     <ul>
     % for folder, ftitle in folders:
         <li><a href="${folder}"><i
         class="icon-folder-open"></i>&nbsp;${ftitle}</a></li>
     % endfor
     </ul>
+    %endif
+    %if photo_array:
     <ul class="thumbnails">
         %for image in photo_array:
             <li><a href="${image['url']}" class="thumbnail image-reference" title="${image['title']}">
                 <img src="${image['url_thumb']}" alt="${image['title']}" /></a>
         %endfor
     </ul>
+    %endif
 %if enable_comments:
     ${comments.comment_form(None, permalink, title)}
 %endif

nikola/data/themes/base/templates/list.tmpl

@@ -4,11 +4,13 @@
         <!--Body content-->
         <div class="postbox">
         <h1>${title}</h1>
+        %if items:
         <ul class="unstyled">
         % for text, link in items:
             <li><a href="${link}">${text}</a>
         % endfor
         </ul>
+        %endif
         </div>
         <!--End of body content-->
 </%block>

nikola/data/themes/base/templates/list_post.tmpl

@@ -4,11 +4,13 @@
         <!--Body content-->
         <div class="postbox">
         <h1>${title}</h1>
+        %if posts:
         <ul class="unstyled">
         % for post in posts:
             <li><a href="${post.permalink()}">[${post.formatted_date(date_format)}] ${post.title()}</a>
         % endfor
         </ul>
+        %endif
         </div>
         <!--End of body content-->
 </%block>

nikola/data/themes/base/templates/listing.tmpl

@@ -3,6 +3,7 @@
 <%namespace name="ui" file="crumbs.tmpl" import="bar"/>
 <%block name="content">
 ${ui.bar(crumbs)}
+%if folders or files:
 <ul class="unstyled">
 % for name in folders:
     <li><a href="${name}"><i class="icon-folder-open"></i> ${name}</a>
@@ -11,6 +12,7 @@ ${ui.bar(crumbs)}
     <li><a href="${name}.html"><i class="icon-file"></i> ${name}</a>
 % endfor
 </ul>
+%endif
 % if code:
     ${code}
 % endif

nikola/data/themes/base/templates/post_list_directive.tmpl

@@ -1,6 +1,7 @@
 ## -*- coding: utf-8 -*-
 <!-- Begin post-list ${post_list_id} -->
 <div id="${post_list_id}" class="post-list">
+    %if posts:
     <ul class="post-list">
         % for post in posts:
             <li class="post-list-item">
@@ -10,5 +11,6 @@
 	    </li>
         % endfor
     </ul>
+    %endif
 </div>
 <!-- End post-list ${post_list_id} -->

nikola/data/themes/base/templates/tag.tmpl

@@ -22,11 +22,13 @@
             <a href="${_link(kind + "_rss", tag)}">RSS</a>
         %endif
         <br>
+        %if posts:
         <ul class="unstyled">
         % for post in posts:
             <li><a href="${post.permalink()}">[${post.formatted_date(date_format)}] ${post.title()}</a>
         % endfor
         </ul>
+        %endif
         </div>
         <!--End of body content-->
 </%block>