[cc-commits] [CC SVN] r12617 - in ccwordpress/branches/production: . www/wp-content/themes/cc5
webmaster at creativecommons.org
webmaster at creativecommons.org
Wed May 13 19:59:20 EDT 2009
Author: bse
Date: 2009-05-13 23:59:20 +0000 (Wed, 13 May 2009)
New Revision: 12617
Modified:
ccwordpress/branches/production/
ccwordpress/branches/production/www/wp-content/themes/cc5/category-7.php
ccwordpress/branches/production/www/wp-content/themes/cc5/category.php
ccwordpress/branches/production/www/wp-content/themes/cc5/index.php
ccwordpress/branches/production/www/wp-content/themes/cc5/search.php
ccwordpress/branches/production/www/wp-content/themes/cc5/sidelinks.php
Log:
Merged revisions 12600,12615-12616 via svnmerge from
svn+ssh://svn@code.creativecommons.org/svnroot/ccwordpress/trunk
........
r12600 | bse | 2009-05-12 17:49:49 +0000 (Tue, 12 May 2009) | 1 line
Featured Commoners -> CC Talks With
........
r12615 | bse | 2009-05-13 21:54:24 +0000 (Wed, 13 May 2009) | 1 line
Added ellipses
........
r12616 | bse | 2009-05-13 21:54:46 +0000 (Wed, 13 May 2009) | 1 line
Revised tagline
........
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-11684,11686-11940,11943,11945-12117,12120,12122,12168,12226,12348-12449,12454,12456,12484-12485,12520,12579
+ /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-11684,11686-11940,11943,11945-12117,12120,12122,12168,12226,12348-12449,12454,12456,12484-12485,12520,12579,12600-12603,12605-12616
Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/category-7.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/category-7.php 2009-05-13 21:54:46 UTC (rev 12616)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/category-7.php 2009-05-13 23:59:20 UTC (rev 12617)
@@ -29,7 +29,7 @@
<div class="excerpt">
<h1 class="title">
<a href="<? the_permalink() ?>">
- Featured Commoner: <?php the_title() ?>
+ CC Talks With: <?php the_title() ?>
</a>
</h1>
<h4 class="meta"><?php the_author() ?>, <?php the_time('F jS, Y')?></h4>
Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/category.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/category.php 2009-05-13 21:54:46 UTC (rev 12616)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/category.php 2009-05-13 23:59:20 UTC (rev 12617)
@@ -23,7 +23,7 @@
<div class="block blog sideContentSpace" id="post-<?php the_ID(); ?>">
<h1 class="title">
<a href="<? the_permalink() ?>">
- <?php if (in_category(4) || in_category(7)) { ?>Featured Commoner: <?php } ?>
+ <?php if (in_category(4) || in_category(7)) { ?>CC Talks With: <?php } ?>
<?php the_title() ?>
</a>
</h1>
Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/index.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/index.php 2009-05-13 21:54:46 UTC (rev 12616)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/index.php 2009-05-13 23:59:20 UTC (rev 12617)
@@ -44,7 +44,7 @@
</div>
<div id="headerIntro">
<h4>Share, Remix, Reuse — Legally</h4>
- <p>Creative Commons is a nonprofit organization that works to reduce barriers to collaboration. <a href="http://creativecommons.org/about/what-is-cc">Learn More »</a></p>
+ <p>Creative Commons is a nonprofit organization that increases sharing and improves collaboration. <a href="http://creativecommons.org/about/what-is-cc">Learn More »</a></p>
</div>
<?php require_once "nav.php"; ?>
<div id="headerSearch">
@@ -135,7 +135,7 @@
<li class="<?php echo $liClass ?>">
<h5 class="postTitle">
<a href="<?php the_permalink() ?>">
- <?php if (in_category(4) || in_category(7)) { ?>Featured Commoner: <?php } ?>
+ <?php if (in_category(4) || in_category(7)) { ?>CC Talks With: <?php } ?>
<?php if (!$noticeTitle) { the_title(); } else { echo $noticeTitle; } ?>
</a>
Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/search.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/search.php 2009-05-13 21:54:46 UTC (rev 12616)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/search.php 2009-05-13 23:59:20 UTC (rev 12617)
@@ -18,7 +18,7 @@
<div class="block blog sideContentSpace" id="post-<?php the_ID(); ?>">
<h1 class="title">
<a href="<? the_permalink() ?>">
- <?php if (in_category(4) || in_category(7)) { ?>Featured Commoner: <?php } ?>
+ <?php if (in_category(4) || in_category(7)) { ?>CC Talks With: <?php } ?>
<?php the_title() ?>
</a>
</h1>
Modified: ccwordpress/branches/production/www/wp-content/themes/cc5/sidelinks.php
===================================================================
--- ccwordpress/branches/production/www/wp-content/themes/cc5/sidelinks.php 2009-05-13 21:54:46 UTC (rev 12616)
+++ ccwordpress/branches/production/www/wp-content/themes/cc5/sidelinks.php 2009-05-13 23:59:20 UTC (rev 12617)
@@ -3,6 +3,6 @@
<li><a href="/about/events">Events</a></li>
<li><a href="/about/newsletter">Newsletter</a></li>
<li><a href="http://wiki.creativecommons.org/Case_Studies">Case Studies</a></li>
-<li><a href="/commoners">Creative Commoners</a></li>
+<li><a href="/interviews">CC Talks With...</a></li>
<li><a href="http://support.creativecommons.org/store/">Store</a></li>
<!-- <li><a href="#">Documentation</a></li> -->
More information about the cc-commits
mailing list