Committer: esavintcev
LJSUP-12150: New Repost feature (S2)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 14:07:24 UTC (rev 12025) +++ trunk/bin/upgrading/s2layers/sup/layout.s2 2012-05-29 15:22:28 UTC (rev 12026) @@ -407,7 +407,10 @@ """ <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) { print $e.reposted_by; } """ + if ($e.reposted_by) { + """<dd class="entry-repost">$e.reposted_by</dd>"""; + } + """ </dl> """; } Modified: trunk/bin/upgrading/s2layers/sup/themes.s2 =================================================================== --- trunk/bin/upgrading/s2layers/sup/themes.s2 2012-05-29 14:07:24 UTC (rev 12025) +++ trunk/bin/upgrading/s2layers/sup/themes.s2 2012-05-29 15:22:28 UTC (rev 12026) @@ -416,7 +416,11 @@ <dl class="vcard author"> <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> + <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> </dd> @@ -2174,7 +2178,11 @@ if ($e.userpic) { """<dt"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</dt>"""; } else { """<dt></dt>"""; } """ <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> + <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> """; } @@ -2321,7 +2329,11 @@ if ($e.userpic) { """<dt"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</dt>"""; } else { """<dt></dt>"""; } """ <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> + <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> """; } @@ -2586,7 +2598,11 @@ if ($e.userpic) { """<dt"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</dt>"""; } else { """<dt></dt>"""; } """ <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> + <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> """; } @@ -2867,7 +2883,11 @@ if ($e.userpic) { """<dt"""; if ($e.poster.username!=$e.journal.username and not ($p.journal.journal_type == "C" and $p.view == "recent" )){ print " data-journal=\"" + $e.journal->base_url() + "\""; }""">"""; $e.userpic->print(); """</dt>"""; } else { """<dt></dt>"""; } """ <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> + <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> """; }