Committer: sbelyaev
LJSUP-9307: merge branch with trunkU trunk/bin/upgrading/en_LJ.dat U trunk/bin/upgrading/s2layers/3column/layout.s2 U trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2 U trunk/bin/upgrading/s2layers/boxer/layout.s2 U trunk/bin/upgrading/s2layers/component/layout.s2 U trunk/bin/upgrading/s2layers/cuteness/layout.s2 U trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 U trunk/bin/upgrading/s2layers/gradient/layout.s2 U trunk/bin/upgrading/s2layers/nebula/layout.s2 U trunk/bin/upgrading/s2layers/opal/layout.s2 U trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 U trunk/bin/upgrading/s2layers/sup/layout.s2 U trunk/bin/upgrading/s2layers/tranquilityii/layout.s2 U trunk/bin/upgrading/s2layers/unearthed/layout.s2 U trunk/bin/upgrading/s2layers/voxhtml/layout.s2 U trunk/bin/worker/atomstream-inject A trunk/htdocs/img/icon_delayed.png A trunk/htdocs/img/icon_sticky.png
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/en_LJ.dat 2011-09-28 02:12:46 UTC (rev 11043)
@@ -3414,6 +3414,9 @@
ljcom.entryform.box.paidoptions.voicepost2=Voice Posting
+entryform.sticky.edit=Show always on top
+entryform.sticky_replace.edit=Replace sticky post
+
ljcom.extra_privacy_options.vgifts|staleness=1
ljcom.extra_privacy_options.vgifts=Virtual Gifts
@@ -10701,3 +10704,6 @@
talkpostdo.bml.error.your.ip.address.is.detected.as.an.open.proxy=Your IP address ($remote_ip) is detected as an open proxy (a common source of spam) so comment access is denied. If you do not believe you're accessing the net through an open proxy, please contact your ISP or this site's tech support to help resolve the problem.
talkpostdo.bml.error.unknown.journal=Unknown journal. Please go back and try again.
talkpostdo.bml.error.no.database.connection.present=No database connection present. Please go back and try again.
+email.delayed_error.subject=Delayed entry posting failed
+email.delayed_error.body=<p>Delayed entry "[[subject]]" posting failed. <br /> Reason: [[reason]] </p>
+
Modified: trunk/bin/upgrading/s2layers/3column/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/3column/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/3column/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -719,11 +719,21 @@
var string date = $e.time->date_format("long");
# Get the Locked or Private icon, if needed.
var string security;
- if ($e.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]" />""";
+ """alt="[$e.security]" title="[$e.security]" class="i-posticon-flip" />""";
}
+ if ($e.sticky) {
+ $security = $security + """<img src="$e.sticky_icon.url" align="right" """+
+ """width="$e.sticky_icon.width" height="$e.sticky_icon.height" """+
+ """alt="$*text_icon_alt_sticky" title="$*text_icon_alt_sticky" class="i-posticon-flip" />""";
+ }
+ if ($e.delayed) {
+ $security = $security + """<img src="$e.delayed_icon.url" align="right" """+
+ """width="$e.delayed_icon.width" height="$e.delayed_icon.height" """+
+ """alt="$*text_icon_alt_delayed" title="$*text_icon_alt_delayed" class="i-posticon-flip" />""";
+ }
var UserLite name;
var string pname;
@@ -1103,7 +1113,9 @@
if ($e.poster.username != $e.journal.username) {
$e.poster->print(); " ";
}
- "$e.security_icon";
+ if ($e.sticky) {"$e.sticky_icon ";}
+ if ($e.delayed) {"$e.delayed_icon ";}
+ if ($e.security) {"$e.security_icon ";}
if ($e.subject != "") {
" <a href=\"$e.permalink_url\">$e.subject</a>";
} else {
Modified: trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/anovelconundrum/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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: trunk/bin/upgrading/s2layers/boxer/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/boxer/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/boxer/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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: trunk/bin/upgrading/s2layers/component/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/component/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/component/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -2089,7 +2089,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";
"""
@@ -2569,7 +2572,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 {
@@ -2999,7 +3004,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: trunk/bin/upgrading/s2layers/cuteness/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/cuteness/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/cuteness/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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: trunk/bin/upgrading/s2layers/gradient/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/gradient/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/gradient/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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""";
@@ -2087,12 +2086,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: trunk/bin/upgrading/s2layers/nebula/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/nebula/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/nebula/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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: trunk/bin/upgrading/s2layers/opal/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/opal/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/opal/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -1394,11 +1394,11 @@
function EntryPage::lay_get_previous_url():string {
var Link prev = $.entry->get_link("nav_prev");
- if (defined $prev and $.entry.itemid!=int($*layout_guestbook_entryid)) { return $prev.url; } else { return ""; }
+ if (defined $prev and (($.entry.delayed) or ($.entry.itemid!=int($*layout_guestbook_entryid)))) { return $prev.url; } else { return ""; }
}
function EntryPage::lay_get_next_url():string {
var Link next= $.entry->get_link("nav_next");
- if (defined $next and $.entry.itemid!=int($*layout_guestbook_entryid)) { return $next.url; } else { return ""; }
+ if (defined $next and (($.entry.delayed) or ($.entry.itemid!=int($*layout_guestbook_entryid)))) { return $next.url; } else { return ""; }
}
function EntryPage::lay_get_previous_title():string { return "$*text_nav_prev_entrypage"; }
function EntryPage::lay_get_next_title():string { return "$*text_nav_next_entrypage"; }
@@ -1629,7 +1629,7 @@
function Entry::lay_print_subjectline(Color bg, Color fg, bool usecolour) {
var Page p = get_page();
- if ($.itemid!=int($*layout_guestbook_entryid)) {
+ if (($.itemid!=int($*layout_guestbook_entryid) or ($.delayed))) {
"""<div class='entryHeader'""";
if ($usecolour and $*layout_friends_colours=="subject") { print " style='color:$fg;background:$bg;'"; }
"""><span class="entryHeaderDate">""";
@@ -1645,9 +1645,15 @@
}
"""</span><span class="entryHeaderSubject">""";
if ($p.view=="entry") {
- print (defined $.security_icon?" - $.security_icon":"");
+ if ($.delayed) { " - $.delayed_icon"; }
+ if ($.sticky) { " - $.sticky_icon"; }
+ if (defined $.security_icon) { " - $.security_icon"; }
}else{
- print (defined $.security_icon or $.subject!=""?" - ":"")+(defined $.security_icon?"$.security_icon ":"")+$this->formatted_subject({"class"=>"subj-link"});
+ print (defined $.security_icon or $.sticky or $.delayed or $.subject!="" ? " - " : "");
+ if ($.delayed) { "$.delayed_icon "; }
+ if ($.sticky) { "$.sticky_icon "; }
+ if (defined $.security_icon) { "$.security_icon "; }
+ print $this->formatted_subject({"class"=>"subj-link"});
}
"""</span>""";
if ((size $.tags>0)and($*layout_position_entrytags=="subject")) {
@@ -1660,7 +1666,13 @@
"""</div>""";
}else{
"""<div class="entryHeader">""";
- print (defined $.security_icon?""+$.security_icon:" ");
+ if (defined $.security_icon or $.sticky or $.delayed) {
+ if ($.delayed) { "$.delayed_icon "; }
+ if ($.sticky) { " $.sticky_icon "; }
+ if (defined $.security_icon) { " $.security_icon"; }
+ } else {
+ " ";
+ }
"""</div>""";
}
}
@@ -1701,7 +1713,7 @@
}
}
if ($.comments.enabled) {
- if ($.itemid==int($*layout_guestbook_entryid)) {
+ if (($.itemid==int($*layout_guestbook_entryid) and (not $.delayed))) {
print safe """<li><a href="$.comments.post_url#$*text_addcomment_id">$*text_post_comment_guestbook</a></li>""";
print safe """$comments_showspam""";
} else {
@@ -1750,7 +1762,9 @@
}
function Entry::lay_print(Page p, Color bg, Color fg, bool usecolour) {
- if ( $.itemid==int($*layout_guestbook_entryid) and ($p.view=="recent" or $p.view=="day" )) { return; }
+ if (not $.delayed) {
+ if ( $.itemid==int($*layout_guestbook_entryid) and ($p.view=="recent" or $p.view=="day" )) { return; }
+ }
if ( $p.args{"noshow"}==$.journal.username ) { return; }
"""
<a name="$.journal.username$.itemid"></a>
@@ -1930,7 +1944,7 @@
}
function ReplyPage::lay_print_bodytop() {
- if ($.entry.itemid==int($*layout_guestbook_entryid) and $.replyto.depth==0) {
+ if ($.entry.itemid==int($*layout_guestbook_entryid) and (not $.entry.delayed) and $.replyto.depth==0) {
$this->lay_print_bodytitlebox($*text_signing_guestbook,"title");
}elseif ($.replyto.depth==0) {
$this->lay_print_bodytitlebox($*text_comment_to,"title");
@@ -2026,7 +2040,11 @@
}else{
#nothing
}
- if (defined $.security_icon) { """$.security_icon """; }
+
+ if ($.delayed) { "$.delayed_icon "; }
+ if ($.sticky) { "$.sticky_icon "; }
+ if (defined $.security_icon) { "$.security_icon "; }
+
"""<a href="#$.journal.username$.itemid">""";
if ($.subject!="") { print $this->plain_subject(); } else { print safe """<i>$*text_nosubject</i>"""; }
"""</a>""";
@@ -2065,7 +2083,7 @@
if ($i<0) { """</div> <!--sidebox-summary -->"""; return; }
foreach var int pos (0..$i) {
var Entry e = $.entries[$pos];
- if ($e.itemid!=int($*layout_guestbook_entryid)) {$e->lay_print_summaryline($this);}
+ if ($e.itemid!=int($*layout_guestbook_entryid) or ($e.delayed)) {$e->lay_print_summaryline($this);}
}
"""</div> <!--sidebox-summary -->""";
$this->lay_print_sidebox_bottom();
@@ -2092,7 +2110,7 @@
if ($i<0) { """</div> <!--sidebox-summary -->"""; return; }
foreach var int pos (0..$i) {
var Entry e = $.entries[($*layout_day_sortorder=="newest"?$i-$pos:$pos)];
- if ($e.itemid!=int($*layout_guestbook_entryid)) {$e->lay_print_summaryline($this);}
+ if ($e.itemid!=int($*layout_guestbook_entryid) or $e.delayed ) {$e->lay_print_summaryline($this);}
}
"""</div> <!--sidebox-summary -->""";
$this->lay_print_sidebox_bottom();
@@ -2350,7 +2368,7 @@
}else{
$.replyto->lay_print();
}
- if ($.entry.itemid==int($*layout_guestbook_entryid) and $.replyto.depth==0) {
+ if ($.entry.itemid==int($*layout_guestbook_entryid) and (not $.entry.delayed) and $.replyto.depth==0) {
$this->lay_print_bodytitlebox($*text_signing_form,"midtitle",$*text_addcomment_id);
}elseif ($.replyto.depth==0) {
$this->lay_print_bodytitlebox($*text_comment_form,"midtitle",$*text_addcomment_id);
@@ -2360,7 +2378,7 @@
print_ebox($.entry);
"""
<a name="replyform"></a>""";
- if ($.replyto.depth==0 and int($*layout_guestbook_entryid)!=0 and $.entry.itemid!=int($*layout_guestbook_entryid) and $*text_replypage_warning!="") {
+ if ($.replyto.depth==0 and int($*layout_guestbook_entryid)!=0 and (not $.entry.delayed) and $.entry.itemid!=int($*layout_guestbook_entryid) and $*text_replypage_warning!="") {
print safe $*text_replypage_warning;
}
@@ -2375,7 +2393,7 @@
print_ebox($.entry);
if (size $.comments >0) {
- if ($.entry.itemid!=int($*layout_guestbook_entryid)) {
+ if (($.entry.itemid!=int($*layout_guestbook_entryid)) or ($.entry.delayed)) {
$this->lay_print_bodytitlebox($*text_comment_seperator,"midtitle",$*text_comments_id);
}else {
$this->lay_print_bodytitlebox($*text_signature_seperator,"midtitle",$*text_comments_id);
@@ -2392,7 +2410,7 @@
$this->print_multiform_actionline();
$this->print_multiform_end();
}else{
- if ($.entry.itemid!=int($*layout_guestbook_entryid)) {
+ if (($.entry.itemid!=int($*layout_guestbook_entryid)) or ($.entry.delayed)) {
print safe """<b><a href="$.entry.comments.post_url">$*text_post_comment_entrypage</a></b>""";
}else{
print safe """<b><a href="$.entry.comments.post_url">$*text_post_comment_guestbook</a></b>""";
@@ -2404,10 +2422,15 @@
function MonthDay::print_subjectlist() {
foreach var Entry e ($.entries) {
- if ($e.itemid!=int($*layout_guestbook_entryid)) {
+ if (($e.itemid!=int($*layout_guestbook_entryid)) or ($e.delayed)) {
print $e.time->time_format();
if ($e.journal.username!=$e.poster.username) { """ - $e.poster"""; }
- print " - "+(defined $e.security_icon?"$e.security_icon ":"");
+ print " - ";
+
+ if ($e.delayed) { "$e.delayed_icon "; }
+ if ($e.sticky) { " $e.sticky_icon "; }
+ if ($e.security) { " $e.security_icon"; }
+
"""<a href="$e.permalink_url">""";
print ($e.subject==""?"<i>(no subject)</i>":$e->plain_subject());
"""</a>""";
Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -338,7 +338,7 @@
$corners1_2 = "";
$corners1_3 = """<i class="cornerz cornerz-top"><b></b></i>""";
}
- var string _entry_title = "$e.security_icon" +
+ var string _entry_title = "$e.delayed_icon" + "$e.sticky_icon" + "$e.security_icon" +
($p.view=="entry" or $p.view=="reply"
? ($e.subject == "" ? $*text_nosubject : $e.subject) + """<a href="$e.permalink_url" rel="bookmark" style="display:none;"></a>"""
: ($e.subject == "" ? ("""<a href="$e.permalink_url" class="subj-link" rel="bookmark">$*text_nosubject</a>""") : $e -> formatted_subject({"class"=>"subj-link","rel"=>"bookmark"})) + "$corners1_2");
@@ -1159,7 +1159,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 {
Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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>";
@@ -1598,7 +1607,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: trunk/bin/upgrading/s2layers/unearthed/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/unearthed/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/unearthed/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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");
@@ -1706,7 +1706,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: trunk/bin/upgrading/s2layers/voxhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/voxhtml/layout.s2 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2 2011-09-28 02:12:46 UTC (rev 11043)
@@ -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> """;
}
}
Modified: trunk/bin/worker/atomstream-inject
===================================================================
--- trunk/bin/worker/atomstream-inject 2011-09-27 10:42:00 UTC (rev 11042)
+++ trunk/bin/worker/atomstream-inject 2011-09-28 02:12:46 UTC (rev 11043)
@@ -36,6 +36,11 @@
my $ju = LJ::load_userid($jid)
or die "No user able to be loaded\n";
my $entry = LJ::Entry->new($ju, jitemid => $jitemid);
+
+ if ( $entry->is_sticky() ) {
+ $job->completed;
+ return;
+ }
unless ($entry->valid && $entry->security eq "public") {
$job->completed;
Copied: trunk/htdocs/img/icon_delayed.png (from rev 11033, branches/delayed_entries/htdocs/img/icon_delayed.png)
===================================================================
(Binary files differ)
Copied: trunk/htdocs/img/icon_sticky.png (from rev 11033, branches/delayed_entries/htdocs/img/icon_sticky.png)
===================================================================
(Binary files differ)
