[ljcom] r10954: LJSUP-9307: Delayed entries and sticky p...
Committer: esavintcev
LJSUP-9307: Delayed entries and sticky postsU branches/delayed_entries/bin/upgrading/s2layers/anovelconundrum/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/boxer/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/component/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/cuteness/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/flexiblesquares/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/gradient/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/nebula/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/opal/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/tranquilityii/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/unearthed/layout.s2 U branches/delayed_entries/bin/upgrading/s2layers/voxhtml/layout.s2
Modified: branches/delayed_entries/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/anovelconundrum/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/anovelconundrum/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -667,7 +667,9 @@
<div class="author">""";
if ($e.userpic) { $e.userpic->print(); """<br />""";}
print $e.poster->ljuser();
- if ($e.security != "") {$e.security_icon->print();}
+ if ($e.delayed) {" $e.delayed_icon";}
+ if ($e.sticky) {" $e.sticky_icon";}
+ if ($e.security) {" $e.security_icon";}
if ($e.poster.username != $e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){
print "<br />" + $e.journal->ljuser();
}
Modified: branches/delayed_entries/bin/upgrading/s2layers/boxer/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/boxer/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/boxer/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -851,9 +851,14 @@
<tr>
<td class="entry">
""";
+ if ($e.sticky or $e.delayed or $e.security != "") {
+ """<div style='padding-left: 5px;'>""";
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { "$e.sticky_icon "; }
+ if ($e.security) { "$e.security_icon"; }
+ """</div>""";
+ }
- if ($e.security) { print "<div style='padding-left: 5px;'>$e.security_icon</div>"; }
-
"""
</td>
@@ -1051,7 +1056,13 @@
<td class="entry">""";
- if ($.entry.security) { print "<div style='padding-left: 5px;'>$.entry.security_icon</div>"; }
+ if ($.entry.security != "" or $.entry.sticky or $.entry.delayed) {
+ """<div style='padding-left: 5px;'>""";
+ if ($.entry.delayed) { "$.entry.delayed_icon "; }
+ if ($.entry.sticky) { "$.entry.sticky_icon "; }
+ if ($.entry.security) { "$.entry.security_icon"; }
+ """</div>""";
+ }
"""</td>
<td class="entry" align="right">
Modified: branches/delayed_entries/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/component/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/component/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -2085,7 +2085,10 @@
} else {
$header = "$time " + $e.time->date_format("long");
}
+
if ($e.security) { $header = $e.security_icon + " " + $header; }
+ if ($e.sticky) { $header = $e.sticky_icon + " " + $header; }
+ if ($e.delayed) { $header = $e.delayed_icon + " " + $header; }
var string link = ($p.view == "friends") ? $e.journal.username : "item";
"""
@@ -2565,7 +2568,9 @@
if ($e.poster.username != $e.journal.username) {
$e.poster->print(); " ";
}
- "$e.security_icon";
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { "$e.sticky_icon "; }
+ if ($e.security) { "$e.security_icon"; }
if ($e.subject != "") {
" <a href=\"$e.permalink_url\">$e.subject</a>";
} else {
@@ -2993,7 +2998,11 @@
}
var string posttime = "$time " + $.replyto.time->date_format("med");
+
if ($.entry.security) { $posttime = $.entry.security_icon + " " + $posttime; }
+ if ($.entry.sticky) { $posttime = $.entry.sticky_icon + " " + $posttime; }
+ if ($.entry.delayed) { $posttime = $.entry.delayed_icon + " " + $posttime; }
+
var string subject = ($.replyto.subject ? "$.replyto.subject" : "");
var string poster = defined $.replyto.poster ? $.replyto.poster->as_string() : "<i>(Anonymous)</i>";
var string pic = "";
Modified: branches/delayed_entries/bin/upgrading/s2layers/cuteness/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/cuteness/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/cuteness/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -1350,10 +1350,11 @@
}
print "<h2>";
- if ( $e.security != "" ) {
- $e.security_icon->print();
- print " ";
- }
+
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { "$e.sticky_icon "; }
+ if ($e.security) { "$e.security_icon "; }
+
if ( $e.subject == "" ) {
if ($p.view != "entry") {
print "<a href='$e.permalink_url'><i>$*text_nosubject</i></a>";
@@ -1807,7 +1808,11 @@
if ( $e.poster.username != $e.journal.username ) {
$e.poster->print(); " : ";
}
- "$e.security_icon ";
+
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { "$e.sticky_icon "; }
+ if ($e.security) { "$e.security_icon "; }
+
if ( $e.subject == "" ) {
print safe "<a href=\"$e.permalink_url\" title=\"$*text_nosubject\"><i>$*text_nosubject</i></a>";
} else {
Modified: branches/delayed_entries/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/flexiblesquares/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/flexiblesquares/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -1441,7 +1441,11 @@
$item = "";
var string datetime = $e.time->date_format() + " " + $e.time->time_format();
var string subject = $e.subject != "" ? $e->plain_subject() : $*text_nosubject;
+
+ if ($e.delayed) { $item = $item + " $e.delayed_icon"; }
+ if ($e.sticky) { $item = $item + " $e.sticky_icon"; }
if ($e.security) { $item = $item + " $e.security_icon"; }
+
$item = $e.poster.username != $.journal.username ?
$item + """ $e.poster — <a href="#$e.journal.username$e.itemid" title="$datetime">$subject</a>""" :
$item + """ <a href="#$e.journal.username$e.itemid" title="$datetime">$subject</a>""";
@@ -1462,7 +1466,10 @@
"$e.poster in $e.journal" : $e.journal->as_string();
var string subject = $e.subject != "" ? $e->plain_subject() : $*text_nosubject;
+ if ($e.delayed) { $item = $item + " $e.delayed_icon"; }
+ if ($e.sticky) { $item = $item + " $e.sticky_icon"; }
if ($e.security) { $item = $item + " $e.security_icon"; }
+
$item = $item + """ $poster — <a href="#$e.journal.username$e.itemid" title="$datetime">$subject</a>""";
$item = $item + """ <span class="count">[+<a href="$e.permalink_url">$e.comments.count</a>]</span>""";
$return = $return + """<li class="sbaritem">$item</li>""";
@@ -1952,10 +1959,10 @@
</div>";
"""
<div class="subject">""";
- if ($e.security != "")
- {
- $e.security_icon->print();
- }
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { "$e.sticky_icon "; }
+ if ($e.security) { "$e.security_icon "; }
+
if ($p.view != "entry") {
print $e->formatted_subject({"class"=>"subj-link"});" ";
}
Modified: branches/delayed_entries/bin/upgrading/s2layers/gradient/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/gradient/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/gradient/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -1353,11 +1353,10 @@
</tr>
<tr>
<td class="metatitle">Security:</td> <td>""";
- if ($e.security != "") {
- """$e.security""";
- if ($*security_icons == true) {
- """ $e.security_icon""";
- }
+ if ($e.security != "" or $e.sticky or $e.delayed) {
+ if ($e.delayed) { " $e.delayed_icon"; }
+ if ($e.sticky) { " $e.sticky_icon"; }
+ if ($e.security) { " $e.security_icon"; }
}
else {
"""public""";
@@ -2085,12 +2084,11 @@
}
"""</dt>
<dd>""";
- if ($e.security != "") {
- """$e.security""";
- }
- else {
- """public""";
- }
+
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { "$e.sticky_icon "; }
+ if ($e.security) { "$e.security_icon "; }
+
""" entry posted """;
if ($e.poster.username != $e.journal.username) {
"""by <a href="""; print $e.poster->base_url(); """>$e.poster.username</a> """;
Modified: branches/delayed_entries/bin/upgrading/s2layers/nebula/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/nebula/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/nebula/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -1383,7 +1383,11 @@
" </h3>\n";
}
- " <span class=\"subHeading\"><b>Posted $e.security</b> ";
+ " <span class=\"subHeading\"><b>Posted";
+ if ($e.delayed) { " $e.delayed_icon"; }
+ if ($e.sticky) { " $e.sticky_icon"; }
+ if ($e.security) { " $e.security_icon"; }
+ "</b> ";
if ($e.poster.username != $e.journal.username) {
if ($e.journal.journal_type == "C" or $e.journal.journal_type == "S") { "by " + $e.poster->as_string(); }
if ($p.view == "friends") { " in " + $e.journal->as_string(); }
Modified: branches/delayed_entries/bin/upgrading/s2layers/opal/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/opal/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/opal/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -971,11 +971,9 @@
var string time = $e.time->time_format();
var string date = $e.time->date_format();
var string security;
- if ($e.security != "") {
- $security = """<img src="$e.security_icon.url" align="right" """+
- """width="$e.security_icon.width" height="$e.security_icon.height" """+
- """alt="[$e.security]" />""";
- }
+ if ($e.delayed) { $security = $security + " $e.delayed_icon"; }
+ if ($e.sticky) { $security = $security + " $e.sticky_icon"; }
+ if ($e.security) { $security = $security + " $e.security_icon"; }
var UserLite name;
var string pname;
@@ -1661,7 +1659,11 @@
if ($e.poster.username != $e.journal.username) {
$e.poster->print(); " ";
}
- "$e.security_icon";
+
+ if ($e.delayed) { " $e.delayed_icon "; }
+ if ($e.sticky) { " $e.sticky_icon "; }
+ if ($e.security) { " $e.security_icon "; }
+
if ($e.subject != "") {
" <a href=\"$e.permalink_url\">$e.subject</a>";
} else {
Modified: branches/delayed_entries/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/tranquilityii/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/tranquilityii/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -1040,7 +1040,11 @@
var string return;
if ( not $*menu_disable_summary ) {
foreach var Entry e ( $.entries ) {
- $return = $return + "<li>$e.security_icon <a href=\"#entry_$e.itemid\">" + ($e.subject != "" ? "$e.subject" : "$*text_nosubject") + "</a> [<a href=\"$e.permalink_url\">#</a>]</li>";
+ var string posticon = "";
+ if ($e.delayed) { $posticon = $posticon + "$e.delayed_icon "; }
+ if ($e.sticky) { $posticon = $posticon + "$e.sticky_icon "; }
+ if ($e.security) { $posticon = $posticon + "$e.security_icon "; }
+ $return = $return + "<li>$posticon <a href=\"#entry_$e.itemid\">" + ($e.subject != "" ? "$e.subject" : "$*text_nosubject") + "</a> [<a href=\"$e.permalink_url\">#</a>]</li>";
}
}
if ( $return != "" ) {
@@ -1058,7 +1062,11 @@
var string return;
if ( not $*menu_disable_summary ) {
foreach var Entry e ( $.entries ) {
- $return = $return + "<li>$e.security_icon <a href=\"#entry_$e.itemid\">" + ($e.subject != "" ? "$e.subject" : "$*text_nosubject") + "</a> [<a href=\"$e.permalink_url\">#</a>]</li>";
+ var string posticon = "";
+ if ($e.delayed) { $posticon = $posticon + "$e.delayed_icon "; }
+ if ($e.sticky) { $posticon = $posticon + "$e.sticky_icon "; }
+ if ($e.security) { $posticon = $posticon + "$e.security_icon "; }
+ $return = $return + "<li>$posticon <a href=\"#entry_$e.itemid\">" + ($e.subject != "" ? "$e.subject" : "$*text_nosubject") + "</a> [<a href=\"$e.permalink_url\">#</a>]</li>";
}
}
if ( $return != "" ) {
@@ -1148,10 +1156,11 @@
}
print "<h2>";
- if ( $e.security != "" ) {
- $e.security_icon->print();
- print " ";
- }
+
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { "$e.sticky_icon "; }
+ if ($e.security) { "$e.security_icon "; }
+
if ($p.view != "entry") {
if ( $e.subject == "" ) {
print safe "<a href='$e.permalink_url'><i>$*text_nosubject</i></a>";
@@ -1600,7 +1609,11 @@
if ( $e.poster.username != $e.journal.username ) {
$e.poster->print(); " : ";
}
- "$e.security_icon ";
+
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { "$e.sticky_icon "; }
+ if ($e.security) { "$e.security_icon "; }
+
if ( $e.subject == "" ) {
print safe "<a href=\"$e.permalink_url\" title=\"$*text_nosubject\"><i>$*text_nosubject</i></a>";
} else {
Modified: branches/delayed_entries/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/unearthed/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/unearthed/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -958,15 +958,15 @@
{
var Page p = get_page();
var string id = "entry_$e.itemid";
- var string title = "$e.security_icon" + ($e.subject != "" ? " $e.subject" : " $*text_nosubject");
+ var string title = "$e.delayed_icon $e.sticky_icon $e.security_icon" + ($e.subject != "" ? " $e.subject" : " $*text_nosubject");
var string contents = "";
var string sidebar = "";
if ($.view != "entry") {
if ($e.subject->contains("<a ")) {
- $title = "$e.security_icon" + ($e.subject != "" ? "$e.subject" : "$*text_nosubject");
+ $title = "$e.delayed_icon $e.sticky_icon $e.security_icon" + ($e.subject != "" ? "$e.subject" : "$*text_nosubject");
} else {
- $title = "$e.security_icon" + " <a href='$e.permalink_url' class='subj-link'>" + ($e.subject != "" ? "$e.subject" : "$*text_nosubject") + "</a>";
+ $title = "$e.delayed_icon $e.sticky_icon $e.security_icon" + " <a href='$e.permalink_url' class='subj-link'>" + ($e.subject != "" ? "$e.subject" : "$*text_nosubject") + "</a>";
}
}
var string date = $e.time->date_format("med");
@@ -1707,7 +1707,7 @@
if ($e.poster.username != $e.journal.username) {
$subjects = $subjects + $e.poster.username + " ";
}
- $subjects = $subjects + "$e.security_icon";
+ $subjects = $subjects + "$e.delayed_icon $e.sticky_icon $e.security_icon";
if ($e.subject != "") {
$subjects = $subjects + " <a href=\"$e.permalink_url\">$e.subject</a>";
} else {
Modified: branches/delayed_entries/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/voxhtml/layout.s2 2011-09-02 08:55:21 UTC (rev 10953)
+++ branches/delayed_entries/bin/upgrading/s2layers/voxhtml/layout.s2 2011-09-02 08:59:14 UTC (rev 10954)
@@ -1450,9 +1450,11 @@
if (not($e.poster->equals($e.journal))) {
$e.poster->print(); " ";
}
- if($e.security_icon) {
- "$e.security_icon ";
- }
+
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { "$e.sticky_icon "; }
+ if ($e.security) { "$e.security_icon "; }
+
var string subject = $e.subject != "" ? $e->get_plain_subject() : """<i class="nosubject">$*text_nosubject</i>""";
print safe """ <a href="$e.permalink_url">$subject</a>""";
@@ -2228,8 +2230,12 @@
<h2 class="asset-name page-header2">""";
if (defined $en) {
- if (defined $en.security_icon) {
- """<span class="lj-entry-securityicon">$en.security_icon</span> """;
+ if (defined $en.security_icon or $en.sticky or $en.delayed) {
+ """<span class="lj-entry-securityicon">""";
+ if ($en.delayed) { " $en.delayed_icon"; }
+ if ($en.sticky) { " $en.sticky_icon"; }
+ if ($en.security) { " $en.security_icon"; }
+ """</span> """;
}
}