madeon (madeon) wrote in changelog,
madeon
madeon
changelog

[ljcom] r12027: LJSUP-12384: Add "repost" icon for post ...

Committer: sbelyaev
LJSUP-12384: Add "repost" icon for post title
U   trunk/bin/upgrading/s2layers/sup/layout.s2
U   trunk/bin/upgrading/s2layers/sup/themes.s2
Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2012-05-29 15:22:28 UTC (rev 12026)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2012-05-30 08:22:29 UTC (rev 12027)
@@ -366,7 +366,7 @@
         $corners1_2 = "";
         $corners1_3 = """<i class="cornerz cornerz-top"><b></b></i>""";
     }
-    var string _entry_title = "$e.delayed_icon" + "$e.sticky_icon" + "$e.security_icon" + 
+    var string _entry_title = "$e.repost_icon" +"$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");
@@ -407,9 +407,6 @@
                             """
                             <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="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr></dd>""";
-                            if ($e.reposted_by) {
-                                """<dd class="entry-repost">$e.reposted_by</dd>""";
-                            }
                             """
                         </dl>
 """;
@@ -1226,6 +1223,7 @@
         if ($e.poster.username != $e.journal.username) {
             $e.poster->print(); " ";
         }
+        if ($e.repost) {" e.repost_icon"; }
         if ($e.delayed) {" $e.delayed_icon";}
         if ($e.sticky) {" $e.sticky_icon";}
         if ($e.security) {" $e.security_icon";}

Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2012-05-29 15:22:28 UTC (rev 12026)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2012-05-30 08:22:29 UTC (rev 12027)
@@ -392,7 +392,7 @@
     var string entrydate = _dateTime($e.time);
     var string isodate = $e.time->date_format("%%yyyy%%-%%mm%%-%%dd%%T%%HH%%:%%min%%:%%sec%%+03:00");
     var string extraclasses = "";
-    var string _entry_title = "$e.delayed_icon" + "$e.sticky_icon" + "$e.security_icon" +
+    var string _entry_title = "$e.repost_icon" + "$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"})));
@@ -417,9 +417,6 @@
                             <dt>"""; if ($e.userpic) { $e.userpic->print(); } """</dt>
                             <dd class="username">"""; print _user_print($e.poster,"inside"); if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ " $*text_user_posts_in "; print _user_print($e.journal,"simple");} """</dd>
                             <dd class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr></dd>""";
-                            if ($e.reposted_by) {
-                                """<dd class="entry-repost">$e.reposted_by</dd>""";
-                            }
                             """
                         </dl>
                         <div class="entry-content">"""; $e->print_metadata(); $e->print_text();"""</div>
@@ -2158,7 +2155,7 @@
     var string corners2 = "";
     
 
-    var string _entry_title = "$e.delayed_icon" + "$e.sticky_icon" + "$e.security_icon" + 
+    var string _entry_title = "$e.repost_icon" + "$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");
@@ -2179,9 +2176,6 @@
                 """
                 <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>""";
-                if ($e.reposted_by) {
-                    """<dd class="entry-repost">$e.reposted_by</dd>""";
-                }
                 """
             </dl>
             """;
@@ -2309,7 +2303,7 @@
     var string corners2 = "";
     
 
-    var string _entry_title = "$e.delayed_icon" + "$e.sticky_icon" + "$e.security_icon" + 
+    var string _entry_title = "$e.repost_icon" + "$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");
@@ -2330,9 +2324,6 @@
                 """
                 <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>""";
-                if ($e.reposted_by) {
-                    """<dd class="entry-repost">$e.reposted_by</dd>""";
-                }
                 """
             </dl>
             """;
@@ -2578,7 +2569,7 @@
     var string corners2 = "";
     
 
-    var string _entry_title = "$e.delayed_icon" + "$e.sticky_icon" + "$e.security_icon" + 
+    var string _entry_title = "$e.repost_icon" + "$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");
@@ -2599,9 +2590,6 @@
                 """
                 <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>""";
-                if ($e.reposted_by) {
-                    """<dd class="entry-repost">$e.reposted_by</dd>""";
-                }
                 """
             </dl>
             """;
@@ -2863,7 +2851,7 @@
     var string corners2 = "";
     
 
-    var string _entry_title = "$e.delayed_icon" + "$e.sticky_icon" + "$e.security_icon" + 
+    var string _entry_title = "$e.repost_icon" + "$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");
@@ -2884,9 +2872,6 @@
                 """
                 <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>""";
-                if ($e.reposted_by) {
-                    """<dd class="entry-repost">$e.reposted_by</dd>""";
-                }
                 """
             </dl>
             """;

Tags: ljcom, madeon, s2, sbelyaev
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