Update for tags

components/siteheader.tpl

@@ -6,6 +6,12 @@
   <meta name="author" content="{{ site.author }}" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
+  {% if page.language_code == "ru" or page.language_code == "ab" or page.language_code == "av" or page.language_code == "ba" or page.language_code == "be" or page.language_code == "bg" or page.language_code == "ce" or page.language_code == "cu" or page.language_code == "cv" or page.language_code == "kk" or page.language_code == "kv" or page.language_code == "ky" or page.language_code == "mk" or page.language_code == "mn" or page.language_code == "os" or page.language_code == "sh" or page.language_code == "sr" or page.language_code == "tg" or page.language_code == "tk" or page.language_code == "tt" or page.language_code == "ug" or page.language_code == "uk" or page.language_code == "uz" %}
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,700,600italic,700italic&subset=cyrillic-ext,latin-ext' rel='stylesheet' type='text/css'>
+  {% else %}
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,300italic,400italic,600,700,600italic,700italic&subset=latin-ext' rel='stylesheet' type='text/css'>
+  {% endif %}
+
   {% if site.search.enabled %}{% stylesheet_link "assets/site_search/3.0/style.css?1" static_host="true" %}{% endif %}
   {% stylesheet_link "style.css?reykjavik1" %}
   {% if editmode %}{% stylesheet_link "assets/admin/editmode.css" static_host="true" %}{% endif %}
@@ -18,6 +24,8 @@
 
   <title>{% if site.root_item.selected? %} {{page.site_title}} | {{ page.title }} {% else %}{% if article %}{{ article.title }}{% else %}{{ page.title }}{% endif %} | {{page.site_title}} {% endif %}</title>
   {% if blog %}{{blog.rss_link}}{% endif %}
+
+  <script src="{{ javascripts_path }}/modernizr.js"></script>
 
 
 

javascripts/scripts.js

@@ -1,5 +1,4 @@
-
-                  $(function() {
+$(function() {
   $('.langmenu select').change(function() {
     window.location = $(this).children(':selected').val();
   });

layouts/blog___news.tpl

@@ -18,6 +18,18 @@
         </div>
       </div>
 
+
+        {% if tags %}
+            <div class="tagged-list-header">
+                <div class="header-tag-icon"></div>
+                {% if tags == empty %}
+                    {{ "no_posts_tagged" | lc }}
+                {% else %}
+                    {{ "posts_tagged" | lc }} '{{ tags | sort:"name" | map:"name" | join:"', '"}}'.
+                {% endif %}
+            </div>
+        {% endif %}
+
       <div id="container" class="cfx">
         <div id="content">
           {% if editmode %}

layouts/blog_article.tpl

@@ -38,6 +38,21 @@
               <div class="cfx">
                 {% unless article.new_record? %}{% content name="gallery" bind="Article" %}{% endunless %}
               </div>
+                  {% if editmode %}
+                    <div class="cfx article-tags">
+                        <div class="article-tag-icon"></div>
+                        {% editable article.tags %}
+                    </div>
+                  {% else %}
+                    {% unless article.tags == empty %}
+                        <div class="cfx article-tags">
+                            <div class="article-tag-icon"></div>
+                            {% for tag in article.tags %}
+                                <a href="{{ article.page.url }}/tagged/{{ tag.path }}">{{ tag.name }}</a>{% unless forloop.last %}, {% endunless %}
+                            {% endfor %}
+                        </div>
+                    {% endunless %}
+                  {% endif %}
             </div>
           </div>
 
@@ -50,7 +65,7 @@
             {% if article.comments_count > 0 %}
             <ul class="comments-list">{% for comment in article.comments %}
               <li class="edy-site-blog-comment">
-                {{ article.author.name }} &nbsp;&#149;&nbsp; <span class="date">{{article.created_at | format_date:"short"}}, {{article.created_at | format_date:"%Y"}}</span> {% removebutton %}
+                {{comment.author}} &nbsp;&#149;&nbsp; <span class="date">{{comment.created_at | format_date:"short"}}, {{comment.created_at | format_date:"%Y"}}</span> {% removebutton %}
                 <p class="comment-body">
                   {{comment.body_html}}
                 </p>