[ljcom] r11745: LJSUP-11767: Add to page with entries by...

U   trunk/bin/upgrading/s2layers/sup/themes.s2

Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2012-04-20 12:34:35 UTC (rev 11744)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2012-04-20 13:00:36 UTC (rev 11745)
@@ -548,6 +548,7 @@
 set recent_show_upic = false;
 set friends_show_upic = false;
 set theme_designer = "Mars";
+set show_title_on_tagpage = true;
 
 function _print_CSS {
     var Page p = get_page();
@@ -660,6 +661,28 @@
 
 function RecentPage::print_body {
     var Page p = get_page();
+
+    if ($.tagfilter_active and $*show_title_on_tagpage) {
+
+        var string delim = $*text_entries_bytag_or;
+        if($.tagfilter_mode == "and"){
+            $delim = $*text_entries_bytag_and;
+        }
+       
+       var string tagpage_header = get_plural_phrase(size( $.tagfilter_tags), "text_entries_bytag");
+ 
+        """<h3 class="tag-page-header">$tagpage_header: """;
+            var int counter = 0;
+            foreach var Tag tag ($.tagfilter_tags) {
+                $counter++;
+                """$tag.name""";
+                if($counter < size($.tagfilter_tags)){
+                    """ $delim """;          
+                }
+            }
+        """</h3>""";
+    } 
+
     if ($*sticky_post!="" and $*exact_view == "recent_first") {
 """
                         <div class="entry-wrap disabledcomments">
@@ -910,6 +933,7 @@
 set recent_show_upic = false;
 set friends_show_upic = false;
 set theme_designer = "Mars";
+set show_title_on_tagpage = true;
 
 function _print_CSS {
     var Page p = get_page();
@@ -1022,6 +1046,28 @@
 
 function RecentPage::print_body {
     var Page p = get_page();
+
+    if ($.tagfilter_active and $*show_title_on_tagpage) {
+
+        var string delim = $*text_entries_bytag_or;
+        if($.tagfilter_mode == "and"){
+            $delim = $*text_entries_bytag_and;
+        }
+       
+       var string tagpage_header = get_plural_phrase(size( $.tagfilter_tags), "text_entries_bytag");
+ 
+        """<h3 class="tag-page-header">$tagpage_header: """;
+            var int counter = 0;
+            foreach var Tag tag ($.tagfilter_tags) {
+                $counter++;
+                """$tag.name""";
+                if($counter < size($.tagfilter_tags)){
+                    """ $delim """;          
+                }
+            }
+        """</h3>""";
+    } 
+
     if ($*sticky_post!="" and $*exact_view == "recent_first") {
 """
                         <div class="entry-wrap disabledcomments">
@@ -1272,6 +1318,7 @@
 set recent_show_upic = false;
 set friends_show_upic = false;
 set theme_designer = "Mars";
+set show_title_on_tagpage = true;
 
 function _print_CSS {
     var Page p = get_page();
@@ -1384,6 +1431,28 @@
 
 function RecentPage::print_body {
     var Page p = get_page();
+
+    if ($.tagfilter_active and $*show_title_on_tagpage) {
+
+        var string delim = $*text_entries_bytag_or;
+        if($.tagfilter_mode == "and"){
+            $delim = $*text_entries_bytag_and;
+        }
+       
+       var string tagpage_header = get_plural_phrase(size( $.tagfilter_tags), "text_entries_bytag");
+ 
+        """<h3 class="tag-page-header">$tagpage_header: """;
+            var int counter = 0;
+            foreach var Tag tag ($.tagfilter_tags) {
+                $counter++;
+                """$tag.name""";
+                if($counter < size($.tagfilter_tags)){
+                    """ $delim """;          
+                }
+            }
+        """</h3>""";
+    } 
+
     if ($*sticky_post!="" and $*exact_view == "recent_first") {
 """
                         <div class="entry-wrap disabledcomments">
@@ -1634,6 +1703,7 @@
 set recent_show_upic = false;
 set friends_show_upic = false;
 set theme_designer = "Mars";
+set show_title_on_tagpage = true;
 
 function _print_CSS {
     var Page p = get_page();
@@ -1746,6 +1816,28 @@
 
 function RecentPage::print_body {
     var Page p = get_page();
+
+    if ($.tagfilter_active and $*show_title_on_tagpage) {
+
+        var string delim = $*text_entries_bytag_or;
+        if($.tagfilter_mode == "and"){
+            $delim = $*text_entries_bytag_and;
+        }
+       
+       var string tagpage_header = get_plural_phrase(size( $.tagfilter_tags), "text_entries_bytag");
+ 
+        """<h3 class="tag-page-header">$tagpage_header: """;
+            var int counter = 0;
+            foreach var Tag tag ($.tagfilter_tags) {
+                $counter++;
+                """$tag.name""";
+                if($counter < size($.tagfilter_tags)){
+                    """ $delim """;          
+                }
+            }
+        """</h3>""";
+    } 
+
     if ($*sticky_post!="" and $*exact_view == "recent_first") {
 """
                         <div class="entry-wrap disabledcomments">