madeon (madeon) wrote in changelog,
madeon
madeon
changelog

[ljcom] r10780: LJSUP-9307: sticky entries prototype.

Committer: sbelyaev
LJSUP-9307: sticky entries prototype.
U   branches/delayed_entries/bin/upgrading/en_LJ.dat
U   branches/delayed_entries/bin/upgrading/s2layers/sup/layout.s2
U   branches/delayed_entries/bin/worker/atomstream-inject
Modified: branches/delayed_entries/bin/upgrading/en_LJ.dat
===================================================================
--- branches/delayed_entries/bin/upgrading/en_LJ.dat	2011-07-26 12:22:11 UTC (rev 10779)
+++ branches/delayed_entries/bin/upgrading/en_LJ.dat	2011-07-27 03:26:34 UTC (rev 10780)
@@ -3396,6 +3396,8 @@
 
 ljcom.entryform.box.paidoptions.voicepost2=Voice Posting
 
+entryform.sticky.edit=Show always on top
+
 ljcom.extra_privacy_options.vgifts|staleness=1
 ljcom.extra_privacy_options.vgifts=Virtual Gifts
 

Modified: branches/delayed_entries/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/sup/layout.s2	2011-07-26 12:22:11 UTC (rev 10779)
+++ branches/delayed_entries/bin/upgrading/s2layers/sup/layout.s2	2011-07-27 03:26:34 UTC (rev 10780)
@@ -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.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");
@@ -1148,6 +1148,7 @@
         if ($e.poster.username != $e.journal.username) {
             $e.poster->print(); " ";
         }
+        "$e.sticky_icon";
         "$e.security_icon";
         if ($e.subject != "") {
             " <a href=\"$e.permalink_url\">$e.subject</a>";

Modified: branches/delayed_entries/bin/worker/atomstream-inject
===================================================================
--- branches/delayed_entries/bin/worker/atomstream-inject	2011-07-26 12:22:11 UTC (rev 10779)
+++ branches/delayed_entries/bin/worker/atomstream-inject	2011-07-27 03:26:34 UTC (rev 10780)
@@ -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;

Tags: dat, ljcom, madeon, s2
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments