[ljcom] r11657: LJSUP-11659: Change the block size
Committer: ybuhvalova
LJSUP-11659: Change the block sizeU trunk/bin/upgrading/s2layers/sup/themes.s2
Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2 2012-03-29 14:17:45 UTC (rev 11656)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2 2012-03-29 14:37:38 UTC (rev 11657)
@@ -2065,7 +2065,7 @@
""";
if ($e.userpic) { """<dt"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</dt>"""; } else { """<dt></dt>"""; }
"""
- <dd class="username">"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in "; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
+ <dd class="username">"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in<br/>"; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
</dl>
<h4>$_entry_title</h4>
<div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr></div>
@@ -2193,7 +2193,7 @@
""";
if ($e.userpic) { """<dt"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</dt>"""; } else { """<dt></dt>"""; }
"""
- <dd class="username">$e.journal.name """; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in "; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
+ <dd class="username">$e.journal.name """; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in "; print _user_print($e.journal,"simple"); } else { print _user_print($e.poster,"inside"); } """</dd>
<dd class="entry-date"><abbr class="updated" title="$isodate">@ $olds1date</abbr></dd>
</dl>
""";
@@ -2211,7 +2211,7 @@
""";
if ($e.userpic) { """<dt"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</dt>"""; } else { """<dt></dt>"""; }
"""
- <dd class="username">"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in "; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
+ <dd class="username">"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in <br/>"; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
</dl>
<h4>$_entry_title</h4>
<div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr></div>
@@ -2475,7 +2475,7 @@
""";
if ($e.userpic) { """<dt"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</dt>"""; } else { """<dt></dt>"""; }
"""
- <dd class="username">"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in "; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
+ <dd class="username">"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in<br/>"; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
</dl>
<h4>$_entry_title</h4>
<div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr></div>
@@ -2682,6 +2682,25 @@
layerinfo "redist_uniq" = "sup/friendstimes";
set theme_css = "friendstimes.css";
+function CommentInfo::print() {
+
+ var Page p = get_page();
+ var string text_count = get_plural_phrase($.count,"text_read_comments");
+
+ if ($.show_readlink) {
+ """<li class="comments"><a href="$.read_url#$*text_comments_id">$text_count</a></li>""";
+ }
+ if ($.show_postlink) {
+ """<li class="postcomment">""";
+ if ($.maxcomments) {
+ print safe """$*text_max_comments""";
+ } else {
+ """<a href="$.post_url#$*text_addcomment_id">"""+($p.view == "friends" ? $*text_post_comment_friends : $*text_post_comment)+"</a>";
+ }
+ "</li>";
+ }
+}
+
function _print_entry(Entry e) {
var Page p = get_page();
var string entrydate = _dateTime($e.time);
@@ -2730,15 +2749,16 @@
"""
<dt class="entry-title">""";
if ((not $*old_s1) or ($*old_s1 and $p.view!="entry" and $p.view!="reply")) {
-"""
- <dl class="vcard author">
- """;
- if ($e.userpic) { """<dt"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</dt>"""; } else { """<dt></dt>"""; }
- """
- <dd class="username">"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in "; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
- </dl>
- <div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr></div>
+"""<div class="entry-title-content">
+ """;
+ if ($e.userpic) { """<div class="entry-userpic" """; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</div>"""; }
+ """
+ <div class="entry-author-date">""";
+ if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print _user_print_journal($e.poster, "inside", $e.journal.username); " $*text_user_posts_in "; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); }
+ """ <abbr class="updated" title="$isodate">$entrydate</abbr></div>
<h4>$_entry_title</h4>
+ """; $e->print_metadata(); """
+ </div>
""";
}
@@ -2751,17 +2771,21 @@
</dt>
<dd class="entry-text">
""";
-
-$e->print_metadata();
+ if ($*old_s1) {
+ $e->print_metadata();
+ }
+
"""<div class="entry-content">""";$e->print_text();"""</div>""";
"""
</dd>
""";
if ($p.view!="entry" and $p.view!="reply") {
"""
- <dd class="entrymenu"><ul>""";
+ <dd class="entry-footer"><ul class="entry-menu">""";
$e.comments->print();
+
+ """</ul><ul class="entry-submenu">""";
var Link link;
var string url = "";
@@ -2780,13 +2804,13 @@
if (defined $link) {
$url = $link.url;
$text = $link_caption{$link_key} != "" ? $link_caption{$link_key} : $link.caption;
- print safe """<li class="$link_key"><a class="btn btn-simple" href="$url"><span><span><span>$text</span></span></span></a></li>""";
+ print safe """<li class="$link_key"><a href="$url">$text</a></li>""";
$link->print_raw();
}
if ($link_key == "give_button") {
- print safe """<li class="$link_key btn btn-simple"><span><span><span>""";
+ print safe """<li class="$link_key btn btn-simple">""";
$e->print_give_button("string");
- print safe """</span></span></span></li>""";
+ print safe """</li>""";
}
}
@@ -2828,7 +2852,7 @@
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>""";
+ 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>""";
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 = "";
@@ -2844,18 +2868,19 @@
<div class="layout">
<div class="layout-inner">
- <div class="header">
- $_upic
- $_h2
- $_h3
+
+ <div class="content$_hfeed">
+ <div class="header">
+ $_upic
+ $_h2
+ $_h3
- <ul class="nav">
- $_nav
- $_nav_sub
- </ul>
- <div class="hr hr-afterhead"><hr /></div>
- </div>
- <div class="content$_hfeed">
+ <ul class="nav">
+ $_nav
+ $_nav_sub
+ </ul>
+ <div class="hr hr-afterhead"><hr /></div>
+ </div>
<div class="content-inner">
""";$this->print_body();"""
</div>
@@ -2869,4 +2894,81 @@
</div>
""";
_Footer();
+}
+
+function EntryPage::print_comment_full (Comment c) {
+ var Page p = get_page();
+ var string poster = defined $c.poster ? _user_print($c.poster, "microformatted") : "<em>$*text_poster_anonymous</em>";
+ var string evenodd = $c.depth % 2 ? "odd" : "even";
+ if (defined $c.userpic and $*comment_userpic_style != "off") {
+ var int w = $c.userpic.width;
+ var int h = $c.userpic.height;
+ """<div class="comment-head $evenodd"><div class="comment-upic"><img src="$c.userpic.url" width="$w" height="$h" alt="$c.userpic.alttext" /></div>""";
+ } else {
+ """<div class="comment-head $evenodd cwoup">""";
+ }
+
+ if ($*old_s1) {
+ """<div class="comment-head-in">""";
+ if (defined $c.subject_icon or $c.subject != "") {
+ """<h3>$c.subject_icon $c.subject</h3>""";
+ }
+ "<p>$poster</p>";
+ "<p>" + $c->time_display();
+ if ($c.metadata{"poster_ip"}) { " (" + $c.metadata{"poster_ip"} + ") "; }
+ """ (<a class="comment-permalink" href="$c.permalink_url">$*text_permalink</a>) """;
+ $c->print_linkbar();
+ if ($this.multiform_on) {
+ $c->print_multiform_check();
+ print safe """ <label for="ljcomsel_$c.talkid">$*text_multiform_check_clean</label>""";
+ }
+ "</p>";
+ "</div>";
+ } else {
+ """<div class="comment-head-in">""";
+ if (defined $c.subject_icon or $c.subject != "") {
+ """<h3>$c.subject_icon $c.subject</h3>""";
+ }
+ """<span class="c-poster">$poster</span>""";
+ """ <span class="c-time">"""; _dateTime($c.time); "</span>";
+
+ if ($c.metadata{"poster_ip"}) {
+ """ <span class="c-ip">IP: """;
+ print $c.metadata{"poster_ip"};
+ """</span>""";
+ }
+
+ if ($this.multiform_on) {
+ """<span class="c-multyform">""";
+ print safe """ <label for="ljcomsel_$c.talkid">$*text_multiform_check</label>""";
+ $c->print_multiform_check();
+ "</span>";
+ }
+
+ """<div class="c-linkbar">""";
+ $c->print_linkbar();
+ "</div></div>";
+ }
+
+ "</div>";
+
+ """<div class="comment-text">"""; $c->print_text(); "</div>";
+ """<div class="comment-menu">""";
+ if ($c.frozen) {
+ print safe "<span>$*text_comment_frozen</span> ";
+ } elseif($c.screened) {
+ var Link link = $c->get_link("unscreen_to_reply");
+ """<span><a class="unscreen-to-reply" href="$link.url" title="$link.caption">$link.caption</a></span> """;
+ } elseif ((not $c.spam) or ($p.showspam)) {
+ $c->print_reply_link({"linktext" => $*text_comment_reply});
+ }
+ if ($c.parent_url != "") { print safe """<span><a href="$c.parent_url">$*text_comment_parent</a></span> """; }
+ if (($c.thread_url != "") and (not $c.spam)) {
+ print safe """<span><a href="$c.thread_url">$*text_comment_thread</a></span> """;
+ if ($c.parent_url != "") {
+ $c->print_expand_collapse_links({ "expand"=>"<span>%_</span>", "collapse"=>"<span>%_</span>"});
+ }
+ }
+ """ <span><a class="comment-permalink" href="$c.permalink_url">$*text_permalink</a></span>""";
+ """</div><div class="hr"><hr /></div>""";
}
\ No newline at end of file