Update for tags

components/siteheader.tpl

@@ -14,4 +14,5 @@
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <meta name="viewport" content="initial-scale=1" />
 	<!--[if IE]><link rel="stylesheet" href="http://static.edicy.com/assets/ie.css" type="text/css" /><![endif]-->
-	<title>{% if article %}{{ article.title }} | {{page.site_title}}{% else %}{{page.site_title}} | {{ page.title }}{% endif %}</title>
+	<title>{% if article %}{{ article.title }} | {{page.site_title}}{% else %}{{page.site_title}} | {{ page.title }}{% endif %}</title>
+    <script src="{{ javascripts_path }}/modernizr.js"></script>

layouts/blog___news.tpl

@@ -21,6 +21,16 @@
 			<div id="content-wrap" class="clear">
 				<div class="wide-column clear">
                     {% addbutton class="add-article" %}
+                    {% 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 %}
     				<ul id="blog-list">
                     {% for article in articles %}
 						<li>

layouts/blog_article.tpl

@@ -25,7 +25,21 @@
 				<div class="excerpt">{% editable article.excerpt %}</div>
 				{% editable article.body %}			
 
-
+        {% 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 id="comments">
@@ -35,7 +49,7 @@
     {% for comment in article.comments %}
       <li class="edy-site-blog-comment">
         <p><span class="comment-author">{{comment.author}}</span> <span class="date">{{comment.created_at | format_date:"short"}}</span>{% removebutton %}</p>
-        <div class="comment"> {{comment.body}}</div>
+        <div class="comment"> {{comment.body_html}}</div>
       </li>
       {% endfor %}
     </ul>

manifest.json

@@ -1 +1 @@
-{"name":"Tartu","layouts":[{"component":false,"layout_name":"page_front","content_type":"page","title":"Front page","file":"layouts/front_page.tpl"},{"component":false,"layout_name":"page_default","content_type":"page","title":"Common page","file":"layouts/common_page.tpl"},{"component":false,"layout_name":"blog","content_type":"blog","title":"Blog & News","file":"layouts/blog___news.tpl"},{"component":false,"layout_name":"blog_article","content_type":"blog_article","title":"Blog article","file":"layouts/blog_article.tpl"},{"component":true,"layout_name":"component","content_type":"component","title":"Footer","file":"components/footer.tpl"},{"component":true,"layout_name":"component","content_type":"component","title":"JS","file":"components/js.tpl"},{"component":true,"layout_name":"component","content_type":"component","title":"Langmenu","file":"components/langmenu.tpl"},{"component":true,"layout_name":"component","content_type":"component","title":"Mainmenu","file":"components/mainmenu.tpl"},{"component":true,"layout_name":"component","content_type":"component","title":"News","file":"components/news.tpl"},{"component":true,"layout_name":"component","content_type":"component","title":"SiteHeader","file":"components/siteheader.tpl"},{"component":true,"layout_name":"component","content_type":"component","title":"Submenu","file":"components/submenu.tpl"},{"component":true,"layout_name":"component","content_type":"component","title":"Search","file":"components/search.tpl"},{"component":true,"layout_name":"component","content_type":"component","title":"mobile-menu","file":"components/mobile-menu.tpl"}],"author":"Paavel Liik","assets":[{"kind":"images","content_type":"image/png","filename":"search.png","file":"images/search.png"},{"kind":"images","content_type":"image/png","filename":"arrow.png","file":"images/arrow.png"},{"kind":"images","content_type":"image/gif","filename":"bg.gif","file":"images/bg.gif"},{"kind":"images","content_type":"image/gif","filename":"header.gif","file":"images/header.gif"},{"kind":"stylesheets","content_type":"text/css","filename":"reset.css","file":"stylesheets/reset.css"},{"kind":"stylesheets","content_type":"text/css","filename":"style.css","file":"stylesheets/style.css"},{"kind":"stylesheets","content_type":"text/css","filename":"fonts.css","file":"stylesheets/fonts.css"},{"kind":"assets","content_type":"font/eot","filename":"sansus-webissimo-regular-webfont.eot","file":"assets/sansus-webissimo-regular-webfont.eot"},{"kind":"images","content_type":"image/svg+xml","filename":"sansus-webissimo-regular-webfont.svg","file":"images/sansus-webissimo-regular-webfont.svg"},{"kind":"stylesheets","content_type":"text/css","filename":"style_ie.css","file":"stylesheets/style_ie.css"},{"kind":"images","content_type":"image/gif","filename":"ajax-loader.gif","file":"images/ajax-loader.gif"}],"preview_medium":"http://static.edicy.com/designs/previews/tartuday_medium.jpg","preview_small":"http://static.edicy.com/designs/previews/tartuday_small.jpg","description":"Tartu"}
+{"name":"Tartu","layouts":[{"component":false,"title":"Front page","layout_name":"page_front","content_type":"page","file":"layouts/front_page.tpl"},{"component":false,"title":"Common page","layout_name":"page_default","content_type":"page","file":"layouts/common_page.tpl"},{"component":false,"title":"Blog & News","layout_name":"blog","content_type":"blog","file":"layouts/blog___news.tpl"},{"component":false,"title":"Blog article","layout_name":"blog_article","content_type":"blog_article","file":"layouts/blog_article.tpl"},{"component":true,"title":"Footer","layout_name":"component","content_type":"component","file":"components/footer.tpl"},{"component":true,"title":"JS","layout_name":"component","content_type":"component","file":"components/js.tpl"},{"component":true,"title":"Langmenu","layout_name":"component","content_type":"component","file":"components/langmenu.tpl"},{"component":true,"title":"Mainmenu","layout_name":"component","content_type":"component","file":"components/mainmenu.tpl"},{"component":true,"title":"News","layout_name":"component","content_type":"component","file":"components/news.tpl"},{"component":true,"title":"SiteHeader","layout_name":"component","content_type":"component","file":"components/siteheader.tpl"},{"component":true,"title":"Submenu","layout_name":"component","content_type":"component","file":"components/submenu.tpl"},{"component":true,"title":"Search","layout_name":"component","content_type":"component","file":"components/search.tpl"},{"component":true,"title":"mobile-menu","layout_name":"component","content_type":"component","file":"components/mobile-menu.tpl"}],"author":"Paavel Liik","assets":[{"kind":"images","content_type":"image/png","filename":"search.png","file":"images/search.png"},{"kind":"images","content_type":"image/png","filename":"arrow.png","file":"images/arrow.png"},{"kind":"images","content_type":"image/gif","filename":"bg.gif","file":"images/bg.gif"},{"kind":"images","content_type":"image/gif","filename":"header.gif","file":"images/header.gif"},{"kind":"stylesheets","content_type":"text/css","filename":"reset.css","file":"stylesheets/reset.css"},{"kind":"stylesheets","content_type":"text/css","filename":"style.css","file":"stylesheets/style.css"},{"kind":"stylesheets","content_type":"text/css","filename":"fonts.css","file":"stylesheets/fonts.css"},{"kind":"assets","content_type":"font/eot","filename":"sansus-webissimo-regular-webfont.eot","file":"assets/sansus-webissimo-regular-webfont.eot"},{"kind":"images","content_type":"image/svg+xml","filename":"sansus-webissimo-regular-webfont.svg","file":"images/sansus-webissimo-regular-webfont.svg"},{"kind":"stylesheets","content_type":"text/css","filename":"style_ie.css","file":"stylesheets/style_ie.css"},{"kind":"images","content_type":"image/gif","filename":"ajax-loader.gif","file":"images/ajax-loader.gif"},{"kind":"images","content_type":"image/svg+xml","filename":"header-tag.svg","file":"images/header-tag.svg"},{"kind":"images","content_type":"image/png","filename":"header-tag.png","file":"images/header-tag.png"},{"kind":"images","content_type":"image/png","filename":"tag.png","file":"images/tag.png"},{"kind":"images","content_type":"image/svg+xml","filename":"tag.svg","file":"images/tag.svg"},{"kind":"javascripts","content_type":"text/javascript","filename":"modernizr.js","file":"javascripts/modernizr.js"}],"preview_medium":"http://static.edicy.com/designs/previews/tartuday_medium.jpg","preview_small":"http://static.edicy.com/designs/previews/tartuday_small.jpg","description":"Tartu"}

stylesheets/style.css

@@ -342,6 +342,41 @@ img {
 .meta-data {
 	margin-top: 11px;
 }
+
+/* article tags */
+.article-tags { margin-top: 30px; font-size: 14px; min-height: 1em; }
+.article-tag-icon {
+    width: 16px;
+    height: 16px;
+    float: left;
+    background: url('../images/tag.png') no-repeat center center;
+    opacity: 0.5;
+    filter: alpha(opacity=50);
+    margin-right: 7px;
+    margin-top: 2px;
+}
+.svg .article-tag-icon { background: url('../images/tag.svg') no-repeat center center; }
+.tagged-list-header {
+    padding: 0;
+    font-size: 24px;
+    color: #222222;
+    margin-bottom: 30px;
+}
+.header-tag-icon {
+    width: 24px;
+    height: 24px;
+    float: left;
+    background: url('../images/header-tag.png') no-repeat center center;
+    opacity: 0.5;
+    filter: alpha(opacity=50);
+    margin-top: -1px;
+    margin-right: 15px;
+}
+.svg .header-tag-icon { background: url('../images/header-tag.svg') no-repeat center center; }
+.tagged-list-header  a {border: none; text-decoration: none;}
+.tagged-list-header  a:hover { border-bottom: 1px solid #BEBEBE; }
+.article-tags .edy-taglist { margin-left: 25px; }
+
 /* Footer */
 #footer {
 	font-size: 12px;
@@ -610,4 +645,8 @@ img {
 }
 #wrap .no-border {
 	border-top: none;
-}
+}
+#comments .comment {
+    line-height: 1.2em;
+}
+