[livejournal] r22139: LJSUP-12150: New Repost feature (S2)

U   trunk/bin/upgrading/s2layers/classic/layout.s2
U   trunk/bin/upgrading/s2layers/core1.s2
U   trunk/bin/upgrading/s2layers/sixhtml/layout.s2

Modified: trunk/bin/upgrading/s2layers/classic/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/classic/layout.s2	2012-05-31 13:25:32 UTC (rev 22138)
+++ trunk/bin/upgrading/s2layers/classic/layout.s2	2012-05-31 13:27:21 UTC (rev 22139)
@@ -579,6 +579,9 @@
       "<td style='background-color: $bgcolor;' class='metabar'>";
       # Time
       "<em>$time</em><br />";
+      if ($e.reposted_by) {
+          """<span>$e.reposted_by</span><br />""";
+      }
       # Altposter crap
       if ($p.view == "friends")
       {
@@ -597,6 +600,7 @@
           print $userpic;
       }
       # Icons
+      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/core1.s2
===================================================================
--- trunk/bin/upgrading/s2layers/core1.s2	2012-05-31 13:25:32 UTC (rev 22138)
+++ trunk/bin/upgrading/s2layers/core1.s2	2012-05-31 13:27:21 UTC (rev 22139)
@@ -2618,6 +2618,7 @@
     ## For most styles, this will be overridden by FriendsPage::print_entry and such.
     """<div class="entry" id="$e.dom_id">\n""";
     "<h3>";
+    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/sixhtml/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2012-05-31 13:25:32 UTC (rev 22138)
+++ trunk/bin/upgrading/s2layers/sixhtml/layout.s2	2012-05-31 13:27:21 UTC (rev 22139)
@@ -885,6 +885,7 @@
     if ($.replyto isa Entry) {
         var Entry en = $.replyto as Entry;
 
+        if ($en.repost) { $security = $security + "$en.repost_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 "; }
@@ -1167,8 +1168,9 @@
       }
 
       "<h3 class='entry-header'>";
-      if (defined $e.security_icon or $e.sticky or $e.delayed) {
+      if (defined $e.security_icon or $e.sticky or $e.delayed or $e.repost) {
           "<span class='lj-entry-securityicon'>";
+          if ($e.repost) { "$e.repost_icon "; }
           if ($e.delayed) { "$e.delayed_icon "; }
           if ($e.sticky) { " $e.sticky_icon "; }
           if ($e.security) { " $e.security_icon"; }
@@ -1192,6 +1194,9 @@
          if ($showdate or $showtime) {
              print lang_posted_date_and_time($e, $e.time, $showdate, $showtime)+" $sep ";
          }
+         if ($e.reposted_by) {
+             """<span>$e.reposted_by</span> $sep """;
+         }
          "<a class='permalink' href='$e.permalink_url'>$*text_permalink</a>";