[ljcom] r10721: LJSUP-9205: iPad

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

Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2011-06-30 09:18:24 UTC (rev 10720)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2011-06-30 09:57:46 UTC (rev 10721)
@@ -319,8 +319,8 @@
     var string _h1 = "<h1>" + _user_print($.journal, "microformatted") + "</h1>";
     var string _nav = """ <li class="item item-recent""" + (($.view == "recent")?" item-selected":"") + """"><a""" + (($*exact_view != "recent_first")?" rel=\"home\" href=\"$*base_url\"":"") + """>$*text_view_recent</a></li> <li class="item item-friends""" + (($.view == "friends")?" item-selected":"") + """"><a""" + (($*exact_view != "friends_first")?" href=\"$*base_url/friends\"":"") + """>$*text_view_friends</a></li> <li class="item item-archive""" + (($.view == "archive" or $.view == "month" or $.view == "day")?" item-selected":"") + """"><a""" + (($*exact_view != "archive_first")?" href=\"$*base_url/calendar\"":"") + """>$*text_view_archive</a></li> <li class="item item-profile"><a href="$*base_url/profile">$*text_view_userinfo</a></li> """;
     var string rsslink = ($.data_link{"rss"})?($.data_link{"rss"}.url):"$*base_url/data/rss";
-	var Link addlink = $.journal -> get_link("add_friend");
-	var string addfriend = (not viewer_is_owner() and $addlink.url != "") ? $addlink.url : "";
+    var Link addlink = $.journal -> get_link("add_friend");
+    var string addfriend = (not viewer_is_owner() and $addlink.url != "") ? $addlink.url : "";
     var string _nav_sub = ($addfriend ? """ <li class="item item-addfriend"><a href="$addfriend">$*text_friend_add</a></li> """ : "") + """ <li class="item item-rss"><a href="$rsslink">RSS</a></li> """;
     var string _h2 = """<h2>$.global_title</h2>""";
     var string _h3 = ($.view == "friends")?"<h3>$*_FriendsPage.friends_title</h3>":"<h3>$.global_subtitle</h3>";
@@ -557,21 +557,21 @@
     var string _h1 = "<h1>" + _user_print($.journal, "microformatted") + "</h1>";
     var string _nav = """ <li class="item item-recent""" + (($.view == "recent")?" item-selected":"") + """"><a""" + (($*exact_view != "recent_first")?" rel=\"home\" href=\"$*base_url\"":"") + """>$*text_view_recent</a></li> <li class="item item-friends""" + (($.view == "friends")?" item-selected":"") + """"><a""" + (($*exact_view != "friends_first")?" href=\"$*base_url/friends\"":"") + """>$*text_view_friends</a></li> <li class="item item-archive""" + (($.view == "archive" or $.view == "month" or $.view == "day")?" item-selected":"") + """"><a""" + (($*exact_view != "archive_first")?" href=\"$*base_url/calendar\"":"") + """>$*text_view_archive</a></li> <li class="item item-profile"><a href="$*base_url/profile">$*text_view_userinfo</a></li> <li class="item item-tag""" + (($.view == "tags")?" item-selected":"") + """"><a href="$*base_url/tag">$*text_tags_page_header</a></li> """;
     var string rsslink = ($.data_link{"rss"})?($.data_link{"rss"}.url):"$*base_url/data/rss";
-	var Link addlink = $.journal -> get_link("add_friend");
+    var Link addlink = $.journal -> get_link("add_friend");
     var string _games;
     if ($.view_my_games) {
         $_games = """<li class="item item-games"><a href="$.journal.website_url/profile#apps">$*text_view_games</a></li>""";
     }
-	var string addfriend = (not viewer_is_owner() and $addlink.url != "") ? $addlink.url : "";
+    var string addfriend = (not viewer_is_owner() and $addlink.url != "") ? $addlink.url : "";
     var string _nav_sub = ($addfriend ? """ <li class="item item-addfriend"><a class="btn btn-add" href="$addfriend"><span><span><span>$*text_friend_add</span></span></span></a></li> """ : "") + """ <li class="item item-rss"><a class="btn btn-rss" href="$rsslink"><span><span><span>RSS</span></span></span></a></li>$_games""";
     if ($*active_theme == "x3") { $_nav_sub = ($addfriend ? """ <li class="item item-addfriend"><a href="$addfriend">$*text_friend_add</a></li> """ : "") + """ <li class="item item-rss"><a href="$rsslink">RSS</a></li> $_games """; }
     var string _h2 = """<h2><span>$.global_title</span></h2>""";
     var string _h3 = "";
-	if ($.view == "friends" and $*_FriendsPage.friends_title != "") {
-		$_h3 = "<h3><span>$*_FriendsPage.friends_title</span></h3>";
-	} elseif ($.global_subtitle != "") {
-		$_h3 = "<h3><span>$.global_subtitle</span></h3>";
-	}
+    if ($.view == "friends" and $*_FriendsPage.friends_title != "") {
+        $_h3 = "<h3><span>$*_FriendsPage.friends_title</span></h3>";
+    } elseif ($.global_subtitle != "") {
+        $_h3 = "<h3><span>$.global_subtitle</span></h3>";
+    }
     var string _hfeed = ($.view=="recent" or $.view=="friends" or $.view=="day")?" hfeed":"";
     _Header();
 """
@@ -581,7 +581,7 @@
             <div class="content$_hfeed">
                 <div class="content-inner">
                     <div class="header">
-                        <div class="nav-wrapper""" + ($addfriend ? " nav-addfriend" : "") + """\">
+                        <div class="nav-wrapper""" + ($addfriend ? " nav-addfriend" : "") + ($.view_my_games ? "nav-games" : "") + """\">
                         <ul class="nav">
                             $_nav
                             $_nav_sub