Committer: ybuhvalova
LJSV-1557: Links in "Bio" section of profile pages and in custom sidebar text get "nofollow" attr. even for Paid usersU trunk/bin/upgrading/s2layers/component/layout.s2 U trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 U trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 U trunk/bin/upgrading/s2layers/tranquilityii/layout.s2 U trunk/bin/upgrading/s2layers/voxhtml/layout.s2
Modified: trunk/bin/upgrading/s2layers/component/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/component/layout.s2 2012-11-20 08:27:49 UTC (rev 12919) +++ trunk/bin/upgrading/s2layers/component/layout.s2 2012-11-20 08:46:58 UTC (rev 12920) @@ -1336,8 +1336,8 @@ #### LINKS #### -function print_link(string link, string name) { - print safe "<a href=\"$link\">"; +function print_link(string link, string name, string attributes) { + print safe "<a href=\"$link\" $attributes>"; if($name != "") { print safe "$name"; } else { "<i>no name</i>"; } } @@ -1385,7 +1385,7 @@ } "<div><b>$l.title</b></div>"; } else { - print_link($l.url, $l.title); + print_link($l.url, $l.title, $l.attributes); } if($count != size $.linklist) { Modified: trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2012-11-20 08:27:49 UTC (rev 12919) +++ trunk/bin/upgrading/s2layers/flexiblesquares/layout.s2 2012-11-20 08:46:58 UTC (rev 12920) @@ -1352,7 +1352,7 @@ } else { - $list = $list + """<li class="sbaritem"><a href="$l.url">$l.title</a></li>"""; + $list = $list + """<li class="sbaritem"><a href="$l.url" $l.attributes>$l.title</a></li>"""; } } else Modified: trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 2012-11-20 08:27:49 UTC (rev 12919) +++ trunk/bin/upgrading/s2layers/smoothsailing/layout.s2 2012-11-20 08:46:58 UTC (rev 12920) @@ -2026,7 +2026,7 @@ }elseif ($.linklist[$i].url=="") { """<div class="listtitle">$.linklist[$i].title</div>"""; }else { - """<div class="listitem"><a href="$.linklist[$i].url">$.linklist[$i].title</a></div>"""; + """<div class="listitem"><a href="$.linklist[$i].url" $.linklist[$i].attributes>$.linklist[$i].title</a></div>"""; } } """ Modified: trunk/bin/upgrading/s2layers/tranquilityii/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/tranquilityii/layout.s2 2012-11-20 08:27:49 UTC (rev 12919) +++ trunk/bin/upgrading/s2layers/tranquilityii/layout.s2 2012-11-20 08:46:58 UTC (rev 12920) @@ -746,7 +746,7 @@ } elseif ($l.is_heading) { print "<li><b>$l.title</b></li>"; } elseif ( $l.title ) { - print "<li><a href=\"$l.url\" title=\"$l.title\">$l.title</a></li>"; + print "<li><a href=\"$l.url\" title=\"$l.title\" $l.attributes>$l.title</a></li>"; } } print "</ul>"; Modified: trunk/bin/upgrading/s2layers/voxhtml/layout.s2 =================================================================== --- trunk/bin/upgrading/s2layers/voxhtml/layout.s2 2012-11-20 08:27:49 UTC (rev 12919) +++ trunk/bin/upgrading/s2layers/voxhtml/layout.s2 2012-11-20 08:46:58 UTC (rev 12920) @@ -517,14 +517,14 @@ propgroup text { property string text_latest_month { des = "Text used for the heading of the sidebar calendar block"; - } - set text_latest_month = "Latest Month"; - property string text_profile { + } + set text_latest_month = "Latest Month"; + property string text_profile { des = "Text used for the heading of sidebar profile block"; - } + } set text_profile = "Profile"; property use text_links; - set text_links = "Links"; + set text_links = "Links"; property use text_page_summary; set text_page_summary = "Page Summary"; property use text_syndicate; @@ -1221,7 +1221,7 @@ $box_open = true; } if (not $link.is_heading and $link.title != "") { - $items[size $items] = """<a href="$link.url">$link.title</a>"""; + $items[size $items] = """<a href="$link.url" $link.attributes>$link.title</a>"""; } } if ($box_open) {