Imported Upstream version 5upstream/5

4 files changed, 18 insertions, 8 deletions

diff --git a/nikola/data/themes/jinja-default/templates/base.tmpl b/nikola/data/themes/jinja-default/templates/base.tmpl
index cdd911c..546e1a7 100644
--- a/nikola/data/themes/jinja-default/templates/base.tmpl
+++ b/nikola/data/themes/jinja-default/templates/base.tmpl
@@ -52,7 +52,7 @@
         {% block belowtitle%}
         {% if translations|length > 1 %}
         <small>
-            {{ messages[lang]["Also available in: "] }}
+            {{ messages[lang]["Also available in"] }}:&nbsp; 
             {% for langname in translations.keys() %}
                 {% if langname != lang %}
                     <a href="{{_link("index", None, langname)}}">{{messages[langname]["LANGUAGE"]}}</a>
diff --git a/nikola/data/themes/jinja-default/templates/gallery.tmpl b/nikola/data/themes/jinja-default/templates/gallery.tmpl
index a08b148..dcd8a43 100644
--- a/nikola/data/themes/jinja-default/templates/gallery.tmpl
+++ b/nikola/data/themes/jinja-default/templates/gallery.tmpl
@@ -2,15 +2,25 @@
 {% block sourcelink %}{% endblock %}
 
 {% block content %}
+    <ul class="breadcrumb">
+        {% for link, crumb in crumbs %}
+            <li><a href="{{link}}">/ {{crumb}}</a></li>
+        {% endfor %}
+    </ul>
     {% if text %}
     <p>
         {{ text }}
     </p>
     {% endif %}
+    <ul>
+    {% for folder in folders %}
+        <li><a href="{{folder}}"><i class="icon-folder-open"></i>&nbsp;{{folder}}</a></li>
+    {% endfor %}
+    </ul>
     <ul class="thumbnails">
         {% for image in images %}
             <li><a href="{{image[0]}}" class="thumbnail image-reference"><img src="{{image[2]}}" /></a></li>
-                <img src="${image[1]}" /></a></li>
+                <img src="{{image[1]}}" /></a></li>
         {% endfor %}
     </ul>
 {% endblock %}
diff --git a/nikola/data/themes/jinja-default/templates/index.tmpl b/nikola/data/themes/jinja-default/templates/index.tmpl
index c1fbb94..6244e10 100644
--- a/nikola/data/themes/jinja-default/templates/index.tmpl
+++ b/nikola/data/themes/jinja-default/templates/index.tmpl
@@ -4,7 +4,7 @@
         <div class="postbox">
         <h1><a href="{{post.permalink(lang)}}">{{post.title(lang)}}</a>
         <small>&nbsp;&nbsp;
-             {{messages[lang]["Posted:"]}} {{post.date}}
+             {{messages[lang]["Posted"]}}: {{post.date}}
         </small></h1>
         <hr>
         {{post.text(lang, index_teasers)}}
@@ -18,12 +18,12 @@
 <ul class="pager">
   {%if prevlink %}
     <li class="previous">
-        <a href="{{prevlink}}">${messages[lang]["&larr; Newer posts"]}</a>
+        <a href="{{prevlink}}">&larr; {{messages[lang]["Newer posts"]}}</a>
     </li>
   {% endif %}
   {% if nextlink %}
     <li class="next">
-        <a href="{{nextlink}}">${messages[lang]["Older posts &rarr;"]}</a>
+        <a href="{{nextlink}}">${messages[lang]["Older posts"]}  &rarr;</a>
     </li>
   {% endif %}
 </ul>
diff --git a/nikola/data/themes/jinja-default/templates/post.tmpl b/nikola/data/themes/jinja-default/templates/post.tmpl
index 876c1a7..4748959 100644
--- a/nikola/data/themes/jinja-default/templates/post.tmpl
+++ b/nikola/data/themes/jinja-default/templates/post.tmpl
@@ -7,7 +7,7 @@
     {% endif %}
     <hr>
     <small>
-        {{messages[lang]["Posted:"]}} {{post.date}}&nbsp;&nbsp;|&nbsp;&nbsp;
+        {{messages[lang]["Posted"]}}: {{post.date}}&nbsp;&nbsp;|&nbsp;&nbsp;
 
         {% if translations|length > 1 %}
             {% for langname in translations.keys() %}
@@ -31,12 +31,12 @@
     <ul class="pager">
     {%if post.prev_post %}
         <li class="previous">
-            <a href="{{rel_link(permalink, post.prev_post.permalink(lang))}}">{{messages[lang]["&larr; Previous post"]}}</a>
+            <a href="{{rel_link(permalink, post.prev_post.permalink(lang))}}">&larr; {{messages[lang]["Previous post"]}}</a>
         </li>
     {% endif %}
     {%if post.next_post %}
         <li class="next">
-            <a href="{{rel_link(permalink, post.next_post.permalink(lang))}}">{{messages[lang]["Next post &rarr;"]}}</a>
+            <a href="{{rel_link(permalink, post.next_post.permalink(lang))}}">{{messages[lang]["Next post"]}} &rarr;</a>
         </li>
     {% endif %}
     </ul>