[dw-free] /icons should have "site" as option in nav strip

[fu]

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

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

Show style=site link in nav strip for icons page.

Patch by fu.

Files modified:

• bin/upgrading/s2layers/core2.s2
• cgi-bin/weblib.pl

--------------------------------------------------------------------------------
diff -r 5cc8c72df9c4 -r cc44ea023fcc bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2	Tue Apr 19 17:52:11 2011 +0800
+++ b/bin/upgrading/s2layers/core2.s2	Tue Apr 19 18:15:56 2011 +0800
@@ -1202,7 +1202,7 @@ set use_journalstyle_entry_page = true;
 set use_journalstyle_entry_page = true;
 
 property bool use_journalstyle_icons_page  { des = "Show icons page in my journal style rather than the site layout"; }
-set use_journalstyle_icons_page = false;
+set use_journalstyle_icons_page = true;
 
 # Defaults to false, but layouts can set it to true to switch on custom colors for different posters on reading list.
 property bool use_custom_friend_colors  { des = "Use my custom reading list colors"; }
diff -r 5cc8c72df9c4 -r cc44ea023fcc cgi-bin/weblib.pl
--- a/cgi-bin/weblib.pl	Tue Apr 19 17:52:11 2011 +0800
+++ b/cgi-bin/weblib.pl	Tue Apr 19 18:15:56 2011 +0800
@@ -3115,7 +3115,11 @@ LOGIN_BAR
         if ( $view_type eq "mine" and $current_style ne $view_type and $remote and not $remote->equals( $journal ) ) {
             push @view_options, "<a href='" . $make_style_link->( $view_type ) . "'>" .
                 LJ::Lang::ml( 'web.controlstrip.reloadpage.mystyle2' ) . "</a>";
-        } elsif ( $view_type eq "site" and $current_style ne $view_type and ( $view eq "entry" or $view eq "reply" ) ) {
+        } elsif ( $view_type eq "site" and $current_style ne $view_type and {
+                entry => 1,
+                reply => 1,
+                icons => 1,
+            }->{$view} ) {
             push @view_options, "<a href='" . $make_style_link->( $view_type ) . "'>" .
                 LJ::Lang::ml( 'web.controlstrip.reloadpage.sitestyle' ) . "</a>";
         } elsif ( $view_type eq "light" and $current_style ne $view_type ) {
--------------------------------------------------------------------------------