[cc-commits] [CC SVN] r15221 - themes/creativecommons.org/trunk

webmaster at creativecommons.org webmaster at creativecommons.org
Mon Sep 12 12:31:35 EDT 2011


Author: rejon
Date: 2011-09-12 16:31:35 +0000 (Mon, 12 Sep 2011)
New Revision: 15221

Added:
   themes/creativecommons.org/trunk/homedev-buckets.php
   themes/creativecommons.org/trunk/homedev-carousel.php
   themes/creativecommons.org/trunk/page-homedev.php
   themes/creativecommons.org/trunk/page-two-column.php
   themes/creativecommons.org/trunk/page-video-grid.php
Removed:
   themes/creativecommons.org/trunk/404.html
   themes/creativecommons.org/trunk/page-nav-clean.php
Modified:
   themes/creativecommons.org/trunk/404.php
   themes/creativecommons.org/trunk/archive.php
   themes/creativecommons.org/trunk/comments.php
   themes/creativecommons.org/trunk/footer.php
   themes/creativecommons.org/trunk/functions.php
   themes/creativecommons.org/trunk/header-top.php
   themes/creativecommons.org/trunk/header.php
   themes/creativecommons.org/trunk/index-head.php
   themes/creativecommons.org/trunk/page-default.php
   themes/creativecommons.org/trunk/page-home.php
   themes/creativecommons.org/trunk/page.php
   themes/creativecommons.org/trunk/search.php
   themes/creativecommons.org/trunk/single.php
Log:
added ful set


Deleted: themes/creativecommons.org/trunk/404.html
===================================================================
--- themes/creativecommons.org/trunk/404.html	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/404.html	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,38 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Page Not Found :(</title>
-  <style>
-    body { text-align: center;}
-    h1 { font-size: 50px; text-align: center }
-    span[frown] { transform: rotate(90deg); display:inline-block; color: #bbb; }
-    body { font: 20px Constantia, 'Hoefler Text',  "Adobe Caslon Pro", Baskerville, Georgia, Times, serif; color: #999; text-shadow: 2px 2px 2px rgba(200, 200, 200, 0.5); }
-    ::-moz-selection{ background:#FF5E99; color:#fff; }
-    ::selection { background:#FF5E99; color:#fff; }
-    article {display:block; text-align: left; width: 500px; margin: 0 auto; }
-
-    a { color: rgb(36, 109, 56); text-decoration:none; }
-    a:hover { color: rgb(96, 73, 141) ; text-shadow: 2px 2px 2px rgba(36, 109, 56, 0.5); }
-  </style>
-</head>
-<body>
-  <article>
-    <h1>Not found <span frown>:(</span></h1>
-    <div>
-      <p>Sorry, but the page you were trying to view does not exist.</p>
-      <p>It looks like this was the result of either:</p>
-      <ul>
-        <li>a mistyped address</li>
-        <li>an out-of-date link</li>
-      </ul>
-    </div>
-
-    <script>
-      var GOOG_FIXURL_LANG = (navigator.language || '').slice(0,2),
-      GOOG_FIXURL_SITE = location.host;
-    </script>
-    <script src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
-  </article>
-</body>
-</html>

Modified: themes/creativecommons.org/trunk/404.php
===================================================================
--- themes/creativecommons.org/trunk/404.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/404.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,26 +1,18 @@
 <?php get_header(); ?>
+<body class="home">
+	<div id="container">
+        <?php include 'page-nav.php'; ?>
 
-<div id="title" class="container_16">
-	<h1 class="grid_16">
-		Sorry...	
-	</h1>
-</div>
+        <div id="main" role="main">
+            <div class="container">
+                <div class="sixteen columns">
+                    <div class="first row">
+                        <h1>Sorry, this page doesn't exist.</h1>
+                    </div>
 
-<div id="content">
-	<div class="container_16">
-		<div class="grid_12">
-			<p>The page you were looking for was not found.<br/>&nbsp;</p>
-			<h4>Other Content</h4>
-			<ul class="archives">
-				<li><a href="<?php echo get_settings('home'); ?>">Home</a></li>
-				<li><a href="<?php echo get_settings('home'); ?>/weblog/">Blog</a></li>
-				<li><a href="https://creativecommons.net/donate/">Donate</a></li>
-				<li><a href="http://wiki.creativecommons.org">Wiki</a></li>
-				<li><a href="http://search.creativecommons.org">Search</a></li>
-			</ul>
-		</div>
-	</div>
-</div>
+                </div>
+            </div><!--! end of .container -->
+		</div><!--! end of #main -->
 
 <?php get_footer(); ?>
 

Modified: themes/creativecommons.org/trunk/archive.php
===================================================================
--- themes/creativecommons.org/trunk/archive.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/archive.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -7,34 +7,38 @@
   require (TEMPLATEPATH . '/international-page.php');
   exit();
 }
-
 get_header(); 
-
 // Setup category details for template
  ?>
+<body>
+	<div id="container">
+        <?php include 'page-nav.php'; ?>
 
-<div id="title" class="container_16">
-	<? if (is_month() || is_year()) { ?> 
-	<h3 class="category">
+        <div id="main" role="main">
+            <div class="container">
+                <div class="sixteen columns">
+
+<div class="first row">
+<div id="title">
+	<?php if (is_month() || is_year()) { ?> 
+	<h1 class="category">
 		<a href="<?php echo get_category_link($cat);?>">
 		<?php echo $category->name; ?>
 		</a>
-	</h3>
-	<? }?>
-
-	<h1 class="grid_16"><? wp_title('')?></h1>
+	</h1>
+	<?php }?>
+	<h1><?php wp_title('')?></h1>
 </div>
+</div><!-- end of first row -->
+                    <div class="row"><!-- for about page -->
+                        <div class="twelve columns alpha">
 
-<div id="content">
-	<div class="container_16">
-		<div class="grid_12">
-			<?php if (have_posts()) { ?>
-			<?php
+			<?php if (have_posts()) { 
 				while (have_posts()) {
 				the_post();?>
 			<div class="blog" id="post-<?php the_ID(); ?>">
 				<h2 class="title">
-					<a href="<? the_permalink() ?>">
+					<a href="<?php the_permalink() ?>">
 					<?php if (in_category(4) || in_category(7)) { ?>CC Talks With: <?php } ?> 
 					<?php the_title() ?>
 					</a>
@@ -46,10 +50,13 @@
 				<?php if (get_the_tags()) { ?>
 				<div class="postTags">
 					<?php the_tags(); ?>
+                    <br /><br /><br />
 				</div>
 				<?php } ?>
 			</div>
 			<?php } } ?>
+
+            <br /><br />
 			<?php
 			# Add pretty pagination if the plugin PageNavi is installed,
 			# otherwise just use the boring stuff.  nkinkade 2008-01-02
@@ -59,13 +66,20 @@
 					posts_nav_link(' &mdash; ', 'previous page', 'next page');
 			}
 			?>
-		</div>
-		<div id="archives" class="grid_3 prefix_1">
-			<strong><a href="<?php echo get_settings('home') . '/' . $category->slug; ?>/feed/rss">Subscribe to RSS</a></strong><br/><br/>
-			<?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar()) ?>
-		</div>
-	</div>
-</div>
 
+            </div><!-- end of twelve columns alpha -->
+
+            <div class="four columns omega">
+		    <div id="archives" class="well">
+			    <p><strong><a href="<?php echo get_settings('home') . '/' . $category->slug; ?>/feed/rss">Subscribe to RSS</a></strong></p>
+			    <?php if (!function_exists('dynamic_sidebar') || !dynamic_sidebar()) ?>
+		    </div>
+            </div><!-- end of twelve columns omega -->
+            </div><!-- end of row -->
+
+
+                </div><!-- end of sixteen columns -->
+            </div><!--! end of .container -->
+		</div><!--! end of #main -->
 <?php get_footer(); ?>
 

Modified: themes/creativecommons.org/trunk/comments.php
===================================================================
--- themes/creativecommons.org/trunk/comments.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/comments.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,14 +1,6 @@
 <?php
-/*
- * Theme Name: 960Base Theme SIMPLE
- * Theme URI: http://960basetheme.kiuz.it
- * Description: Wordpress theme based on 960 Grid System
- * Author: Domenico Monaco
- * Author URI: http://www.kiuz.it
- * Version: 1.0.0
- */
-?>
-<?php
+    include 'meta.php';
+
 // Do not delete these lines
 	if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
 		die ('Please do not load this page directly. Thanks!');

Modified: themes/creativecommons.org/trunk/footer.php
===================================================================
--- themes/creativecommons.org/trunk/footer.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/footer.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,4 +1,3 @@
-
 		<footer>
 		<div class="container">
 		
@@ -41,7 +40,6 @@
 	</footer>
 	</div> <!--! end of #container -->
 
-
 	<!-- JavaScript at the bottom for fast page loading -->
 
 	<!-- Grab Google CDN's jQuery, with a protocol relative URL; fall back to local if offline -->
@@ -56,12 +54,12 @@
 
 	<!-- Asynchronous Google Analytics snippet. Change UA-XXXXX-X to be your site's ID.
 			 mathiasbynens.be/notes/async-analytics-snippet -->
- <!-- <script>
+    <script>
 		var _gaq=[['_setAccount','UA-2010376-1'],['_trackPageview'],['_trackPageLoadTime']];
 		(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
 		g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
 		s.parentNode.insertBefore(g,s)}(document,'script'));
-	</script>-->
+	</script>
 
 	<!-- Prompt IE 6 users to install Chrome Frame. Remove this if you want to support IE 6.
 			 chromium.org/developers/how-tos/chrome-frame-getting-started -->
@@ -70,7 +68,5 @@
 		<script defer>window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})</script>
 	<![endif]-->
 
-
 	</body>
 </html>
-

Modified: themes/creativecommons.org/trunk/functions.php
===================================================================
--- themes/creativecommons.org/trunk/functions.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/functions.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,6 +1,10 @@
 <?php
     include 'meta.php';
 
+// Moving sites
+update_option('siteurl','http://cc.localhost');
+update_option('home','http://cc.localhost');
+
 // Remove link rel="start" from blog pages
 remove_action('wp_head', 'start_post_rel_link'); // Removes the start link
 remove_action('wp_head', 'parent_post_rel_link', 10, 0); // Removes rel="parent"

Modified: themes/creativecommons.org/trunk/header-top.php
===================================================================
--- themes/creativecommons.org/trunk/header-top.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/header-top.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -9,7 +9,7 @@
 <!-- Consider adding a manifest.appcache: h5bp.com/d/Offline -->
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]-->
 <head profile="http://gmpg.org/xfn/11">
-	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
+	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" charset="<?php bloginfo('charset'); ?>" />
 
 	<!-- Use the .htaccess and remove these lines to avoid edge case issues.
 			 More info: h5bp.com/b/378 -->
@@ -44,7 +44,6 @@
     <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
 	<?php } ?>
 
-
     <?php if ($category_name == "weblog" || is_front_page() ) { ?>
     <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php bloginfo('home')?>/weblog/rss" />
     <?php } else if (is_category()) { ?>
@@ -54,13 +53,5 @@
     <?php } ?>
 
 
-	<!-- <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>?20110103" type="text/css" media="screen" /> -->
-	<!-- <link rel="stylesheet" href="/stylesheet" type="text/css" /> -->
-	<!--[if IE ]><link rel="stylesheet" type="text/css" media="screen" href="<?php bloginfo('stylesheet_directory'); ?>/style-ie.css" /><![endif]--> 
-	<!-- <link href="<?php bloginfo('stylesheet_directory'); ?>/support.css" rel="stylesheet" type="text/css" /> -->
- 	<!-- <link href="http://creativecommons.org/includes/total.css" rel="stylesheet" type="text/css" /> -->
-	<!-- <script type="text/javascript" charset="utf-8" src="<?php bloginfo('stylesheet_directory'); ?>/jquery.min.js"></script> -->
-	<!-- <script type="text/javascript" charset="utf-8" src="<?php bloginfo('stylesheet_directory'); ?>/jquery.carousel.min.js"></script> -->
-	<!-- <script type="text/javascript" charset="utf-8" src="<?php bloginfo('stylesheet_directory'); ?>/site.js"></script> -->
 	<?php wp_head(); ?>
 </head>

Modified: themes/creativecommons.org/trunk/header.php
===================================================================
--- themes/creativecommons.org/trunk/header.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/header.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,30 +1 @@
 <?php include 'header-top.php';?>
-<body>
-	<div id="top_bar">
-		<div id="head-region" class="header-widget">
-			<?php	if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar('Header Region 0') ) : ?><?php endif; ?> 
-		</div><!-- END head-widget -->
-	</div><!-- END top_bar -->
-
-	<div class="clear">&nbsp;</div>
-
-	<a id="top"></a>
-	<div id="header" class="container_16">
-		<div class="container_16">
-			<div class="grid_16 ">
-				<h1 id="logo"><a href="<?php echo get_settings('home'); ?>"><span>Creative Commons</span></a></h1>
-
-				<ul class="nav">
-					<li><a href="/about">About</a></li>
-					<li><a href="/weblog/">Blog</a></li>
-					<li><a href="https://creativecommons.net/donate">Donate</a></li>
-					<li><a href="http://wiki.creativecommons.org/FAQ">FAQ</a></li>
-					<li><a href="http://wiki.creativecommons.org/">Wiki</a></li>
-					<li><a href="http://wiki.creativecommons.org/CC_Affiliate_Network">International</a></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-
-	<div id="page">
-

Copied: themes/creativecommons.org/trunk/homedev-buckets.php (from rev 15218, themes/creativecommons.org/trunk/home-buckets.php)
===================================================================
--- themes/creativecommons.org/trunk/homedev-buckets.php	                        (rev 0)
+++ themes/creativecommons.org/trunk/homedev-buckets.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -0,0 +1,168 @@
+<?php
+
+// wp_list_bookmarks
+/*
+function wp_list_bookmarks($args = '') {
+        $defaults = array(
+                'orderby' => 'name', 'order' => 'ASC',
+                        'limit' => -1, 'category' => '', 'exclude_category' => '',
+                                'category_name' => '', 'hide_invisible' => 1,
+                                        'show_updated' => 0, 'echo' => 1,
+                                                'categorize' => 1, 'title_li' => __('Bookmarks'),
+                                                        'title_before' => '<h2>', 'title_after' => '</h2>',
+                                                                'category_orderby' => 'name', 'category_order' => 'ASC',
+                                                                        'class' => 'linkcat', 'category_before' => '<li id="%id" class="%class">',
+                                                                                'category_after' => '</li>'
+*/
+
+$buckets = wp_list_bookmarks(array('orderby'=>'rating', 'category_name' => 'Bucket', 
+                                   'categorize'=>0);
+
+
+?>
+
+					<div class="short row">
+						<div class="five columns alpha">
+
+						<div class="bucket">
+						<div class="inner">
+							<h3 class="title">Learn</h3>
+							<div class="content"> 
+								<h6>What is Creative Commons?</h6>
+								<p>Creative Commons helps you get your ideas out there. We're creating a world where content is open for use by everyone.</p>
+
+								<p><strong>Learn about the licenses</strong> we offer to get started!</p>
+
+								<div class="bucket-follow"><a class="btn" href="#">Learn about CC</a></div>
+							</div> <!--! end of "content" --> 
+						</div> <!--! end of "inner" -->
+						</div> <!--! end of "bucket" -->
+
+						</div> <!--! end of "five columns alpha" -->
+						<div class="six columns">
+							<div class="bucket">
+								<div class="inner">
+									<h3 class="title">License</h3>
+										<div class="content">
+										<h6>How can I license my work?</h6>
+										<p>Licensing your work so others can use it is simple. <strong>Just tell us a bit about yourself</strong> and what you are submitting.</p>
+
+										<p><strong>License here</strong> and we'll get you our famous CC logos for your work!</p>
+
+										<div class="bucket-follow"><a class="btn primary" href="#">Choose a License</a></div>
+									</div> <!--! end of "content" -->
+								</div> <!--! end of "inner" -->
+							</div> <!--! end of "bucket" -->
+						</div> <!--! end of "six columns" -->
+						<div class="five columns omega">
+							<div class="bucket">
+								<div class="inner">
+									<h3 class="title">Explore</h3>
+										<div class="content">
+										<h6>Looking to create?</h6>
+										<p>Looking for music, video, writing, code, or other creative works?</p><p><strong>Creative Commons has got you covered</strong>. Search for creative work through sources like Google and Flickr right here.</p>
+
+										<div class="bucket-follow"><a class="btn" href="#">Start Creating</a></div>
+									</div> <!--! end of "content" -->
+								</div> <!--! end of "inner" -->
+							</div> <!--! end of "bucket" -->
+						</div> <!--! end of "five columns omega" -->
+					</div> <!--! end of "short row" -->
+
+					<div class="tall row">
+						<div class="five columns alpha">
+							<div class="bucket">
+								<div class="inner">
+									<h3 class="title">Global Network</h3>
+									<div class="content">
+										<div class="sample">
+										</div>
+
+										<h5>CC Affiliate Network</h5>
+										<h6>Promoting CC Around the World</h6>
+
+										<p>The CC Affiliate Network consists of 100+ affiliates working working in over 70 jurisdictions to support and promote CC activities around the world.</p>
+
+										<p>The teams enage in public outreach, community building, translation, research, publicity, and in general, promoting sharing and our mission.</p>
+
+										<div class="bucket-follow"><a href="http://wiki.creativecommons.org/CC_Affiliate_Network">Explore the Affiliate Network...</a></div>
+									</div> <!--! end of "content" -->
+								</div> <!--! end of "inner" -->
+							</div> <!--! end of "bucket" -->
+						</div> <!--! end of "five columns alpha" -->
+
+						<div class="six columns">
+							<div class="bucket">
+								<div class="inner">
+									<h3 class="title">Case Studies</h3>
+									<div class="content">
+										<div id="case">
+										<div class="studies">
+											<div class="slide">
+											<div class="sample">
+												<img src="<?php bloginfo('stylesheet_directory'); ?>/img/120px-Aljazeera.svg.png" alt="Al Jazeera"/>
+											</div>
+
+											<h5>Al Jazeera</h5>
+											<h6>Satellite television network</h6>
+
+										<p>The Al Jazeera Creative Commons Repository hosts select broadcast quality footage that Al Jazeera has released under various Creative Commons licenses. Read our <a href="http://wiki.creativecommons.org/Case_Studies/Al_Jazeera"> case study for Al Jazeera</a></p>
+										</div>
+										<div class="slide">
+										<div class="sample">
+											<img src="<?php bloginfo('stylesheet_directory'); ?>/img/US-WhiteHouse-Logo.png" alt="Whitehouse.gov"/>
+										</div>
+
+										<h5>Whitehouse.gov</h5>
+										<h6>The official website of the President of the United States</h6>
+
+										<p>The official website of the Obama-Biden Administration incorporates a Creative Commons Attribution 3.0 Licence. Read <a href="http://wiki.creativecommons.org/Case_Studies/Whitehouse.gov">our case study for Whitehouse.gov</a></p>
+                                                                                        </div>
+
+										</div> <!--! end of "studies -->
+										</div> <!--! end of #case -->
+										<div class="bucket-follow"><a href="http://wiki.creativecommons.org/Case_Studies">Read more Case Studies...</a></div>
+									</div> <!--! end of "content" -->
+								</div> <!--! end of "inner" -->
+							</div> <!--! end of "bucket" -->
+						</div> <!--! end of "six columns" -->
+
+						<div class="five columns omega">
+							<div class="bucket">
+								<div class="inner">
+									<h3 class="title">CC Store</h3>
+									<div class="content">
+										<div class="sample">
+											<div id="store">
+												<div class="swag">
+													<div class="slide">
+														<a href="https://creativecommons.net/content/1-buttons-set-5">
+														<img src="<?php bloginfo('stylesheet_directory'); ?>/img/buttons_1_0_300x200.jpg" alt="CC Buttons" />
+														</a>
+													</div>
+                                                                                                        <div class="slide">
+                                                                                                                <a href="https://creativecommons.net/content/t-shirt-science">
+                                                                                                                <img src="<?php bloginfo('stylesheet_directory'); ?>/img/XKCD-Science-back_300x200.jpg" alt="T-shirt: Science at creativecommons" />
+                                                                                                                </a>
+                                                                                                        </div>
+													<div class="slide">
+														<a href="https://creativecommons.net/sites/default/files/imagecache/product_list/black-cc.jpg">
+														<img src="<?php bloginfo('stylesheet_directory'); ?>/img/black-cc_300x200.jpg" alt="T-Shirt: CC Logo" />
+														</a>
+													</div>
+
+												</div>
+											</div>
+										</div>
+
+										<h5>Support CC</h5>
+										<h6>Buy Swag and Goodies</h6>
+
+										<p>We have T-shirts, vinyl stikers, buttons and lapel pins.</p>
+
+										<div class="bucket-follow"><a href="https://creativecommons.net/store/">Visit the Store</a></div>
+									</div> <!--! end of "content" -->
+								</div> <!--! end of "inner" -->
+							</div> <!--! end of "bucket" -->
+						</div> <!--! end of "five columns omega" -->
+					</div> <!--! end of "tall row" -->

Copied: themes/creativecommons.org/trunk/homedev-carousel.php (from rev 15218, themes/creativecommons.org/trunk/home-carousel.php)
===================================================================
--- themes/creativecommons.org/trunk/homedev-carousel.php	                        (rev 0)
+++ themes/creativecommons.org/trunk/homedev-carousel.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -0,0 +1,69 @@
+					<div class="first row">
+						<div class="carousel bucket">
+							<div id="slides" class="inner">
+								<div class="slides_container row">
+									<div class="slide">
+										<div class="five columns alpha">
+											<div class="content">
+												<h6>A Culture of Sharing</h6>
+												<p>Creative Commons is building a culture of sharing.</p>
+												<p>By <strong>allowing your work to be available</strong> to millions of other creators on the web, you might be responsible for <strong>the next big thing.</strong></p>
+												<p>Learn more by <strong>watching this video</strong>!</p>
+
+												<div class="bucket-follow"><a class="primary btn" href="<?php bloginfo('home');?>/videos/a-shared-culture">Watch the Video</a></div>
+											</div> <!--! end of "content" -->
+										</div> <!--! end of "five columns alpha" -->
+										<div class="eleven columns omega">
+											<div class="film">
+												<a href="<?php bloginfo('home');?>/videos/a-shared-culture"><img src="<?php bloginfo('stylesheet_directory'); ?>/img/2251780221_5a21c2591a_o.jpg" alt="A Shared Culture" /></a>
+												<div class="caption">
+													<p>A Shared Culture is a short video about CC by renowned filmmaker Jesse Dylan. <a href="<?php bloginfo('home');?>/videos/a-shared-culture">Watch it now</a>.</p>
+												</div>
+											</div> <!--! end of "film" -->
+										</div> <!--! end of "eleven columns omega" -->
+									</div> <!--! end of "slide" -->
+									<div class="slide">
+										<div class="five columns alpha">
+											<div class="content">
+												<h6>Global Summit</h6>
+
+												<p>For three days from 16-18 September 2011, the Creative Commons Global Summit, <strong>Powering an Open Future</strong>, will bring together the CC community in Warsaw, Poland</p>
+
+												<p><strong>Registration for the Summit is open!</strong> You can register now.<p>
+												<div class="bucket-follow"><a class="primary btn" href="http://wiki.creativecommons.org/Global_Summit_2011">Learn more</a></div>
+											</div> <!--! end of "content" -->
+										</div> <!--! end of "five columns alpha" -->
+										<div class="eleven columns omega">
+											<div class="film">
+												<a href="http://wiki.creativecommons.org/Global_Summit_2011"><img src="<?php bloginfo('stylesheet_directory'); ?>/img/ccline.png" alt="Creative Commons Global Summit 2011" /></a>
+												<div class="caption">
+													<p>The CC Global Summit is taking place 16–17 September 2011 in Warsaw Poland. <a href="http://wiki.creativecommons.org/Global_Summit_2011">Learn more!</a></p>
+												</div>
+											</div><!--! end of "film" -->
+										</div><!--! end of "eleven columns omega" -->
+									</div> <!--! end of "slide" -->
+									<div class="slide">
+										<div class="five columns alpha">
+											<div class="content">
+												<h6>The Power of Open</h6>
+												<p>Stories of creators sharing knowledge, art, &amp; data.</p>
+												<p>The stories in <strong>The Power of Open</strong> demonstrate the breadth and creativity of the individuals and organizations using CC.</p>
+												<p>Learn more by <strong>reading the book</strong>!</p>
+
+												<div class="bucket-follow"><a class="primary btn" href="http://thepowerofopen.org/">Read the Book</a></div>
+											</div> <!--! end of "content" -->
+										</div> <!--! end of "five columns alpha" -->
+										<div class="eleven columns omega">
+											<div class="film">
+											<a href="<?php bloginfo('home');?>/weblog/entry/27742"><img src="<?php bloginfo('stylesheet_directory'); ?>/img/poo.jpg" alt="The Power of Open" /></a>
+												<div class="caption">
+													<p>The Power of Open: Stories of creators sharing knowledge, art, & data using Creative Commons. <a href="http://thepowerofopen.org/">Read it now</a>.</p>
+												</div>
+											</div><!--! end of "film" -->
+										</div><!--! end of "eleven columns omega" -->
+									</div> <!--! end of "slide" -->
+								</div> <!--! end of "slides_container row" --> 
+							</div> <!--! end of #slides -->
+						</div> <!--! end of "carousel bucket" -->
+					</div> <!--! end of "first row" -->
+

Modified: themes/creativecommons.org/trunk/index-head.php
===================================================================
--- themes/creativecommons.org/trunk/index-head.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/index-head.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,15 +1,3 @@
-
-			<div id="features" style="background:url(/images/splash/cc-org-banner-Thanks-widebg.jpg) no-repeat 50% 50% #d4eaed; height: 220px;">
-				<div class="container_16">
-					<div class="grid_10 prefix_3">
-						<div class="feature_text">
-						<h1>A big thank you to all of our supporters in 2010!</h1>
-						<h3>We need your continued support for the year ahead.</h3>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="clear"></div>
 <?php
 
 return;

Modified: themes/creativecommons.org/trunk/page-default.php
===================================================================
--- themes/creativecommons.org/trunk/page-default.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/page-default.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,38 +1 @@
-<?php include 'meta.php'; ?>
-<?php get_header(); ?>
-
-<?php 
-if (have_posts()) { 
-		the_post(); ?>
-
-<?php
-if (strcmp(get_post_meta($post->ID, "page_category", true), "about") == 0) {
-	$nav = wp_nav_menu(array('menu' => 'ABOUT', 'container_class' => 'subnav', 'echo' => false));
-
-	echo <<<HTML
-	<div class="container_16">$nav</div>
-HTML;
-}
-?>
-
-		<div id="title" class="container_16">
-			<?php edit_post_link("Edit This Page", '<p class="alignright edit">', '</p>'); ?>
-			<h1 class="grid_16">
-				<?php the_title(); ?>
-			</h1>
-		</div>
-
-		<div id="content">
-			<div class="container_16">
-				<div class="grid_12">
-					<?php the_content(); ?>
-				</div>
-			</div>
-			<div class="container_16"><div class="grid_16 edit"><?php edit_post_link("Edit This Page", '<p>', '</p>'); ?></div>
-		</div>
-
-<?php 
-} 
-?>
-	</div>
-<?php get_footer(); ?>
+<?php include 'page.php'; ?>

Modified: themes/creativecommons.org/trunk/page-home.php
===================================================================
--- themes/creativecommons.org/trunk/page-home.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/page-home.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -8,9 +8,9 @@
 	}
 }
 ?>
-<?php include 'header-top.php';?>
+<?php get_header(); ?>
 <?php the_post(); ?>
-<body class="home">
+<body>
 	<div id="container">
         <?php include 'page-nav.php'; ?>
 

Added: themes/creativecommons.org/trunk/page-homedev.php
===================================================================
--- themes/creativecommons.org/trunk/page-homedev.php	                        (rev 0)
+++ themes/creativecommons.org/trunk/page-homedev.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Template Name: HOME DEV PAGE
+ *
+ */
+// search handler
+if ($_GET['stype']) {
+	if ($_GET['stype'] == "content") {
+		header("Location: http://search.creativecommons.org/?q=" . $_GET['q']);
+	} else {
+		header("Location: /?s=" . $_GET['q']);
+	}
+}
+?>
+<?php get_header(); ?>
+<?php the_post(); ?>
+<body>
+	<div id="container">
+        <?php include 'page-nav.php'; ?>
+
+        <div id="main" role="main">
+            <div class="container">
+                <div class="sixteen columns">
+                <?php 
+                    // if ( $_SERVER["REQUEST_URI"] == '/' ||
+                    //      $_SERVER["REQUEST_URI"] == '/index.php' ) {
+                        include 'homedev-carousel.php'; 
+                        include 'homedev-buckets.php'; 
+
+                    // } else { 
+                    ?>
+
+			<?php // the_content(); ?>
+			<?php // edit_post_link("Edit This Page", '<p class="edit">', '</p>'); ?>
+            <?php // } ?>
+
+                </div>
+            </div><!--! end of .container -->
+		</div><!--! end of #main -->
+
+<?php get_footer(); ?>
+

Deleted: themes/creativecommons.org/trunk/page-nav-clean.php
===================================================================
--- themes/creativecommons.org/trunk/page-nav-clean.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/page-nav-clean.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,125 +0,0 @@
-		<header> 
-		
-		<div class="topbar">
-			<div class="topbar-inner">
-				<div class="container">
-				<a id="skip-navigation" href="#start-content" title="Skip Navigation">Skip Navigation</a>
-				<a href="http://creativecommons.org" title="Home"><span id="home-link">Home</span><span id="home-button"></span></a>
-				<div id="logo"><span>Creative Commons</span></div>
-					<ul id="short-menu" class="nav">
-						<li class="dropdown">
-							<a href="#about" class="dropdown-toggle">Menu</a>
-								<ul class="menu-dropdown">
-									<li><a href="http://creativecommons.org/about">About</a></li>
-									<li><a href="http://creativecommons.org/licenses/">Licenses</a></li>
-									<li><a href="http://creativecommons.org/about/cc0">Public Domain</a></li>
-									<li><a href="https://creativecommons.net/donate/">Support CC</a></li>
-									<li><a href="http://creativecommons.org/culture">Projects</a></li>
-									<li><a href="http://creativecommons.org/weblog">News</a></li>
-								</ul>
-						</li>
-					</ul>
-					<ul id="wide-menu" class="nav">
-				    <li class="dropdown">
-				    	<a href="http://creativecommons.org/about" class="dropdown-toggle">About</a>
-				    	<ul class="menu-dropdown">
-						    <li><a href="http://creativecommons.org/about">Our Mission</a></li>
-						    <li><a href="https://creativecommons.org/about/history">History of CC</a></li>
-						    <li class="divider"></li>
-						    <li><a href="http://creativecommons.org/who-uses-cc">Who Uses CC?</a></li>
-						    <li><a href="http://wiki.creativecommons.org/Case_Studies">Case Studies</a></li>
-						    <li><a href="http://creativecommons.org/videos/">Videos about CC</a></li>
-						    <li class="divider"></li>
-						    <li><strong><span>The Team</span></strong></li>
-						    <li><a href="https://creativecommons.org/board">Board of Directors</a></li>
-						    <li><a href="https://creativecommons.org/staff">Staff</a></li>
-						    <li><a href="https://creativecommons.org/fellows">Fellows</a></li>
-						    <li><a href="http://wiki.creativecommons.org/CC_Affiliate_Network">Affiliate Network</a></li>
-						    <li><a href="https://creativecommons.org/opportunities">Job Opportunities</a></li>
-						    <li class="divider"></li>
-						    <li><a href="http://wiki.creativecommons.org/FAQ">Frequently Asked Questions</a></li>
-						    <li><a href="http://creativecommons.org/contact">Contact Us</a></li>
-						    
-				      </ul>
-				    </li>
-				    <li class="dropdown">
-				    	<a href="http://creativecommons.org/licenses/" class="dropdown-toggle">Licenses</a>
-				    	<ul class="menu-dropdown">
-						    <li><a href="http://creativecommons.org/licenses/">About the Licenses</a></li>
-						    <li><a href="http://creativecommons.org/choose/">Choose a License</a></li>
-						    <li><a href="http://labs.creativecommons.org/demos/search/?beta=1">Find Licensed Content</a></li>
-						    <li><a href="http://wiki.creativecommons.org/Marking">HOWTO Use Licensed Content</a></li>
-						    <li class="divider"></li>
-						    <li><span>Licensors</span></li>
-						    <li><a href="http://wiki.creativecommons.org/FAQ#Do_I_need_to_sign_something_or_register_to_obtain_a_Creative_Commons_license.3F">Do I need to register my work?</a></li>
-						    <li><a href="http://wiki.creativecommons.org/Marking/Creators">Marking my work with CC licenses</a></li>
-						    <li class="divider"></li>
-						    <li><span>Licensees</span></li>
-						    <li><a href="http://wiki.creativecommons.org/FAQ#Will_Creative_Commons_give_me_permission_to_use_a_work.3F">Getting permission</a></li>
-						    <li><a href="http://wiki.creativecommons.org/FAQ#How_do_I_properly_attribute_a_Creative_Commons_licensed_work.3F">Giving attribution</a></li>
-						    <li><a href="http://wiki.creativecommons.org/Marking/Users">Marking work with CC licenses</a></li>
-						    <li class="divider"></li>
-						    <li><span>Developers</span></li>
-						    <li><a href="http://wiki.creativecommons.org/Integrate">App Integration</a></li>
-						    <li><a href="http://wiki.creativecommons.org/Developer_Challenges">Developer Challenges</a></li>
-						    <li><a href="http://wiki.creativecommons.org/Translate">Translation</a></li>
-				      </ul>
-				    </li>
-				    <li class="dropdown">
-				    	<a href="http://creativecommons.org/about/cc0" class="dropdown-toggle">Public Domain</a>
-				    	<ul class="menu-dropdown">
-						    <li><a href="http://creativecommons.org/about/cc0">About CC0 Public Domain Dedication</a></li>
-						    <li><a href="http://creativecommons.org/choose/zero/">Choose CC0 Public Domain Dedication </a></li>
-						    <li class="divider"></li>
-						    <li><a href="http://creativecommons.org/about/pdm">About Public Domain Mark</a></li>
-						    <li><a href="http://creativecommons.org/choose/mark/">Use Public Domain Mark</a></li>
-						 </ul>
-				    </li>
-				    
-				    <li class="dropdown">
-				    	<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 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/corporate/">Corporate Giving</a></li>
-				    		<li><a href="https://creativecommons.net/figures/">Facts &amp; Figures </a></li>
-				    	</ul>
-				    </li>
-				    
-				    <li class="dropdown">
-				    	<a href="http://creativecommons.org/culture" class="dropdown-toggle">Projects</a>
-				    	<ul class="menu-dropdown">
-						    <li><a href="http://creativecommons.org/culture">Culture</a></li>
-						    <li><a href="http://creativecommons.org/education">Education</a></li>
-						    <li><a href="http://creativecommons.org/science">Science</a></li>
-						    <li><a href="http://creativecommons.org/government">Government</a></li>
-						    <li class="divider"></li>
-						    <li><a href="http://wiki.creativecommons.org/LRMI">Learning Resource Metadata Initiative (LRMI) </a></li>
-						    <li><a href="http://creativecommons.org/taa-grant-program">Gates OPEN</a></li>
-				      </ul>
-				    </li>
-				    <li class="dropdown">
-				    <a href="http://creativecommons.org/weblog" class="dropdown-toggle">News</a>
-				    	<ul class="menu-dropdown">
-						    <li><a href="http://creativecommons.org/weblog">Blog</a></li>
-						    <li class="divider"></li>
-						    <li><a href="http://creativecommons.org/interviews">Interviews</a></li>
-						    <li><a href="http://wiki.creativecommons.org/Events">Events</a></li>
-						    <li><a href="https://creativecommons.net/civicrm/mailing/subscribe?reset=1&gid=121">CC Newsletter</a></li>
-						    <li class="divider"></li>
-						    <li><a href="http://creativecommons.org/about/press">Press Room</a></li>
-						 </ul>
-					</li>
-				</ul>
-				<form action="/" id="search_form">
-					<input type="hidden" name="stype" value="site" id="find_site" />
-					<input type="text" name="q" placeholder="Search" />
-					<input type="submit" id="glass" title="Search" value="Submit">
-				</form>
-				</div>
-			</div>
-		</div>
-
-		</header>

Added: themes/creativecommons.org/trunk/page-two-column.php
===================================================================
--- themes/creativecommons.org/trunk/page-two-column.php	                        (rev 0)
+++ themes/creativecommons.org/trunk/page-two-column.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Template Name: Two Columns
+ *
+ */
+get_header(); 
+?>
+<body>
+	<div id="container">
+        <?php include 'page-nav.php'; ?>
+
+        <div id="main" role="main">
+            <div class="container">
+                <div class="sixteen columns">
+<?php 
+if (have_posts()) { 
+		the_post(); ?>
+
+		            <div class="first row">
+                        <h1><?php the_title(); ?></h1>
+                    </div><!--! end of "first row" -->
+                    <div class="row"><!-- for about page -->
+                        <div class="eight columns alpha"><!-- for about page -->
+			            <?php the_content(); ?>
+			            <?php edit_post_link("Edit This Page", '<p>', '</p>'); ?>
+                        </div>
+                        <?php
+                        $second_column = get_post_meta( $post->ID, 'second_column', true );
+
+                        if ( !empty($second_column) ) :
+                        ?>
+                        <div class="eight columns omega">
+                        <?php echo $second_column; ?>
+                        </div>
+                        <?php endif; ?>
+
+                    </div>
+<?php } ?>
+                </div>
+            </div><!--! end of .container -->
+		</div><!--! end of #main -->
+<?php get_footer(); ?>

Added: themes/creativecommons.org/trunk/page-video-grid.php
===================================================================
--- themes/creativecommons.org/trunk/page-video-grid.php	                        (rev 0)
+++ themes/creativecommons.org/trunk/page-video-grid.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Template Name: Video Grid
+ *
+ */
+get_header(); 
+?>
+<body>
+	<div id="container">
+        <?php include 'page-nav.php'; ?>
+
+        <div id="main" role="main">
+            <div class="container">
+                <div class="sixteen columns">
+<?php 
+if (have_posts()) { 
+		the_post(); ?>
+
+		            <div class="first row">
+                        <h1><?php the_title(); ?></h1>
+                    </div><!--! end of "first row" -->
+                    <div class="row"><!-- for about page -->
+			            <?php the_content(); ?>
+			            <?php edit_post_link("Edit This Page", '<p>', '</p>'); ?>
+
+                    </div>
+<?php } ?>
+                </div>
+            </div><!--! end of .container -->
+		</div><!--! end of #main -->
+<?php get_footer(); ?>

Modified: themes/creativecommons.org/trunk/page.php
===================================================================
--- themes/creativecommons.org/trunk/page.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/page.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -1,34 +1,26 @@
 <?php get_header(); ?>
+<body>
+	<div id="container">
+        <?php include 'page-nav.php'; ?>
 
+        <div id="main" role="main">
+            <div class="container">
+                <div class="sixteen columns">
 <?php 
 if (have_posts()) { 
 		the_post(); ?>
 
-<?php
-if (strcmp(get_post_meta($post->ID, "page_category", true), "about") == 0) {
-	$nav = wp_nav_menu(array('menu' => 'ABOUT', 'container_class' => 'subnav', 'echo' => false));
-
-	echo <<<HTML
-	<div class="container_16">$nav</div>
-HTML;
-}
-?>
-
-		<div id="title" class="container_16">
-			<?php edit_post_link("Edit This Page", '<p class="alignright edit">', '</p>'); ?>
-			<h1 class="grid_16">
-				<?php the_title(); ?>
-			</h1>
-		</div>
-
-		<div id="content">
-			<?php the_content(); ?>
-
-			<div class="container_16"><div class="grid_16 edit"><?php edit_post_link("Edit This Page", '<p>', '</p>'); ?></div>
-		</div>
-
-<?php 
-} 
-?>
-	</div>
+		            <div class="first row">
+                        <h1><?php the_title(); ?></h1>
+                    </div><!--! end of "first row" -->
+                    <div class="row"><!-- for about page -->
+                        <div class="twelve columns alpha"><!-- for about page -->
+			            <?php the_content(); ?>
+			            <?php edit_post_link("Edit This Page", '<p>', '</p>'); ?>
+                        </div>
+                    </div>
+<?php } ?>
+                </div>
+            </div><!--! end of .container -->
+		</div><!--! end of #main -->
 <?php get_footer(); ?>

Modified: themes/creativecommons.org/trunk/search.php
===================================================================
--- themes/creativecommons.org/trunk/search.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/search.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -6,11 +6,10 @@
         <div id="main" role="main">
             <div class="container">
                 <div class="sixteen columns">
-                <h1>Search Results</h1>
+                    <div class="first row">
+                        <h1>Search Results</h1>
 
 		<div>
-			<div class="container_16">
-				<div class="grid_12">
 					<div id="cse" style="padding-bottom: 25px; width: 100%;"><h3><img src="/wp-content/themes/cc5/images/loading.gif" alt="Loading" style="margin-bottom:-6px;" /> Loading search...</h3></div>
 					<script src="http://www.google.com/jsapi" type="text/javascript"></script>
 					<script type="text/javascript">
@@ -23,8 +22,6 @@
 						}, true);
 					</script>
 					<link rel="stylesheet" href="/wp-content/themes/cc5/google-cse.css" type="text/css" />
-				</div>
-			</div>
 		</div>
 
 	</div>

Modified: themes/creativecommons.org/trunk/single.php
===================================================================
--- themes/creativecommons.org/trunk/single.php	2011-09-12 15:23:01 UTC (rev 15220)
+++ themes/creativecommons.org/trunk/single.php	2011-09-12 16:31:35 UTC (rev 15221)
@@ -8,6 +8,13 @@
   exit();
 } ?>
 <?php get_header(); ?>
+<body>
+	<div id="container">
+        <?php include 'page-nav.php'; ?>
+
+        <div id="main" role="main">
+            <div class="container">
+                <div class="sixteen columns">
 <?php
 // check if this single is a commoner or blog post
 $is_commoner = (in_category(7) ? true : false);
@@ -21,44 +28,38 @@
 }
 ?>
 
-<div id="title" class="container_16">
-
+<div class="first row">
 	<?php edit_post_link("Edit This Post", '<p class="alignright edit">', '</p>'); ?>
-	<? if ($is_commoner) { ?>
+	<?php if ($is_commoner) { ?>
 	<h3 class="category">
-		<? $cat = get_the_category(); (count($cat) > 1) ? $cat = $cat[0] : $cat = $cat[0]; ?>
+		<?php $cat = get_the_category(); (count($cat) > 1) ? $cat = $cat[0] : $cat = $cat[0]; ?>
 		<a href="<?php echo get_option('home') . "/" . $cat->category_nicename . "/"; ?>">
-		<? echo $cat->cat_name; ?>
+		<?php echo $cat->cat_name; ?>
 		</a>
 	</h3>
-	<? } else if ($is_blog) { ?>
+	<?php } else if ($is_blog) { ?>
 	<h3 class="category">
 		<a href="<?php echo get_category_link(1);?>">
 			News
 		</a>
 	</h3>
-	<? } else if ($category_name == "press-releases") { ?>
+	<?php } else if ($category_name == "press-releases") { ?>
 	<h3 class="category">
 		<a href="<?php echo get_settings('home') . "/" ?>press-releases/">
 			Press Releases
 		</a>
 	</h3>
-	<? } ?>
+	<?php } ?>
 
-	<h1 class="grid_16">
-		<?php the_title(); ?>
-	</h1>
-	
-	<h4 class="grid_16 meta"><?php the_author() ?>, <?php the_time('F jS, Y')?></h4>
+    <h1><?php the_title(); ?></h1>
+	<h4><?php the_author() ?>, <?php the_time('F jS, Y')?></h4>
 </div>
 
-<div id="content">
-	<div class="container_16">
-		<div class="grid_12" id="post-<?php the_ID(); ?>">
+<div class="row" id="post-<?php the_ID(); ?>">
 			<?php the_content(); ?>
 
 			<div class="twitter">
-				<? /* FIXME: use official buttons here, include facebook */ ?>
+				<?php /* FIXME: use official buttons here, include facebook */ ?>
 				<a href="http://twitter.com/home?status=<?php the_title() ?> - <?php the_permalink() ?> via @creativecommons">Share on Twitter</a>
 				<a href="http://identi.ca/?action=newnotice&amp;status_textarea=<?php the_title() ?>%20-%20<?php the_permalink() ?>%20via%20 at creativecommons">Share on Identi.ca</a>
 			</div>
@@ -70,9 +71,10 @@
 			<?php } ?>
 
 			<div class="comments"><?php if ($is_blog) comments_template(); ?></div>
-		</div>
-	</div>
 </div>
 
+                </div>
+            </div><!--! end of .container -->
+		</div><!--! end of #main -->
+
 <?php get_footer(); ?>
-



More information about the cc-commits mailing list