Imported Upstream version 7.0.1upstream/7.0.1

1 files changed, 17 insertions, 18 deletions

diff --git a/nikola/data/themes/bootstrap/templates/gallery.tmpl b/nikola/data/themes/bootstrap/templates/gallery.tmpl
index 7b0d505..8ad4eb4 100644
--- a/nikola/data/themes/bootstrap/templates/gallery.tmpl
+++ b/nikola/data/themes/bootstrap/templates/gallery.tmpl
@@ -9,38 +9,37 @@
     %if title:
     <h1>${title}</h1>
     %endif
-    %if text:
+    %if post:
     <p>
-        ${text}
+        ${post.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>
+        <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:
-            <li><a href="${image['url']}" class="thumbnail image-reference" title="${image['title']}">
-                <img src="${image['url_thumb']}" alt="${image['title']}" /></a>
-        %endfor
-    </ul>
-    </noscript>
-    %endif
-%if enable_comments:
-    ${comments.comment_form(None, permalink, title)}
+<div id="gallery_container"></div>
+%if photo_array:
+<noscript>
+<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>
+</noscript>
+%endif
+%if site_has_comments and enable_comments:
+${comments.comment_form(None, permalink, title)}
 %endif
 </%block>
 
-
 <%block name="extra_head">
+${parent.extra_head()}
 <style type="text/css">
     .image-block {
         display: inline-block;