Imported Upstream version 6.4.0upstream/6.4.0

3 files changed, 8 insertions, 1 deletions

diff --git a/nikola/data/themes/bootstrap/templates/base.tmpl b/nikola/data/themes/bootstrap/templates/base.tmpl
index 8cb2e43..65132b7 100644
--- a/nikola/data/themes/bootstrap/templates/base.tmpl
+++ b/nikola/data/themes/bootstrap/templates/base.tmpl
@@ -91,3 +91,4 @@ ${base.html_social()}
     % endif
     ${body_end}
 </body>
+</html>
diff --git a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl b/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl
index f0d1986..c041e50 100644
--- a/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl
+++ b/nikola/data/themes/bootstrap/templates/bootstrap_helper.tmpl
@@ -29,7 +29,9 @@
             <link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
         %endif
     %endif
-    <link rel="canonical" href="${abs_link(permalink)}">
+    %if permalink:
+      <link rel="canonical" href="${abs_link(permalink)}">
+    %endif
     <!--[if lt IE 9]>
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
     <![endif]-->
diff --git a/nikola/data/themes/bootstrap/templates/gallery.tmpl b/nikola/data/themes/bootstrap/templates/gallery.tmpl
index 0dd5eea..7b0d505 100644
--- a/nikola/data/themes/bootstrap/templates/gallery.tmpl
+++ b/nikola/data/themes/bootstrap/templates/gallery.tmpl
@@ -14,14 +14,17 @@
         ${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
 
     <div id="gallery_container"></div>
+    %if photo_array:
     <noscript>
     <ul class="thumbnails">
         %for image in photo_array:
@@ -30,6 +33,7 @@
         %endfor
     </ul>
     </noscript>
+    %endif
 %if enable_comments:
     ${comments.comment_form(None, permalink, title)}
 %endif