Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[livejournal] r19948: LJSUP-9307: Delayed entries and sticky p...

Committer: esavintcev
LJSUP-9307: Delayed entries and sticky posts
U   branches/delayed_entries/bin/upgrading/s2layers/classic/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/cleansimple/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/core1.s2
U   branches/delayed_entries/bin/upgrading/s2layers/deardiary/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/digitalmultiplex/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/disjointed/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/generator/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/haven/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/i18nc/ru1.s2
U   branches/delayed_entries/bin/upgrading/s2layers/lickable/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/magazine/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/notepad/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/punquin/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/refriedpaper/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/sixhtml/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/sturdygesture/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/tabularindent/layout.s2
U   branches/delayed_entries/bin/upgrading/s2layers/variableflow/layout.s2
Modified: branches/delayed_entries/bin/upgrading/s2layers/classic/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/classic/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/classic/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -605,8 +605,10 @@
       {
           print $userpic;
       }
-      # Security icon
-      if ($e.security) { print $e.security_icon; }
+      # Icons
+      if ($e.delayed) { "$e.delayed_icon "; }
+      if ($e.sticky) { "$e.sticky_icon "; }
+      if ($e.security) { "$e.security_icon"; }
       # Permalink
       "<p>[<a href='$e.permalink_url'>$*text_permalink</a>]</p>";
       "</td>";

Modified: branches/delayed_entries/bin/upgrading/s2layers/cleansimple/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/cleansimple/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/cleansimple/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -808,9 +808,10 @@
     }
     "<span class=\"timestamp\">"+$e.time->time_format($*time_format)+"</span>: ";
 
-    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.subject) {
         " <span class=\"subject\"> ";
           if ($p.view != "entry") {

Modified: branches/delayed_entries/bin/upgrading/s2layers/core1.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/core1.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/core1.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -349,6 +349,8 @@
 "A journal entry"
 {
     var readonly string security "The security level of the entry ('private', 'protected'), or blank if public.";
+    var readonly bool sticky "Indicates that this entry is sticky";
+    var readonly bool delayed "Indicates that this entry is delayed";
     var Image security_icon "A little icon which should be displayed somewhere on an entry to represent the security setting";
     var Image sticky_icon "A little icon which should be displyaed somewhere on an entry to represent the sticky setting";
     var Image delayed_icon "A little icon which should be displyaed somewhere on an entry to represent the delayed entry";
@@ -1838,9 +1840,19 @@
     des = "Alternative text for icons of custom friends group entries";
     noui = 1;
 }
+property string text_icon_alt_sticky {
+    des = "Alternative text for icons of sticky entries";
+    noui = 1;
+}
+property string text_icon_alt_delayed {
+    des = "Alternative text for icons of delayed entries";
+    noui = 1;
+}
 set text_icon_alt_protected = "[protected post]";
 set text_icon_alt_private = "[private post]";
 set text_icon_alt_groups = "[custom friends groups post]";
+set text_icon_alt_sticky = "[sticky post]";
+set text_icon_alt_delayed = "[delayed post]";
 
 property string comment_form_text_hint {
     des = "Text hint for comment message";
@@ -2262,7 +2274,7 @@
 
     $extraParams = $extraParams + $attributes;
 
-    return "<img src=\"$.url\" title=\"\" alt=\"" + ehtml($alttext) + "\"" +
+    return "<img src=\"$.url\" alt=\"" + ehtml($alttext) + "\" " +
         $extraParams + " />";
 }
 
@@ -2523,7 +2535,12 @@
 function Page::print_entry(Entry e) {
     ## For most styles, this will be overridden by FriendsPage::print_entry and such.
     """<div class="entry" id="$e.dom_id">\n""";
-    "<h3>#e.delayed_icon $e.sticky_icon $e.security_icon $e.subject</h3>\n";
+    "<h3>";
+    if ($e.delayed) {"$e.delayed_icon ";}
+    if ($e.sticky) {"$e.sticky_icon ";}
+    if ($e.security) {"$e.security_icon ";}
+    "$e.subject";
+    "</h3>\n";
     if ($.view == "friends" or $e.poster.username != $e.journal.username) {
         "<div>"; $this->print_entry_poster($e); "</div>";
     }
@@ -2860,7 +2877,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: branches/delayed_entries/bin/upgrading/s2layers/deardiary/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/deardiary/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/deardiary/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -782,9 +782,11 @@
 }
 
 function Entry::lay_print_icon() {
-    if ($.security != "") {
+    if ($.security != "" or $.delayed or $.sticky) {
         """<div class="entryicon">""";
-        print $.security_icon->as_string("[$.security]");
+        if ($.delayed) { "$.delayed_icon "; }
+        if ($.sticky) { "$.sticky_icon "; }
+        if ($.security) { "$.security_icon"; }
         "</div>";
     }
 }

Modified: branches/delayed_entries/bin/upgrading/s2layers/digitalmultiplex/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/digitalmultiplex/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/digitalmultiplex/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -606,9 +606,11 @@
     var string time = $p.view != "day" ? $e.time->date_format("med") + " @ " : "";
     $time = $time + $e.time->time_format();
     var string subject = $e.subject;
-    if ($e.security) {
-        $subject = "$e.security_icon $subject";
-    }
+
+    if ($e.delayed) { $subject = "$e.delayed_icon $subject"; }
+    if ($e.sticky) { $subject = "$e.sticky_icon $subject"; }
+    if ($e.security) { $subject = "$e.security_icon $subject"; }
+
     if ($subject) {
        if ($p.view != "entry" and not $subject->contains("<a ")) {
           $subject = """<span class="subject"><a href="$e.permalink_url" class="subj-link">$subject</a></span>""";
@@ -1107,10 +1109,15 @@
     var string return;
     if (not $*sidebar_disable_recent_summary) {
         foreach var Entry e ($.entries) {
+            var string posticons = "";
+            if ($e.delayed) { $posticons = $posticons + " $e.delayed_icon"; }
+            if ($e.sticky) { $posticons = $posticons + " $e.sticky_icon"; }
+            if ($e.security) { $posticons = $posticons + " $e.security_icon"; }
+            
             if ($e.subject != "") {
-                $return = $return + """<tr><td>$*text_sidebar_link_separator [<a href="#entry_$e.itemid">#</a>] <a href="$e.permalink_url">$e.subject</a> $e.security_icon</td></tr>""";
+                $return = $return + """<tr><td>$*text_sidebar_link_separator [<a href="#entry_$e.itemid">#</a>] <a href="$e.permalink_url">$e.subject</a> $posticons</td></tr>""";
             } else {
-                $return = $return + """<tr><td>$*text_sidebar_link_separator [<a href="#entry_$e.itemid">#</a>] <a href="$e.permalink_url"><em>$*text_nosubject</em></a> $e.security_icon</td></tr>""";
+                $return = $return + """<tr><td>$*text_sidebar_link_separator [<a href="#entry_$e.itemid">#</a>] <a href="$e.permalink_url"><em>$*text_nosubject</em></a> $posticons</td></tr>""";
             }
         }
     }
@@ -1564,10 +1571,15 @@
     var string return;
     if ($.has_entries) {
         foreach var Entry e ($.entries) {
+            var string posticons = "";
+            if ($e.delayed) { $posticons = $posticons + " $e.delayed_icon"; }
+            if ($e.sticky) { $posticons = $posticons + " $e.sticky_icon"; }
+            if ($e.security) { $posticons = $posticons + " $e.security_icon"; }
+
             if ($e.subject != "") {
-                $return = $return + """<tr><td>$*text_sidebar_link_separator [<a href="#entry_$e.itemid">#</a>] <a href="$e.permalink_url">$e.subject</a> $e.security_icon</td></tr>""";
+                $return = $return + """<tr><td>$*text_sidebar_link_separator [<a href="#entry_$e.itemid">#</a>] <a href="$e.permalink_url">$e.subject</a> $posticons</td></tr>""";
             } else {
-                $return = $return + """<tr><td>$*text_sidebar_link_separator [<a href="#entry_$e.itemid">#</a>] <a href="$e.permalink_url"><em>$*text_nosubject</em></a> $e.security_icon </td></tr>""";
+                $return = $return + """<tr><td>$*text_sidebar_link_separator [<a href="#entry_$e.itemid">#</a>] <a href="$e.permalink_url"><em>$*text_nosubject</em></a> $posticons </td></tr>""";
             }
         }
     }

Modified: branches/delayed_entries/bin/upgrading/s2layers/disjointed/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/disjointed/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/disjointed/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -907,9 +907,11 @@
   }
   if($this isa Entry) {
     var Entry en = $this as Entry;
-    if(defined $en.security_icon) {
-      $icon = $en.security_icon + " ";
-    }
+
+    if ($en.delayed) { "$en.delayed_icon "; }
+    if ($en.sticky) { "$en.sticky_icon "; }
+    if ($en.security) { "$en.security_icon "; }
+
   }
   return $icon;
 }
@@ -1712,7 +1714,11 @@
         if (not $e.poster->equals($e.journal)) {
           $dissed = $dissed + $e.poster + " ";
         }
-        $dissed = $dissed + "$e.security_icon";
+
+        if ($e.delayed) { $dissed = $dissed + "$e.delayed_icon "; }
+        if ($e.sticky) { $dissed = $dissed + "$e.sticky_icon "; }
+        if ($e.security) { $dissed = $dissed + "$e.security_icon"; }
+
         if ($e.subject != "") {
           $dissed = $dissed + " <a href=\"$e.permalink_url\">" + $e->plain_subject() + "</a>";
         } else {

Modified: branches/delayed_entries/bin/upgrading/s2layers/generator/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/generator/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/generator/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -809,9 +809,9 @@
 <tr align='left'>
 <td class="caption">""";
 
-    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/haven/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/haven/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/haven/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -1065,11 +1065,13 @@
 {
     var string replyto = "";
 
-    var Image security;
+    var string security;
     if ($el isa Entry) {
         var Entry en = $el as Entry;
-
-        $security = $en.security_icon;
+        
+        if ($en.delayed) {  $security = $security + "$en.delayed_icon "; }
+        if ($en.sticky) { $security = $security + " $en.sticky_icon "; }
+        if ($en.security) { $security = $security + " $en.security_icon"; }
     }
 
     # Named anchor to link from page summary
@@ -1129,7 +1131,12 @@
     println """<div class="entry">""";
     var string subject = $e.subject != "" ? $e.subject : $*text_nosubject;
     var string time    = $e.time->time_format();
-    println """<h4 class="subject">$e.security_icon """;
+    println """<h4 class="subject">""";
+
+    if ($e.delayed) { "$e.delayed_icon "; }
+    if ($e.sticky) { "$e.sticky_icon "; }
+    if ($e.security) { "$e.security_icon "; }
+
     if ($p.view != "entry" and not $subject->contains("<a ")) {
         print "<a href='$e.permalink_url' class='subj-link'>$subject</a>";
     } else { print "$subject"; }
@@ -1368,7 +1375,11 @@
     foreach var Entry e ($.entries) {
         var string subject = $e.subject != "" ? $e.subject : $*text_nosubject;
         $return = $return + "&rarr;";
-        if ($e.security) { $return = $return + " $e.security_icon"; }
+
+        if ($e.delayed) { $return = $return + " $e.delayed_icon "; }
+        if ($e.sticky) { $return = $return + " $e.sticky_icon "; }
+        if ($e.security) { $return = $return + " $e.security_icon "; }
+
         $return = $e.poster.username != $.journal.username ?
                   $return + """ $e.poster:<br /><a href="#entry_$e.itemid">$subject</a><br />""" :
                   $return + """ <a href="#entry_$e.itemid">$subject</a><br />""";
@@ -1403,7 +1414,11 @@
         var string poster = $e.poster.username != $e.journal.username ? $e.poster->as_string() + ", posting in " + $e.journal->as_string() : $e.journal->as_string();
         var string subject = $e.subject != "" ? $e.subject : $*text_nosubject;
         $return = $return + "&rarr;";
-        if ($e.security) { $return = $return + " $e.security_icon"; }
+
+        if ($e.delayed) { $return = $return + " $e.delayed_icon "; }
+        if ($e.sticky) { $return = $return + " $e.sticky_icon "; }
+        if ($e.security) { $return = $return + " $e.security_icon "; }
+
         $return = $return + """ $poster:<br /><a href="#entry_$e.itemid">$subject</a><br />""";
     }
     return $return;

Modified: branches/delayed_entries/bin/upgrading/s2layers/i18nc/ru1.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/i18nc/ru1.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/i18nc/ru1.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -114,8 +114,10 @@
 set text_reply_nocomments = "Для этой записи комментарии отключены.";
 set text_website_default_name = "Мой сайт";
 set text_poster_anonymous = "(Анонимно)";
-set text_icon_alt_protected = "[защищённая запись]";
-set text_icon_alt_private = "[личная запись]";
+set text_icon_alt_protected = "Защищённая запись";
+set text_icon_alt_private = "Личная запись";
+set text_icon_alt_sticky = "Верхняя запись";
+set text_icon_alt_delayed = "Отложенная запись";
 set text_copyr_agree = "Разрешаю воспроизводить в любой форме";
 set text_copyr_disagree = "Запрещаю воспроизводить в какой-либо форме";
 set text_share_this = "Поделиться";

Modified: branches/delayed_entries/bin/upgrading/s2layers/lickable/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/lickable/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/lickable/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -1055,9 +1055,11 @@
 }
 
 function Entry::lay_print_icon() {
-    if ($.security != "") {
+    if ($.security != "" or $.sticky or $.delayed) {
         """<div class="entryicon">""";
-        print $.security_icon->as_string("[$.security]");
+        if ($.delayed) { "$.delayed_icon "; }
+        if ($.sticky) { " $.sticky_icon "; }
+        if ($.security) { " $.security_icon"; }
         "</div>";
     }
 }

Modified: branches/delayed_entries/bin/upgrading/s2layers/magazine/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/magazine/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/magazine/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -592,8 +592,14 @@
      if ($p.view != "entry" and not $subject->contains("<a ")) {
        """<a href="$e.permalink_url" class="subj-link">$subject</a>""";}
      else { "$subject"; }
-    "</span> $e.security_icon</h3>";
+    "</span>";
 
+    if ($e.delayed) { " $e.delayed_icon"; }
+    if ($e.sticky) { " $e.sticky_icon"; }
+    if ($e.security) { " $e.security_icon"; }
+
+    "</h3>";
+
     if ($p.view == "entry" and $*show_entrynav_icons)
     {
         print "<div style='text-align: center'>";

Modified: branches/delayed_entries/bin/upgrading/s2layers/notepad/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/notepad/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/notepad/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -513,8 +513,13 @@
            " ";print $e->formatted_subject({"class"=>"subj-link subjlink"});
         } else { " <span style='color: $*subject_color'>$e.subject</span>";} 
     }
-    " $e.security_icon</font>";
 
+    if ($e.delayed) { " $e.delayed_icon"; }
+    if ($e.sticky) { " $e.sticky_icon"; }
+    if ($e.security) { " $e.security_icon"; }
+
+    "</font>";
+
     if (not $hide_text)
     {
         print "<p>";

Modified: branches/delayed_entries/bin/upgrading/s2layers/punquin/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/punquin/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/punquin/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -565,9 +565,10 @@
        } else { "<span style='color: $*subject_color'>$e.subject</span>"; } 
     }
 
-    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"; }
+
     "</strong><br />";
     if (not $hide_text) {
         $e->print_text(); "<br />";

Modified: branches/delayed_entries/bin/upgrading/s2layers/refriedpaper/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/refriedpaper/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/refriedpaper/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -590,12 +590,6 @@
       $icon = $c.subject_icon + " ";
     }
   }
-  if($this isa Entry) {
-    var Entry en = $this as Entry;
-    if(defined $en.security_icon) {
-      $icon = $en.security_icon + " ";
-    }
-  }
   return $icon;
 }
 
@@ -1200,7 +1194,15 @@
 
   if ($e isa Entry) {
     var Entry en = $e as Entry;
-    $security = $en.security != "" ? $en.security->upperfirst() : "Public";
+
+    if ($en.security != "" or $en.sticky or $en.delayed) {
+        if ($en.delayed) { $security = $security + "$en.delayed_icon "; }
+        if ($en.sticky) { $security = $security + "$en.sticky_icon "; }
+        if ($en.security) { $security = $security + "$en.security_icon "; }
+    } else {
+        $security = "Public";
+    }
+
   }
   if ($e isa Comment) {
     var Comment c = $e as Comment;

Modified: branches/delayed_entries/bin/upgrading/s2layers/sixhtml/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/sixhtml/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/sixhtml/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -886,11 +886,13 @@
         return;
     }
 
-    var Image security;
+    var string security = "";
     if ($.replyto isa Entry) {
         var Entry en = $.replyto as Entry;
 
-        $security = $en.security_icon;
+        if ($en.delayed) { $security = $security + "$en.delayed_icon "; }
+        if ($en.sticky) { $security = $security + "$en.sticky_icon "; }
+        if ($en.security) { $security = $security + "$en.security_icon "; }
     }
 
     "<table><tr valign='middle'>";
@@ -1181,8 +1183,12 @@
       }
 
       "<h3 class='entry-header'>";
-      if (defined $e.security_icon) {
-          print "<span class='lj-entry-securityicon'>$e.security_icon</span> ";
+      if (defined $e.security_icon or $e.sticky or $e.delayed) {
+          "<span class='lj-entry-securityicon'>";
+          if ($e.delayed) { "$e.delayed_icon "; }
+          if ($e.sticky) { " $e.sticky_icon "; }
+          if ($e.security) { " $e.security_icon"; }
+          "</span> ";
       }
       if ($.view != "entry") {
         print $e->formatted_subject({"class"=>"subj-link"});

Modified: branches/delayed_entries/bin/upgrading/s2layers/sturdygesture/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/sturdygesture/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -590,11 +590,9 @@
 
     """<div class="box"><h2 style="color: $fgcolor; background: $bgcolor;">$datetime """;
 
-    if ($e.security != "") {
-        print """<img src="$e.security_icon.url" align="right" """+
-              """width="$e.security_icon.width" height="$e.security_icon.height" """+
-              """alt="[$e.security]" />""";
-    }
+    if ($e.delayed) { " $e.delayed_icon "; }
+    if ($e.sticky) { " $e.sticky_icon "; }
+    if ($e.security) { " $e.security_icon "; }
 
     if ($p.view == "friends" or
         $e.subject != "" or

Modified: branches/delayed_entries/bin/upgrading/s2layers/tabularindent/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/tabularindent/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/tabularindent/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -715,9 +715,13 @@
         $metapic = "$metapic</div>";
     }
     # Security Icon
-    if ($e.security) {
-        $meta{"Security:"} = "$e.security_icon $e.security";
-    }
+    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 "; }
+    $meta{"Security:"} = "$posticon";
+    
     # Subject
     if ($e.subject) {
       if ($p.view != "entry") {

Modified: branches/delayed_entries/bin/upgrading/s2layers/variableflow/layout.s2
===================================================================
--- branches/delayed_entries/bin/upgrading/s2layers/variableflow/layout.s2	2011-09-02 08:56:35 UTC (rev 19947)
+++ branches/delayed_entries/bin/upgrading/s2layers/variableflow/layout.s2	2011-09-02 08:58:14 UTC (rev 19948)
@@ -659,9 +659,13 @@
     elseif ($altposter) {
         " - " + $e.poster->as_string();
     }
-    if ($e.security != "") {
-        " - " + $e.security_icon->as_string();
+    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"; }
+
     if ($e.subject != "") {
         " - ";
         if ($.view != "entry") {

Tags: livejournal, s2, savintsev_egor
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