mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2009-06-12 09:15 pm

[dw-free] make tags in entries a horizontal list

[commit: http://hg.dwscoalition.org/dw-free/rev/025840393f72]

http://bugs.dwscoalition.org/show_bug.cgi?id=762

Default to show tags as a horizontal, comma separated list.

Patch by [personal profile] av8rmike.

Files modified:
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/negatives/layout.s2
--------------------------------------------------------------------------------
diff -r dfd44ce17c2a -r 025840393f72 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Fri Jun 12 21:13:01 2009 +0000
+++ b/bin/upgrading/s2layers/core2.s2	Fri Jun 12 21:15:36 2009 +0000
@@ -2011,10 +2011,16 @@ property string text_tags_manage {
     example = "Manage Tags";
 }
 
+property string text_tags_item_sep {
+    des = "Text to separate items in a list of tags";
+    example = ",";
+}
+
 set text_tags_page_header = "Visible Tags";
 set text_tag_uses = "1 use // # uses";
 set text_tagsmultilevel_delimiter = ":";
 set text_tags_manage = "Manage Tags";
+set text_tags_item_sep = ",";
 
 ##================================================================
 ## Text - misc strings, not popular enough to expose in wizard
@@ -3735,9 +3741,13 @@ function Comment::print_metatypes() {
 
 function Entry::print_tags() [fixed] {
     if ($this.tags) {
-        """<div class="tag"><span class="tag-text">$*text_tags</span><ul>""";
+        var int tag_count = 0;
+        """<div class="tag"><span class="tag-text">$*text_tags</span><ul>\n""";
         foreach var Tag t ($this.tags) {
-            """<li><a rel="tag" href="$t.url">$t.name</a></li>\n""";
+            """<li><a rel="tag" href="$t.url">$t.name</a>""";
+            $tag_count++;
+            if ($tag_count < size $.tags) { print $*text_tags_item_sep; }
+            "</li>\n";
         }
         "</ul></div>";
     }
diff -r dfd44ce17c2a -r 025840393f72 bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Fri Jun 12 21:13:01 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Fri Jun 12 21:15:36 2009 +0000
@@ -315,6 +315,9 @@ function print_stylesheet()
     .entry a:hover, .comment a:hover {
         color: $*color_entry_link_hover;
     }
+    .tag { margin: 10px 0; }
+    .tag ul { display: inline; margin: 0; padding: 0; }
+    .tag li { display: inline; }
     .bottomcomment {
         border: 15px double $*color_entry_border;
         padding: 5px;
--------------------------------------------------------------------------------