Committer: esavintcev
LJSUP-12150: New Repost feature (S2)U trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 U trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 U trunk/bin/upgrading/s2layers/voxhtml/layout.s2 U trunk/htdocs/stc/voxhtml/ljextras.css
Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2012-05-30 15:01:56 UTC (rev 12034) +++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2012-05-30 15:28:36 UTC (rev 12035) @@ -1450,6 +1450,7 @@ var string datetime = $e.time->date_format() + " " + $e.time->time_format(); var string subject = $e.subject != "" ? $e->plain_subject() : $*text_nosubject; + if ($e.repost) { $item = $item + " $e.repost_icon"; } if ($e.delayed) { $item = $item + " $e.delayed_icon"; } if ($e.sticky) { $item = $item + " $e.sticky_icon"; } if ($e.security) { $item = $item + " $e.security_icon"; } @@ -1474,6 +1475,7 @@ "$e.poster in $e.journal" : $e.journal->as_string(); var string subject = $e.subject != "" ? $e->plain_subject() : $*text_nosubject; + if ($e.repost) { $item = $item + " $e.repost_icon"; } if ($e.delayed) { $item = $item + " $e.delayed_icon"; } if ($e.sticky) { $item = $item + " $e.sticky_icon"; } if ($e.security) { $item = $item + " $e.security_icon"; } @@ -1948,10 +1950,14 @@ """ <div class="datesubject"><div class="date">"""; print $e.time->date_format("%%dd%% %%month%% %%yyyy%%"); - "$time - </div>"; + "$time"; + if ($e.reposted_by) { + """<span>, $e.reposted_by</span>"""; + } + "</div>"; """ <div class="subject">"""; + 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/smoothsailing/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 2012-05-30 15:01:56 UTC (rev 12034) +++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 2012-05-30 15:28:36 UTC (rev 12035) @@ -1639,19 +1639,25 @@ # print $.time->time_format(); print $.time->time_format($*text_format_entry_time); } - """</span><span class="entryHeaderSubject">"""; + """</span>"""; + """<span class="entryHeaderSubject">"""; if ($p.view=="entry") { + if ($.repost) { " - $.repost_icon"; } if ($.delayed) { " - $.delayed_icon"; } if ($.sticky) { " - $.sticky_icon"; } if (defined $.security_icon) { " - $.security_icon"; } }else{ print (defined $.security_icon or $.sticky or $.delayed or $.subject!="" ? " - " : ""); + if ($.repost) { "$.repost_icon "; } if ($.delayed) { "$.delayed_icon "; } if ($.sticky) { "$.sticky_icon "; } if (defined $.security_icon) { "$.security_icon "; } print $this->formatted_subject({"class"=>"subj-link"}); } """</span>"""; + if ($.reposted_by) { + """<span class="entryHeaderRepost"> - $.reposted_by</span>"""; + } if ((size $.tags>0)and($*layout_position_entrytags=="subject")) { """<span class="entryHeaderTags"> [<a href="$.tags[0].url">$.tags[0].name</a>"""; foreach var int i (1 .. (size $.tags - 1)) { @@ -1662,7 +1668,8 @@ """</div>"""; }else{ """<div class="entryHeader">"""; - if (defined $.security_icon or $.sticky or $.delayed) { + if (defined $.security_icon or $.sticky or $.delayed or $.repost) { + if ($.repost) { "$.repost_icon "; } if ($.delayed) { "$.delayed_icon "; } if ($.sticky) { " $.sticky_icon "; } if (defined $.security_icon) { " $.security_icon"; } @@ -2413,6 +2420,7 @@ if ($e.journal.username!=$e.poster.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/voxhtml/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/voxhtml/layout.s2 2012-05-30 15:01:56 UTC (rev 12034) +++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2 2012-05-30 15:28:36 UTC (rev 12035) @@ -1459,6 +1459,7 @@ $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 "; } @@ -2244,8 +2245,9 @@ <h2 class="asset-name page-header2">"""; if (defined $en) { - if (defined $en.security_icon or $en.sticky or $en.delayed) { + if (defined $en.security_icon or $en.sticky or $en.delayed or $en.repost) { """<span class="lj-entry-securityicon">"""; + if ($en.repost) {" $en.repost_icon"; } if ($en.delayed) { " $en.delayed_icon"; } if ($en.sticky) { " $en.sticky_icon"; } if ($en.security) { " $en.security_icon"; } @@ -2272,6 +2274,11 @@ <div class="asset-meta asset-entry-date"> <ul class="asset-meta-list"> <li class="item"><span><abbr class="datetime">$datetime</abbr></span></li> + """; + if ($e.reposted_by) { + """<li class="item asset-meta-repost"><span class="asset-meta-repost-inner">$e.reposted_by</span></li>"""; + } + """ </ul> </div> </div></div></div> Modified: trunk/htdocs/stc/voxhtml/ljextras.css =================================================================== --- trunk/htdocs/stc/voxhtml/ljextras.css 2012-05-30 15:01:56 UTC (rev 12034) +++ trunk/htdocs/stc/voxhtml/ljextras.css 2012-05-30 15:28:36 UTC (rev 12035) @@ -14,11 +14,16 @@ font-size: 12px; } -.asset-meta-comments a, asset-meta-no-comments a { +.asset-meta-comments a, +.asset-meta-no-comments a, +.asset-meta-repost .asset-meta-repost-inner { background-image: none !important; padding-left: 2px !important; +} +.asset-meta-repost .asset-meta-repost-inner IMG { + vertical-align: middle !important; + } -} .asset-nav, .nav { clear: both; display: block;