[cc-commits] [CC SVN] r15287 - in themes/creativecommons.org/branches/production: . css
webmaster at creativecommons.org
webmaster at creativecommons.org
Fri Oct 14 17:10:52 EDT 2011
Author: nkinkade
Date: 2011-10-14 21:10:52 +0000 (Fri, 14 Oct 2011)
New Revision: 15287
Added:
themes/creativecommons.org/branches/production/.svnignore
themes/creativecommons.org/branches/production/banner-donate.php
Modified:
themes/creativecommons.org/branches/production/
themes/creativecommons.org/branches/production/css/primary.styles.css
themes/creativecommons.org/branches/production/functions.php
themes/creativecommons.org/branches/production/header-top.php
themes/creativecommons.org/branches/production/home-gestalt.php
themes/creativecommons.org/branches/production/page-home-dynamic.php
themes/creativecommons.org/branches/production/page-nav.php
Log:
Merged revisions 15276-15283,15286 via svnmerge from
svn+ssh://svn@code.creativecommons.org/svnroot/themes/creativecommons.org/trunk
........
r15276 | cxadams | 2011-10-11 10:51:27 -0400 (Tue, 11 Oct 2011) | 1 line
include donate and buy in same aprt of navigation
........
r15277 | rejon | 2011-10-11 11:12:32 -0400 (Tue, 11 Oct 2011) | 2 lines
added homedev
........
r15278 | rejon | 2011-10-12 03:25:10 -0400 (Wed, 12 Oct 2011) | 2 lines
added banner and some tweaks
........
r15279 | rejon | 2011-10-12 05:00:01 -0400 (Wed, 12 Oct 2011) | 2 lines
added casestudies
........
r15280 | cxadams | 2011-10-12 05:13:37 -0400 (Wed, 12 Oct 2011) | 1 line
add placeholder donate banner
........
r15281 | rejon | 2011-10-13 12:55:35 -0400 (Thu, 13 Oct 2011) | 2 lines
add changes
........
r15282 | cxadams | 2011-10-14 02:20:26 -0400 (Fri, 14 Oct 2011) | 1 line
update donate banner
........
r15283 | rejon | 2011-10-14 02:37:40 -0400 (Fri, 14 Oct 2011) | 2 lines
added sharing
........
r15286 | nkinkade | 2011-10-14 16:42:01 -0400 (Fri, 14 Oct 2011) | 1 line
Corrected link to /donate, remove superfluous trailing slash.
........
Property changes on: themes/creativecommons.org/branches/production
___________________________________________________________________
Modified: svnmerge-integrated
- /themes/creativecommons.org/trunk:1-15196,15200-15255,15264-15274,15284
+ /themes/creativecommons.org/trunk:1-15196,15200-15255,15264-15274,15276-15286
Copied: themes/creativecommons.org/branches/production/.svnignore (from rev 15283, themes/creativecommons.org/trunk/.svnignore)
===================================================================
--- themes/creativecommons.org/branches/production/.svnignore (rev 0)
+++ themes/creativecommons.org/branches/production/.svnignore 2011-10-14 21:10:52 UTC (rev 15287)
@@ -0,0 +1 @@
+functions-custom.php
Copied: themes/creativecommons.org/branches/production/banner-donate.php (from rev 15283, themes/creativecommons.org/trunk/banner-donate.php)
===================================================================
--- themes/creativecommons.org/branches/production/banner-donate.php (rev 0)
+++ themes/creativecommons.org/branches/production/banner-donate.php 2011-10-14 21:10:52 UTC (rev 15287)
@@ -0,0 +1,13 @@
+<div id="top-banner">
+ <a id="donate-link" href="https://creativecommons.net/donate" title="Donate to Creative Commons"></a>
+ <div class="container">
+ <div class="row">
+ <div class="eleven columns">
+ <h4><a href="https://creativecommons.net/donate">Donate to Freedom and Sharing: CC’s Annual Campaign</a></h4>
+ </div>
+ <div class="three columns omega">
+ <h5><a href="https://creativecommons.net/donate" class="btn">Donate now</a></h5>
+ </div>
+ </div>
+ </div>
+</div>
Modified: themes/creativecommons.org/branches/production/css/primary.styles.css
===================================================================
--- themes/creativecommons.org/branches/production/css/primary.styles.css 2011-10-14 20:42:01 UTC (rev 15286)
+++ themes/creativecommons.org/branches/production/css/primary.styles.css 2011-10-14 21:10:52 UTC (rev 15287)
@@ -364,6 +364,53 @@
border-top: none;
}
+#top-banner {
+ position: relative;
+ margin: 0 0 0;
+ padding: 7px 14px;
+ background-color: #FFF542;
+ background-repeat: repeat-x;
+ background-image: -khtml-gradient(linear, left top, left bottom, from(#FFF542), to(#FAED00));
+ background-image: -moz-linear-gradient(top, #FFF542, #FAED00);
+ background-image: -ms-linear-gradient(top, #FFF542, #FAED00);
+ background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #FFF542), color-stop(100%, #FAED00));
+ background-image: -webkit-linear-gradient(top, #FFF542, #FAED00);
+ background-image: -o-linear-gradient(top, #FFF542, #FAED00);
+ background-image: linear-gradient(top, #FFF542, #FAED00);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFF542', endColorstr='#FAED00', GradientType=0);
+ border: 1px solid #ddd;
+ -webkit-border-bottom-right-radius: 3px;
+ -webkit-border-bottom-left-radius: 3px;
+ -moz-border-radius-bottomright: 3px;
+ -moz-border-radius-bottomleft: 3px;
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+ /*-webkit-box-shadow: inset 0 1px 0 #ffffff;
+ -moz-box-shadow: inset 0 1px 0 #ffffff;
+ box-shadow: inset 0 1px 0 #ffffff;*/
+}
+
+#top-banner:hover {
+ background-position: 0 -1000px;
+}
+
+#top-banner h4 {
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+
+#top-banner .omega {
+ text-align: right;
+}
+
+#top-banner #donate-link {
+ position: absolute;
+ top: 0;
+ left: 0;
+ height: 100%;
+ width: 100%;
+ z-index: 1;
+}
+
.help-popover {
position: relative;
display: none;
@@ -448,7 +495,15 @@
bottom: 20px;
}
+.casestudies td:first-child {
+ vertical-align: middle;
+}
+.casestudies td:first-child img {
+ display: block;
+ margin: auto;
+}
+
footer, footer p, footer p small {
color: #ffffff;
}
Modified: themes/creativecommons.org/branches/production/functions.php
===================================================================
--- themes/creativecommons.org/branches/production/functions.php 2011-10-14 20:42:01 UTC (rev 15286)
+++ themes/creativecommons.org/branches/production/functions.php 2011-10-14 21:10:52 UTC (rev 15287)
@@ -91,7 +91,7 @@
/* CC Specific helper functions */
function cc_progress_total() {
- $campaign_total = file_get_contents(__DIR__ . '../../includes/total.txt');
+ $campaign_total = file_get_contents(__DIR__ . '/../../../includes/total.txt');
print $campaign_total;
}
Modified: themes/creativecommons.org/branches/production/header-top.php
===================================================================
--- themes/creativecommons.org/branches/production/header-top.php 2011-10-14 20:42:01 UTC (rev 15286)
+++ themes/creativecommons.org/branches/production/header-top.php 2011-10-14 21:10:52 UTC (rev 15287)
@@ -30,7 +30,7 @@
<title><?php wp_title(''); ?> - Creative Commons</title>
<?php }?>
- <meta name="keywords" content="creative commons, commons, free culture, open source, attribution, non-commercial, share-alike, no derivatives, lessig" />
+ <meta name="keywords" content="creative commons, commons, free culture, open source, attribution, non-commercial, share-alike, no derivatives, lessig, sharing, sharism" />
<meta name="description" content="Creative Commons licenses provide a flexible range of protections and freedoms for authors, artists, and educators. <?php if (is_single()) echo cc_post_excerpt() ?>" />
<?php if (is_single()) { ?>
Modified: themes/creativecommons.org/branches/production/home-gestalt.php
===================================================================
--- themes/creativecommons.org/branches/production/home-gestalt.php 2011-10-14 20:42:01 UTC (rev 15286)
+++ themes/creativecommons.org/branches/production/home-gestalt.php 2011-10-14 21:10:52 UTC (rev 15287)
@@ -92,11 +92,10 @@
{
$carousels = get_buckets('Carousel');
- if ( count($carousels) == 0 )
+ if ( empty($carousels) || count($carousels) == 0 )
{
$static_bucket = 'home-carousel.php';
- if ( file_exists($static_bucket) )
- include $static_bucket;
+ include $static_bucket;
return;
}
?>
@@ -154,8 +153,7 @@
if ( count($buckets) < 4 )
{
$static_bucket = 'home-buckets.php';
- if ( file_exists($static_bucket) )
- include $static_bucket;
+ include $static_bucket;
return;
}
Modified: themes/creativecommons.org/branches/production/page-home-dynamic.php
===================================================================
--- themes/creativecommons.org/branches/production/page-home-dynamic.php 2011-10-14 20:42:01 UTC (rev 15286)
+++ themes/creativecommons.org/branches/production/page-home-dynamic.php 2011-10-14 21:10:52 UTC (rev 15287)
@@ -23,7 +23,9 @@
<div class="sixteen columns">
<?php
if ( $_SERVER["REQUEST_URI"] == '/' ||
- $_SERVER["REQUEST_URI"] == '/index.php' ) {
+ $_SERVER["REQUEST_URI"] == '/index.php' ||
+ $_SERVER["REQUEST_URI"] == '/homedev/index.php' ||
+ $_SERVER["REQUEST_URI"] == '/homedev' ) {
include 'home-gestalt.php';
} else {
Modified: themes/creativecommons.org/branches/production/page-nav.php
===================================================================
--- themes/creativecommons.org/branches/production/page-nav.php 2011-10-14 20:42:01 UTC (rev 15286)
+++ themes/creativecommons.org/branches/production/page-nav.php 2011-10-14 21:10:52 UTC (rev 15287)
@@ -81,8 +81,8 @@
<a href="https://creativecommons.net/donate/" class="dropdown-toggle">Support CC</a>
<ul class="menu-dropdown">
<li><a href="https://creativecommons.net/donate/">Donate to Creative Commons</a></li>
+ <li><a href="https://creativecommons.net/store/">Buy CC Merchandise</a></li>
<li class="divider"></li>
- <li><a href="https://creativecommons.net/store/">Buy CC Merchandise</a></li>
<li><a href="https://creativecommons.net/supporters/">Our Supporters</a></li>
<li><a href="https://creativecommons.net/testimonials/">Testimonials</a></li>
<li><a href="https://creativecommons.net/corporate/">Corporate Giving</a></li>
@@ -128,3 +128,4 @@
</div>
</div>
</header>
+ <?php include 'banner-donate.php'; ?>
More information about the cc-commits
mailing list