[livejournal] r22335: LJSV-2292: Reposter's name don't shown i...

U   trunk/bin/upgrading/s2layers/magazine/layout.s2
U   trunk/bin/upgrading/s2layers/notepad/layout.s2
U   trunk/bin/upgrading/s2layers/refriedpaper/layout.s2
U   trunk/bin/upgrading/s2layers/tabularindent/layout.s2

Modified: trunk/bin/upgrading/s2layers/magazine/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/magazine/layout.s2	2012-06-27 07:33:23 UTC (rev 22334)
+++ trunk/bin/upgrading/s2layers/magazine/layout.s2	2012-06-27 09:12:30 UTC (rev 22335)
@@ -589,10 +589,14 @@
      else { "$subject"; }
     "</span>";
 
+    if ($e.repost) { " $e.repost_icon"; }
     if ($e.delayed) { " $e.delayed_icon"; }
     if ($e.sticky) { " $e.sticky_icon"; }
     if ($e.security) { " $e.security_icon"; }
 
+    if ($e.reposted_by) {
+        """ $e.reposted_by""";
+    }
     "</h3>";
 
     if ($p.view == "entry" and $*show_entrynav_icons)

Modified: trunk/bin/upgrading/s2layers/notepad/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/notepad/layout.s2	2012-06-27 07:33:23 UTC (rev 22334)
+++ trunk/bin/upgrading/s2layers/notepad/layout.s2	2012-06-27 09:12:30 UTC (rev 22335)
@@ -506,10 +506,15 @@
         } else { " <span style='color: $*subject_color'>$e.subject</span>";} 
     }
 
+    if ($e.repost) { " $e.repost_icon"; }
     if ($e.delayed) { " $e.delayed_icon"; }
     if ($e.sticky) { " $e.sticky_icon"; }
     if ($e.security) { " $e.security_icon"; }
 
+    if ($e.reposted_by) {
+        """ $e.reposted_by""";
+    }
+
     "</font>";
 
     if (not $hide_text)

Modified: trunk/bin/upgrading/s2layers/refriedpaper/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/refriedpaper/layout.s2	2012-06-27 07:33:23 UTC (rev 22334)
+++ trunk/bin/upgrading/s2layers/refriedpaper/layout.s2	2012-06-27 09:12:30 UTC (rev 22335)
@@ -258,6 +258,9 @@
   property string text_security {
     des = "Text for security label on entries";
   }
+  property string text_repost {
+    des = "Text for repost label on entries";
+  }
   property use text_post_comment;
   property use text_read_comments;
   property use text_post_comment_friends;
@@ -322,6 +325,7 @@
   set text_date                  = "Date:";
   set text_subject               = "Subject:";
   set text_security              = "Security:";
+  set text_repost                = "Repost:";
   set text_post_comment          = "Post A Comment";
   set text_read_comments         = "# Comment // # Comments";
   set text_post_comment_friends  = "Post A Comment";
@@ -1195,6 +1199,7 @@
   var string icon       = $e->lay_make_icon();
   var string subject    = $e.subject != "" ? $e.subject : """<i class="nosubject">$*text_nosubject</i>""";
   var string security   = "";
+  var string repost     = "";
   var string screenedbg = "";
   var string screenedfg = "";
   
@@ -1206,7 +1211,8 @@
   if ($e isa Entry) {
     var Entry en = $e as Entry;
 
-    if ($en.security != "" or $en.sticky or $en.delayed) {
+    if ($en.security != "" or $en.sticky or $en.delayed or $en.repost) {
+        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 "; }
@@ -1214,6 +1220,10 @@
         $security = "Public";
     }
 
+    if ($en.reposted_by) {
+        $repost = """$e.reposted_by""";
+    }
+
   }
   if ($e isa Comment) {
     var Comment c = $e as Comment;
@@ -1265,6 +1275,14 @@
     </tr>
     """;
   }
+  if($repost != "") {
+    """
+    <tr>
+      <td class="dateheader"$screenedfg>$*text_repost</td>
+      <td class="datecontent"$screenedfg>$repost</td>
+    </tr>
+    """;
+  }
   $e->lay_print_metadata();
 
   if($userpic != "") {

Modified: trunk/bin/upgrading/s2layers/tabularindent/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2012-06-27 07:33:23 UTC (rev 22334)
+++ trunk/bin/upgrading/s2layers/tabularindent/layout.s2	2012-06-27 09:12:30 UTC (rev 22335)
@@ -717,6 +717,7 @@
     # Security Icon
     var string posticon = "";
 
+    if ($e.repost) { $posticon = $posticon + "$e.repost_icon "; }
     if ($e.delayed) { $posticon = $posticon + "$e.delayed_icon "; }
     if ($e.sticky) { $posticon = $posticon + "$e.sticky_icon "; }
     if ($e.security) { $posticon = $posticon + "$e.security_icon "; }
@@ -751,6 +752,12 @@
             $meta{"$key:"} = $val;
         }
     }
+
+    # Repost
+    if ($e.reposted_by) {
+      $meta{"Repost:"} = """$e.reposted_by""";
+    }
+
     # Tags
     if ($e.tags) {
         var int tcount = 0;
@@ -1008,13 +1015,13 @@
         $this->print_multiform_start();
 
         print_header("Comments:", $*text_comments_id);
-	if ($e.comments.spam_counter > 0 and $e.comments.read_spam_url != "") {
-		if ($p.showspam) {
-		    print """<p width='95%' style='text-align:center;'>""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</p>""";
-		} else {
-		    print """<p width='95%' style='text-align:center;'><a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></p>""";
-		}
-	}
+  if ($e.comments.spam_counter > 0 and $e.comments.read_spam_url != "") {
+    if ($p.showspam) {
+        print """<p width='95%' style='text-align:center;'>""" + get_plural_phrase($e.comments.spam_counter, "text_read_spam_comments") + """</p>""";
+    } else {
+        print """<p width='95%' style='text-align:center;'><a href=\"$e.comments.read_spam_url\">""" + get_plural_phrase($e.comments.spam_counter, "text_read_all_spam_comments") + """</a></p>""";
+    }
+  }
         if ($.comment_pages.total_subitems > 0) {
             $.comment_pages->print();
             $this->print_comments($.comments);