[cc-commits] [CC SVN] r14792 - in ccwordpress/branches/production: . www/includes
webmaster at creativecommons.org
webmaster at creativecommons.org
Wed Nov 24 17:39:07 EST 2010
Author: bse
Date: 2010-11-24 22:39:07 +0000 (Wed, 24 Nov 2010)
New Revision: 14792
Modified:
ccwordpress/branches/production/
ccwordpress/branches/production/www/includes/deed3-print.css
ccwordpress/branches/production/www/includes/help.js
Log:
Merged revisions 14790-14791 via svnmerge from
svn+ssh://svn@code.creativecommons.org/svnroot/ccwordpress/trunk
........
r14790 | bse | 2010-11-24 22:34:23 +0000 (Wed, 24 Nov 2010) | 1 line
Use #deed as the tag the banner inserts itself before
........
r14791 | bse | 2010-11-24 22:34:54 +0000 (Wed, 24 Nov 2010) | 1 line
Hide #campaignBanner when printing deeds
........
Property changes on: ccwordpress/branches/production
___________________________________________________________________
Modified: svnmerge-integrated
- /ccwordpress/trunk:1-8296,8298-9115,9117-9643,9645-9659,9661-9687,9689-9733,9736-9759,9761-9839,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10638,10640-10734,10736,10740-11077,11079-11279,11281-11284,11286-11366,11368-11649,11651-11940,11943,11945-12534,12536-12603,12605-12657,12659-12848,12850-12854,12856-12885,12888-13043,13045-13091,13093-13373,13375-13382,13384-13518,13520-13566,13568-13613,13615-13658,13660-13663,13667-13686,13688-13728,13733,13735-13736,13738-13809,13811-14096,14098-14106,14109-14212,14214-14431,14433-14442,14444-14550,14558-14559,14562,14565,14571-14572,14590,14608,14611,14615,14617,14619,14621,14623,14652,14654,14660,14662,14666,14668,14671,14673,14676-14686,14688,14690,14692,14694,14696,14698,14700,14702-14703,14706,14708,14710,14712,14714,14716-14718,14721,14726,14728,14730,14734-14735,14737-14738,14740,14742,14744,14746,14748,14750,14752,14754,14756-14757,14764-14765,14769,14771,14773-14774,
14777-14778,14780-14781,14783,14785,14787-14788
+ /ccwordpress/trunk:1-8296,8298-9115,9117-9643,9645-9659,9661-9687,9689-9733,9736-9759,9761-9839,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10638,10640-10734,10736,10740-11077,11079-11279,11281-11284,11286-11366,11368-11649,11651-11940,11943,11945-12534,12536-12603,12605-12657,12659-12848,12850-12854,12856-12885,12888-13043,13045-13091,13093-13373,13375-13382,13384-13518,13520-13566,13568-13613,13615-13658,13660-13663,13667-13686,13688-13728,13733,13735-13736,13738-13809,13811-14096,14098-14106,14109-14212,14214-14431,14433-14442,14444-14550,14558-14559,14562,14565,14571-14572,14590,14608,14611,14615,14617,14619,14621,14623,14652,14654,14660,14662,14666,14668,14671,14673,14676-14686,14688,14690,14692,14694,14696,14698,14700,14702-14703,14706,14708,14710,14712,14714,14716-14718,14721,14726,14728,14730,14734-14735,14737-14738,14740,14742,14744,14746,14748,14750,14752,14754,14756-14757,14764-14765,14769,14771,14773-14774,
14777-14778,14780-14781,14783,14785,14787-14788,14790-14791
Modified: ccwordpress/branches/production/www/includes/deed3-print.css
===================================================================
--- ccwordpress/branches/production/www/includes/deed3-print.css 2010-11-24 22:34:54 UTC (rev 14791)
+++ ccwordpress/branches/production/www/includes/deed3-print.css 2010-11-24 22:39:07 UTC (rev 14792)
@@ -9,7 +9,7 @@
margin-top: 0.35in;
}
-#header, #footer {
+#header, #footer, #campaignBanner {
display: none;
}
Modified: ccwordpress/branches/production/www/includes/help.js
===================================================================
--- ccwordpress/branches/production/www/includes/help.js 2010-11-24 22:34:54 UTC (rev 14791)
+++ ccwordpress/branches/production/www/includes/help.js 2010-11-24 22:39:07 UTC (rev 14792)
@@ -16,11 +16,12 @@
var banners = bannerHtml();
var d = document.createElement("div");
- var mainContent = document.getElementById("globalWrapper");
+ var mainContent = document.getElementById("deed");
var href = '<a href="https://creativecommons.net/superheroes/'+ banners[i][4] +'?utm_campaign=superhero&utm_source=deed' + banners[i][0] + '" style="color:#000; text-decoration:none;">';
d.setAttribute('style', 'font-size: 22px; font-family: "helvetica neue", arial, sans-serif; line-height:1; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4); color: #000; padding: 7px 0 2px 0; border-bottom: 1px solid rgb(120, 159, 44); margin-top: -1px; background: #c5deed; background:-webkit-gradient(linear, left top, left bottom, from(#d5eefd), to(#a1c6dd)); background:-moz-linear-gradient(center top, #c5deed, #91b6cd); z-index:1000;');
+ d.id = "campaignBanner";
d.innerHTML = '<div style="display:inline-block;">'+ href +'<img src="https://creativecommons.net/sites/default/files/' + banners[i][1] +'" height="85" style="vertical-align:middle; margin: 5px; -webkit-border-radius:5px; -moz-border-radius:5px;" border="0"/></a></div> <div style="display:inline-block; text-align:left; line-height:1.25; vertical-align:middle; margin-left: 15px;"><strong><span>'+ href +'<span style="display:inline-block; text-indent:-0.5em;">“</span>'+ banners[i][2] +'”</span></strong> — <em style="color:#c01100;">Read More</em></a><br/><em style="font-size:75%;">— '+ banners[i][3] +'</em></div>';
mainContent.parentNode.insertBefore(d, mainContent);
More information about the cc-commits
mailing list