[ljcom] r12032: LJSUP-12150: New Repost feature (S2)

U   trunk/bin/upgrading/s2layers/sup/themes.s2

Modified: trunk/bin/upgrading/s2layers/sup/themes.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/themes.s2	2012-05-30 11:35:02 UTC (rev 12031)
+++ trunk/bin/upgrading/s2layers/sup/themes.s2	2012-05-30 14:25:48 UTC (rev 12032)
@@ -2202,7 +2202,12 @@
                             <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<br/>"; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
                         </dl>
                         <h4>$_entry_title</h4>
-                        <div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr></div>
+                        <div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr>""";
+                        if ($e.reposted_by) {
+                            """, <span class="entry-repost">$e.reposted_by</span>""";
+                        }
+"""
+                        </div>
 """;
                     }
                     else{
@@ -2353,7 +2358,12 @@
                             <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 <br/>"; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
                         </dl>
                         <h4>$_entry_title</h4>
-                        <div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr></div>
+                        <div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr>""";
+                        if ($e.reposted_by) {
+                            """, <span class="entry-repost">$e.reposted_by</span>""";
+                        }
+"""
+                        </div>
 """;
                     }
                     else{
@@ -2622,7 +2632,12 @@
                             <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<br/>"; print _user_print($e.journal,"simple");} else { print _user_print($e.poster,"inside"); } """</dd>
                         </dl>
                         <h4>$_entry_title</h4>
-                        <div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr></div>
+                        <div class="entry-date"><abbr class="updated" title="$isodate">$entrydate</abbr>""";
+                        if ($e.reposted_by) {
+                            """, <span class="entry-repost">$e.reposted_by</span>""";
+                        }
+"""
+                        </div>
 """;
                     }
                     else{
@@ -2863,7 +2878,7 @@
     var string corners2 = "";
     
 
-    var string _entry_title = "$e.repost_icon" + "$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");
@@ -2905,7 +2920,11 @@
                         """
                         <div class="entry-author-date">"""; 
                         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"); } 
-                        """ <abbr class="updated" title="$isodate">$entrydate</abbr></div>
+                        """ <abbr class="updated" title="$isodate">$entrydate</abbr>""";
+                        if ($e.reposted_by) {
+                            """, <span class="entry-repost">$e.reposted_by</span>""";
+                        }
+                        """</div>
                         <h4>$_entry_title</h4>
                         """; $e->print_metadata(); """
                         </div>