[cc-commits] [CC SVN] r13941 - in ccwordpress/branches/production: . www/images www/wp-content/themes/cc5

webmaster at creativecommons.org webmaster at creativecommons.org
Wed Jan 20 17:48:09 EST 2010


Author: bse
Date: 2010-01-20 22:48:09 +0000 (Wed, 20 Jan 2010)
New Revision: 13941

Added:
   ccwordpress/branches/production/www/images/cc-visit-store.jpg
Modified:
   ccwordpress/branches/production/
   ccwordpress/branches/production/www/wp-content/themes/cc5/index.php
Log:
Merged revisions 13939-13940 via svnmerge from 
svn+ssh://svn@code.creativecommons.org/svnroot/ccwordpress/trunk

........
  r13939 | bse | 2010-01-20 22:46:52 +0000 (Wed, 20 Jan 2010) | 1 line
  
  Added CC Store button
........
  r13940 | bse | 2010-01-20 22:47:19 +0000 (Wed, 20 Jan 2010) | 1 line
  
  Added CC Store button
........



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-11544,11561,11571,11573,11578,11581,11587,11649,11651-11940,11943,11945-12117,12120,12122,12168,12226,12348-12449,12454,12456,12484-12485,12520,12579,12600-12603,12605-12616,12632-12657,12659-12669,12671-12848,12850-12854,12856-12885,12888-12900,12903,12919-12921,12923,12935,12972-12978,13008,13041,13055,13057,13072,13121-13208,13221,13229,13235,13241,13243-13244,13264-13322,13324,13385,13387,13441,13443,13445-13446,13455,13457-13470,13472,13475,13477,13486-13489,13491,13493,13515,13517,13527-13528,13550,13562,13568,13571,13573-13597,13615,13624-13625,13627-13629,13632,13634,13636,13639-13640,13644,13648-13649,13651,13655,13670,13672,13712,13735,13741,13743-13745,13774,13799,13801,13807,13812,13820-13890,
 13892-13896,13910
   + /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-11544,11561,11571,11573,11578,11581,11587,11649,11651-11940,11943,11945-12117,12120,12122,12168,12226,12348-12449,12454,12456,12484-12485,12520,12579,12600-12603,12605-12616,12632-12657,12659-12669,12671-12848,12850-12854,12856-12885,12888-12900,12903,12919-12921,12923,12935,12972-12978,13008,13041,13055,13057,13072,13121-13208,13221,13229,13235,13241,13243-13244,13264-13322,13324,13385,13387,13441,13443,13445-13446,13455,13457-13470,13472,13475,13477,13486-13489,13491,13493,13515,13517,13527-13528,13550,13562,13568,13571,13573-13597,13615,13624-13625,13627-13629,13632,13634,13636,13639-13640,13644,13648-13649,13651,13655,13670,13672,13712,13735,13741,13743-13745,13774,13799,13801,13807,13812,13820-13890,
 13892-13896,13910,13939-13940

Copied: ccwordpress/branches/production/www/images/cc-visit-store.jpg (from rev 13940, ccwordpress/trunk/www/images/cc-visit-store.jpg)
===================================================================
(Binary files differ)

Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/index.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/index.php	2010-01-20 22:47:19 UTC (rev 13940)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/index.php	2010-01-20 22:48:09 UTC (rev 13941)
@@ -80,23 +80,11 @@
       <div id="topContent" class="box">
         <div id="ccBlurb" >
           <div id="cc_mission">
-<?php /*
-		  <!-- <p>Creative Commons is a <strong>nonprofit</strong> organization dedicated to making it easier for people to share and build upon the work of others, consistent with the rules of copyright.</p> -->
-				<!-- <object type="application/x-shockwave-flash" data="http://blip.tv/play/goY6yZQBg9ky.m4v" style="width: 300px; height: 199px; margin-right: 10px;"> 
-  		                <param name="movie" value="http://blip.tv/play/goY6yZQBg9ky.m4v"> 
-  		                <param name="quality" value="high"> 
-  		                <param name="menu"> 
-  		                <img src="test.gif" alt="Alternate image for non-flash browsers"> 
-  		              </object> -->
 			<div id="quote">
-  		      <a href="/videos/" class="theQuote">CC Video Library <!-- <img src="<?php bloginfo('stylesheet_directory'); ?>/images/play.png" alt="[play]" border="0"/> --></a>
+			 	<a href="https://support.creativecommons.org/store"><img src="/images/cc-visit-store.jpg" alt="Visit the CC Store!" border="0" /></a>
 			</div>
- */ ?>
-<!--
-			<div id="quote">
-			 	<a href="https://support.creativecommons.org/donate"><img src="/images/support/2009/shepard-fairey-banner-1.png" alt="Shepard Faiey Remixes CC Logo!" border="0" /></a>
-			</div>
--->
+<?/* Commented out testimonial section, possible return later -- 2010/01/20 ~ Alex
+
 			<script>utmx_section("Testimonial")</script>
 		  	<div id="testimonial">
                 <div class="photo"><img src="https://support.creativecommons.org/images/75/evanprodromou.jpg" alt="Evan Prodromou" /></div>
@@ -104,14 +92,15 @@
                 <div class="sig">
                     <a href="https://support.creativecommons.org/testimonials#evanprodromou">&mdash; Evan Prodromou</a><br/><span>Founder, Identi.ca</span>
                 </div>
-<? /*    <p><a href="https://support.creativecommons.org/testimonials">More testimonials &raquo;</a></p> */ ?>
+<? /*    <p><a href="https://support.creativecommons.org/testimonials">More testimonials &raquo;</a></p>  
 			</div>
 			<script type="text/javascript">
 				jQuery("#testimonial").click(function() { window.location="https://support.creativecommons.org/donate?utm_source=ccorg&utm_medium=homepage_testimonial_cockerill&utm_campaign=fall2009"; });
 				jQuery("#testimonial")[0].style.cursor = "pointer";
 			</script>
 </noscript>
-		  </div>
+ */ ?>
+</div>
           <div id="splashBox">
           <div id="splash">
 <?php




More information about the cc-commits mailing list