[dw-free] Link to view all icons

[fu]

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

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

Add a link to view all icons. Also, put the icons pagination on both top and
bottom in the site skinned /icons page.

Patch by fu.

Files modified:

• bin/upgrading/s2layers/core2.s2
• bin/upgrading/s2layers/siteviews/layout.s2
• bin/upgrading/s2layers/skittlishdreams/layout.s2

--------------------------------------------------------------------------------
diff -r 26d93d2c8a9f -r caf5573c5cc2 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Wed Feb 22 16:35:30 2012 +0800
+++ b/bin/upgrading/s2layers/core2.s2	Wed Feb 22 17:49:32 2012 +0800
@@ -5959,6 +5959,7 @@
 
     var string anchor = $opts{"anchor"} ? "#$opts{"anchor"}" : "";
     var string class = $opts{"class"} ? $opts{"class"} : "pages";
+    var string all_url = $opts{"all_url"} ? $opts{"all_url"} : "";
 
     """<div class="$class">""";
     print "<b>" + lang_page_of_pages($.current, $.total) + "</b>";
@@ -5981,6 +5982,11 @@
     } else {
          print " $*comment_page_next ";
     }
+
+    if ( $all_url != "" ) {
+        """<p><a href="$all_url">View All</a></p>""";
+    }
+
     "</div>";
 }
 
@@ -6063,11 +6069,11 @@
         "</li>\n";
     }
     "</ul>\n</div>\n";
-    $.pages->print({ "class" => "icon-pages toppages" });
+    $.pages->print({ "class" => "icon-pages toppages", "all_url" => "$.journal.userpic_listing_url?view=all" });
     foreach var Icon i ($.icons) {
         $i->print();
     }
-    $.pages->print({ "class" => "icon-pages bottompages" });
+    $.pages->print({ "class" => "icon-pages bottompages", "all_url" => "$.journal.userpic_listing_url?view=all" });
     "</div>\n</div>\n";
     """<div class="footer">\n<div class="inner">\n""";
     $this->print_icon_manage_link();
diff -r 26d93d2c8a9f -r caf5573c5cc2 bin/upgrading/s2layers/siteviews/layout.s2
--- a/bin/upgrading/s2layers/siteviews/layout.s2	Wed Feb 22 16:35:30 2012 +0800
+++ b/bin/upgrading/s2layers/siteviews/layout.s2	Wed Feb 22 17:49:32 2012 +0800
@@ -50,6 +50,7 @@
 
     var string anchor = $opts{"anchor"} ? "#$opts{"anchor"}" : "";
     var string class = $opts{"class"} ? $opts{"class"} : "action-box";
+    var string all_url = $opts{"all_url"} ? $opts{"all_url"} : "";
 
     """<div class="$class">""";
     print """<p style="font-weight: bolder; margin: 0 0 .5em 0;">""" + lang_page_of_pages($.current, $.total) + "</p>";
@@ -74,6 +75,11 @@
     } else {
          print " <b>$*comment_page_next</b> ";
     }
+
+    if ( $all_url != "" ) {
+        """<p><a href="$all_url">View All</a></p>""";
+    }
+
     "</div>";
 }
 
@@ -111,7 +117,11 @@
         } else {
             """We can <a href="$*SITEROOT/manage/tracking/user?journal=$.journal.username">notify</a> you when this account uploads a new one.""";
         }
-        """</p><p>""";
+        """</p>""";
+
+        $.pages->print({ "anchor" => "", "all_url" => "$.journal.userpic_listing_url?view=all" });
+
+        """<p>""";
         var int sort_ct = 0;
         foreach var string k ($.sort_keyseq) {
             var string text = lang_icon_sortorder_title($k);
@@ -147,7 +157,7 @@
         }
         """</div>""";
 
-        $.pages->print({ "anchor" => "" });
+        $.pages->print({ "anchor" => "", "all_url" => "$.journal.userpic_listing_url?view=all" });
         """<div class="clear-floats"></div>""";
     }
 }
diff -r 26d93d2c8a9f -r caf5573c5cc2 bin/upgrading/s2layers/skittlishdreams/layout.s2
--- a/bin/upgrading/s2layers/skittlishdreams/layout.s2	Wed Feb 22 16:35:30 2012 +0800
+++ b/bin/upgrading/s2layers/skittlishdreams/layout.s2	Wed Feb 22 17:49:32 2012 +0800
@@ -434,11 +434,11 @@
         "</li>\n";
     }
     "</ul>\n</div>\n";
-    $.pages->print({ "class" => "icon-pages toppages" });
+    $.pages->print({ "class" => "icon-pages toppages", "all_url" => "$.journal.userpic_listing_url?view=all" });
     foreach var Icon i ($.icons) {
         $i->print();
     }
-    $.pages->print({ "class" => "icon-pages bottompages" });
+    $.pages->print({ "class" => "icon-pages bottompages", "all_url" => "$.journal.userpic_listing_url?view=all" });
     "</div>\n</div>\n";
     """<div class="footer">\n<div class="inner">\n""";
     $this->print_icon_manage_link();
--------------------------------------------------------------------------------