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

U   trunk/bin/upgrading/s2layers/core1.s2
U   trunk/bin/upgrading/s2layers/generator/layout.s2
U   trunk/htdocs/stc/lj_base.css

Modified: trunk/bin/upgrading/s2layers/core1.s2
===================================================================
--- trunk/bin/upgrading/s2layers/core1.s2	2012-05-30 14:25:17 UTC (rev 22121)
+++ trunk/bin/upgrading/s2layers/core1.s2	2012-05-30 15:27:44 UTC (rev 22122)
@@ -2959,6 +2959,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/generator/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/generator/layout.s2	2012-05-30 14:25:17 UTC (rev 22121)
+++ trunk/bin/upgrading/s2layers/generator/layout.s2	2012-05-30 15:27:44 UTC (rev 22122)
@@ -435,7 +435,12 @@
 color: $*stronger_text;
 }
 
-.caption A, .caption A:hover, .caption A:visited {
+.caption A,
+.caption A:hover,
+.caption A:visited,
+.index A,
+.index A:hover,
+.index A:visited {
         color: $*stronger_text;
         text-decoration: none;
 }
@@ -805,6 +810,7 @@
 <tr align='left'>
 <td class="caption">""";
 
+    if ($e.repost) { "$e.repost_icon "; }
     if ($e.delayed) { "$e.delayed_icon "; }
     if ($e.sticky) { "$e.sticky_icon "; }
     if ($e.security) { "$e.security_icon "; }
@@ -813,7 +819,12 @@
                 print $e->formatted_subject({"class"=>"subj-link"});
     } else { print safe "$e.subject"; }
 """</td>
-<td align="right" class="index">[$datetime]</td>
+<td align="right" class="index">[$datetime]""";
+if ($e.reposted_by) {
+    """ [$e.reposted_by]""";
+}
+"""
+</td>
 </tr>
 <tr align='left'>
 <td colspan="2" bgcolor="$*entry_back">

Modified: trunk/htdocs/stc/lj_base.css
===================================================================
--- trunk/htdocs/stc/lj_base.css	2012-05-30 14:25:17 UTC (rev 22121)
+++ trunk/htdocs/stc/lj_base.css	2012-05-30 15:27:44 UTC (rev 22122)
@@ -4856,14 +4856,27 @@
 
 /* LJ User
 --------------------------------------*/
-.i-ljuser {
-	position: static;
-	display: inline;
-	white-space: nowrap;
+HTML BODY .i-ljuser {
+	position: static !important;
+	display: inline !important;
+	width: auto !important;
+	height: auto !important;
+	margin: 0 !important;
+	padding: 0 !important;
+	border: 0 !important;
+	white-space: nowrap !important;
+	background: transparent !important;
 	}
 .i-ljuser-deleted {
 	text-decoration: line-through;
 	}
+	HTML BODY .i-ljuser A {
+		width: auto !important;
+		height: auto !important;
+		margin: 0 !important;
+		padding: 0 !important;
+		border: 0 !important;
+		}
 	HTML BODY .i-ljuser-userhead {
 		width: 16px !important;
 		height: 16px !important;