Committer: ybuhvalova
LJSUP-10443: New style - pokerLJSUP-10441: New style - blue fence
U trunk/bin/upgrading/s2layers/sup/layout.s2
Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2 2012-03-26 08:48:42 UTC (rev 11626)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2 2012-03-26 08:50:04 UTC (rev 11627)
@@ -118,7 +118,6 @@
property use text_spam_comment;
property use text_read_spam_comments;
property use text_read_all_spam_comments;
- property use text_view_games;
property use text_month_prev;
property use text_month_next;
property use text_year_prev;
@@ -329,6 +328,7 @@
return $user->ljuser({"in_journal" => $journal_name});
}
+
function _print_entry(Entry e) {
var Page p = get_page();
var string entrydate = _dateTime($e.time);
@@ -343,6 +343,7 @@
var string corners1_2 = "";
var string corners1_3 = "";
var string corners2 = "";
+
if ($*active_theme == "x4") {
$corners1 = """<i class="cornerz cornerz-top"><b></b></i>""";
$corners2 = """<i class="cornerz cornerz-bot"><b></b></i>""";
@@ -350,6 +351,7 @@
$corners1_2 = """<i class="cornerz cornerz-top"><b></b></i>""";
$corners2 = """<i class="cornerz cornerz-bot"><b></b></i>""";
}
+
if ($*active_theme == "x5" and ($p.view=="entry" or $p.view=="reply")) {
$corners1_2 = "";
$corners1_3 = """<i class="cornerz cornerz-top"><b></b></i>""";
@@ -978,6 +980,7 @@
var Page p = get_page();
var string text_count = ($*active_theme == "x3")?get_plural_phrase($.count,"text_read_comments"):string($.count);
+
if ($.show_readlink) {
"""<li class="comments"><a href="$.read_url#$*text_comments_id" class="btn btn-comments"><span><span><span>$text_count</span></span></span></a></li>""";
}
@@ -1387,21 +1390,18 @@
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 _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 _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 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 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>""";
+ 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> """; }
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();
"""
@@ -1497,6 +1497,31 @@
</div>
</div>
""";
+ } elseif($*active_theme == "x6") {
+"""
+ <div class="header">
+ <div class="header-heads">
+ $_upic
+ $_h1
+ $_h2
+ $_h3
+ </div>
+ <div class="header-nav">
+ <ul class="nav">
+ $_nav
+ </ul>
+ <ul class="nav-sub">
+ $_nav_sub
+ </ul>
+ </div>
+ <div class="hr hr-afterhead"><hr /></div>
+ </div>
+ <div class="content$_hfeed">
+ <div class="content-inner">
+ """;$this->print_body();"""
+ </div>
+ </div>
+""";
} else {
"""
<div class="content$_hfeed">
@@ -1520,6 +1545,7 @@
}
_Sidebar();
"""
+ <div id="layinner-decor"></div>
</div>
</div>
</div>
