afuna: Cat under a blanket. Text: "Cats are just little people with Fur and Fangs" (Default)
afuna ([personal profile] afuna) wrote in [site community profile] changelog2009-05-10 03:40 am

[dw-free] add control to display Tags page as list or cloud to core2

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

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

Options for display on Tags page

Patch by [personal profile] draigwen.

Files modified:
  • bin/upgrading/s2layers/core2.s2
  • bin/upgrading/s2layers/core2base/layout.s2
  • bin/upgrading/s2layers/negatives/layout.s2
  • bin/upgrading/s2layers/zesty/layout.s2
--------------------------------------------------------------------------------
diff -r 4ac600d84f6f -r e2bec4716500 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Sun May 10 02:58:55 2009 +0000
+++ b/bin/upgrading/s2layers/core2.s2	Sun May 10 03:39:01 2009 +0000
@@ -1022,6 +1022,12 @@ property int num_items_reading {
 }
 set num_items_recent = 20;
 set num_items_reading = 20;
+
+property string tags_page_type { 
+    des = "Type of tags display on tags page"; 
+    values="list|List|cloud|Cloud|multi|Multilevel"; 
+}
+set tags_page_type = "";
 
 property string[] reverse_sortorder_group {
     des = "Display entries in reverse-chronological order on my:";
@@ -4508,7 +4514,18 @@ function TagsPage::print_body
 {
     print safe "<h2>$*text_tags_page_header</h2>";
 
-    print_multilevel_tags($.tags, { "list-class" => "ljtaglist", "text_uses" => "text_tag_uses" });
+    if ($*tags_page_type == "multi") {
+        print_multilevel_tags($.tags, { "list-class" => "ljtaglist", "text_uses" => "text_tag_uses" });
+        print_tag_manage_link();
+    }
+    elseif ($*tags_page_type == "cloud") {
+        print_cloud_tags($.tags, { "list-class" => "ljtaglist" });
+        print_tag_manage_link();
+    }
+    else {
+        print_list_tags($.tags, { "list-class" => "ljtaglist" });
+        print_tag_manage_link();
+    }
 }
 
 ### MessagePage functions
diff -r 4ac600d84f6f -r e2bec4716500 bin/upgrading/s2layers/core2base/layout.s2
--- a/bin/upgrading/s2layers/core2base/layout.s2	Sun May 10 02:58:55 2009 +0000
+++ b/bin/upgrading/s2layers/core2base/layout.s2	Sun May 10 03:39:01 2009 +0000
@@ -11,6 +11,7 @@ propgroup presentation {
     property use num_items_reading;
     property use use_journalstyle_entry_page;
     property use layout_type;
+    property use tags_page_type;
     property use sidebar_width;
     property use sidebar_width_doubled;
 }
@@ -568,4 +569,4 @@ ul.userlite-interaction-links li {
     end_css();
     "</style>\n";
 
-}
\ No newline at end of file
+}
diff -r 4ac600d84f6f -r e2bec4716500 bin/upgrading/s2layers/negatives/layout.s2
--- a/bin/upgrading/s2layers/negatives/layout.s2	Sun May 10 02:58:55 2009 +0000
+++ b/bin/upgrading/s2layers/negatives/layout.s2	Sun May 10 03:39:01 2009 +0000
@@ -15,6 +15,7 @@ propgroup presentation {
     property use num_items_reading;
     property use use_journalstyle_entry_page;
     property use layout_type;
+    property use tags_page_type;
 }
 
 set layout_type = "two-columns-right";
diff -r 4ac600d84f6f -r e2bec4716500 bin/upgrading/s2layers/zesty/layout.s2
--- a/bin/upgrading/s2layers/zesty/layout.s2	Sun May 10 02:58:55 2009 +0000
+++ b/bin/upgrading/s2layers/zesty/layout.s2	Sun May 10 03:39:01 2009 +0000
@@ -146,6 +146,7 @@ propgroup presentation {
     property use num_items_recent;
     property use num_items_reading;
     property use use_journalstyle_entry_page;
+    property use tags_page_type;
 }
 
 set num_items_recent = 10;
--------------------------------------------------------------------------------