Merge lp:~daimoneze/osdf/wp-theme into lp:osdf/wp

[Toast McFarland]

Final draft of the Valentines theme.

[Andrew Ettinger (sillydeveloper)]

review: Approve

[Toast McFarland (daimoneze)]

Alright, she's live.

Andrew, there were some conflicts with bzr that I was not able to
resolve. To get the site to display properly and not have to take it
down, I simply resolved the problems manually (it had some issue with
header.php). Get with me when you have some time so we can talk more
about bzr and how to get around these problems.

On 1/25/2011 1:03 PM, <email address hidden> wrote:
> The proposal to merge lp:~daimoneze/osdf/wp-theme into lp:osdf/wp has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
> https://code.launchpad.net/~daimoneze/osdf/wp-theme/+merge/47395

=== modified file 'footer.php'
--- footer.php	2010-12-12 16:16:34 +0000
+++ footer.php	2011-01-25 14:01:58 +0000
@@ -1,8 +1,8 @@
 </div>
 <div id="footer">
-	<img src="<?php bloginfo('template_directory'); ?>/images/footer_logo.gif" alt="" title="" width="61" height="61" class="left" />
+	<img src="<?php bloginfo('template_directory'); ?>/images/OSDFLogo_footer.png" alt="" title="" width="61" class="left" id="logo_footer" />
 	<div class="left_footer">
-		Open Source Democracy Foundation &copy; 2010
+		&lt;&#47; The Open Source Democracy Foundation &gt; &copy; 2010
 	</div>
 	<!-- div class="right_footer">
 		<a href="/index.php">Home</a> |

=== added file 'front-page.php.bak'
--- front-page.php.bak	1970-01-01 00:00:00 +0000
+++ front-page.php.bak	2011-01-25 14:01:58 +0000
@@ -0,0 +1,64 @@
+<?php get_header(); ?>
+<div class="boxes_tab">
+				<div class="box">
+					<div class="full_box_text">
+						<h2><a href="about">About Us</a></h2>
+						<p class="full_box_text">
+							The Open Source Democracy Foundation is committed to improving our government by harnessing the Internet as a tool for education and advocacy.
+						</p>
+					</div>
+				</div>
+				
+				<div class="box">
+					<img title="" alt="" class="left_img" src="<?php bloginfo('template_directory'); ?>/images/calendar_icon.gif"/>
+					<div class="box_text">
+						<h2><a href="http://www.r-pac.org/blog" target="new">Speak Up</a></h2>
+						<p class="box_text">
+                            Join the discussion on <a href="http://reddit.com/r/rpac">Reddit</a>!
+						</p>
+					</div>
+				</div>            
+				<div class="box">
+					<img width="96" height="99" title="" alt="" class="left_img" src="<?php bloginfo('template_directory'); ?>/images/icon3.png"/>
+					<div class="box_text">
+						<h2><a href="/policy">Net Neutrality</a></h2>
+						<p class="box_text">
+							The OSDF is<br/>currently<br/>advocating<br/>Net Neutrality.
+						</p>
+					</div>
+				</div>            
+			</div>
+			
+<div class="home" id="center_big_box">
+	<?php query_posts('showposts=1'); ?>
+		<?php /* Ze Loop */ ?>
+		<?php while (have_posts()) : the_post(); ?>
+			<div id="excerpt_wrap">
+				<?php the_title('<h3>','</h3>'); ?>
+				<?php global $more; $more = 0; the_content('<br/>Read more...'); ?>
+			</div>
+		<?php endwhile;?>
+</div>
+
+<div class="bottom_content">
+				<div class="left_signup_box">
+					<div class="left_form_content">
+						<iframe width="220" height="250" frameborder="0" scrolling="no" marginwidth="0" marginheight="0" src="https://spreadsheets.google.com/embeddedform?formkey=dDZZMVpPNlR5dC1RYXZJOWVBRUctMmc6MQ">Loading...</iframe>
+					</div>
+				</div>
+				<div class="left_box">
+					<h3>Help OSDF</h3>
+					<div class="left_text_content">
+						<p>          
+							The OSDF relies on the help of the public to make an impact, so if you enjoy working with others for a good cause, please visit our <a href="/volunteer">volunteer</a> page!<br/><br/>
+						
+							If you are unable to volunteer your time, please consider showing your support by signing up on the left or by visiting our full <a href="signup">Sign Up</a> page.
+						</p>
+						<p style="text-align: center;">
+							<a href="donate"><img alt="Donate" border="0" src="<?php bloginfo('template_directory'); ?>/images/donate.jpg"/></a>
+						</p>
+					</div>
+				</div>
+</div> <!-- big block -->
+<?php get_sidebar(); ?>
+<?php get_footer(); ?>
\ No newline at end of file

=== modified file 'header.php'
--- header.php	2011-01-19 23:34:20 +0000
+++ header.php	2011-01-25 14:01:58 +0000
@@ -49,13 +49,14 @@
     	<div id="main_container">
     		<div id="header">
     			<div id="logo">
-    				<a href="<?php bloginfo('url'); ?>"><img src="<?php bloginfo('template_directory'); ?>/images/logo2.png" alt="" title="" border="0" width="289" height="100" /></a>
+    				<a href="<?php bloginfo('url'); ?>"><img src="<?php bloginfo('template_directory'); ?>/images/OSDFLogo_header.png" alt="" title="" border="0" height="100%" /></a>
     			</div>
     			<div class="top_phone">
-    				<img src="<?php bloginfo('template_directory'); ?>/images/phone_arrows.png" alt="" title="" class="left" width="49" height="32" />
-    				<div class="phone_text">
+    				&lt;/ The Open Source Democracy Foundation &gt;
+    				<!-- Don't forget to get rid of my css first :) 
+					div class="phone_text">
     					The Open Source<br/>Democracy Foundation
-    				</div>
+    				</div -->
     			</div>
     			   
 					<?php wp_nav_menu( array( 'menu' => 'header' ) ); ?><div class="clear"></div>

=== added file 'images/OSDFLogo1.png'
Binary files images/OSDFLogo1.png	1970-01-01 00:00:00 +0000 and images/OSDFLogo1.png	2011-01-25 14:01:58 +0000 differ
=== added file 'images/OSDFLogo2.png'
Binary files images/OSDFLogo2.png	1970-01-01 00:00:00 +0000 and images/OSDFLogo2.png	2011-01-25 14:01:58 +0000 differ
=== added file 'images/OSDFLogo_1.png'
Binary files images/OSDFLogo_1.png	1970-01-01 00:00:00 +0000 and images/OSDFLogo_1.png	2011-01-25 14:01:58 +0000 differ
=== added file 'images/OSDFLogo_footer.png'
Binary files images/OSDFLogo_footer.png	1970-01-01 00:00:00 +0000 and images/OSDFLogo_footer.png	2011-01-25 14:01:58 +0000 differ
=== added file 'images/OSDFLogo_header.png'
Binary files images/OSDFLogo_header.png	1970-01-01 00:00:00 +0000 and images/OSDFLogo_header.png	2011-01-25 14:01:58 +0000 differ
=== added file 'images/osdfheaderchunk.png'
Binary files images/osdfheaderchunk.png	1970-01-01 00:00:00 +0000 and images/osdfheaderchunk.png	2011-01-25 14:01:58 +0000 differ
=== modified file 'images/the_love_birds.jpg'
Binary files images/the_love_birds.jpg	2011-01-17 16:48:48 +0000 and images/the_love_birds.jpg	2011-01-25 14:01:58 +0000 differ
=== modified file 'style.css'
--- style.css	2011-01-08 15:45:31 +0000
+++ style.css	2011-01-25 14:01:58 +0000
@@ -36,7 +36,7 @@
 }
 
 h2 {
-    color: #25AAE1;
+    color: #000;
     font-size: 14px;
     font-weight: normal;
     margin: 0;
@@ -44,7 +44,7 @@
 }
 
 h2 a {
-    color: #25AAE1;
+    color: #000;
     font-size: 14px;
     font-weight: normal;
     margin: 0;
@@ -53,7 +53,7 @@
 }
 
 h3 {
-    color: #25AAE1;
+    color: #000;
     font-size: 15px;
     font-weight: normal;
     margin: 0;
@@ -68,23 +68,24 @@
 }
 
 #header {
-    background: url("images/header_bg.jpg") repeat-x scroll 0 0 transparent;
+    background: url(images/bg.png) repeat-x #2f2f2f;
     height: 138px;
     margin: auto;
     width: 880px;
 }
 
 #logo {
+	height:93%;
     float: left;
-    padding: 38px 0 0 30px;
+    padding: 5px 0 0 65px;
 }
 
 .top_phone {
     color: #FFFFFF;
     float: right;
-    height: 89px;
-    padding: 10px 0 0;
-    width: 280px;
+    padding: 44px 59px 19px;
+    width: 60%;
+	font:normal 28px "Times New Roman",times,serif;
 }
 
 .phone_text {
@@ -156,17 +157,16 @@
 }
 
 .menu-header-container a:hover {
-    background: url("images/bt_bg.gif") center center transparent;
-    color: #d34124;
+    background: url("images/osdfheaderchunk.png") center center transparent;
+    color: #fff;
 }
 
 #menu-header li.current-menu-item {
-    background: url("images/bt_bg.gif") center center transparent;
-    color: #d34124;
+    color: red;
 }
 
 #menu-header li.current-menu-item a {
-    color: #d34124;
+    color: red;
 }
 
 #menu-header li {
@@ -194,7 +194,7 @@
 }
 
 ul#menu-footer li a {
-    color: #50A6C7;
+    color: #000;
     padding: 0;
     text-decoration: none;
     font-size: 10px;
@@ -460,16 +460,21 @@
 
 #footer {
     background-color: #E7E6E1;
-    color: #D94923;
+    color: #000;
     height: 70px;
     width: 880px;
     margin: 0 auto;
 }
 
+#logo_footer{
+	height:62px;
+	padding:5px 15px 0 18px;
+}
+
 .left_footer {
     float: left;
-    padding: 25px 0 0 10px;
-    width: 250px;
+    padding: 31px 0 0 10px;
+    width: 301px;
 }
 
 .right_footer {
@@ -479,7 +484,7 @@
 }
 
 .right_footer a {
-    color: #50A6C7;
+    color: #000;
     padding: 0;
     text-decoration: none;
 }
@@ -487,20 +492,18 @@
 .right_footer a:hover {
     text-decoration: underline;
 }
-
 h1.entry-title {
-    color: #25AAE1;
+    color: #000;
     display: block;
     width: 100%;
-    font-size: 22px;
+    font:bold 22px "Courier New",monospace;
 }
 h2.entry-title a{
-	color: #25aae1;
+	color: #000;
 	display: block;
 	width: 100%;
-	font-size: 22px;
-	font-weight: bold;
 	padding: 0;
+	font:bold 22px "Courier New",monospace;
 }
 h2.entry-title {padding: 0;}
 
@@ -568,7 +571,7 @@
     display: none;
 }
 #form-allowed-tags {
-	color: #D94923;
+	color: #000;
 }
 .edit-link{
 	margin: 10px 0 0;

=== modified file 'val_style.css'
--- val_style.css	2011-01-19 23:03:15 +0000
+++ val_style.css	2011-01-25 14:01:58 +0000
@@ -34,39 +34,24 @@
 	background:url(images/the_love_birds.jpg) no-repeat 0 0;
 	height:336px;
 	width:550px;
+	clear:both;
+	padding-bottom:15px;
 }
 img#love_birds{
 	width:550px;
 }
 #content_left{
-    float: left;
-	width:43%;
-	padding-left:47px;
 }
 #content_right{
     float: right;
 	width:42%;
-	padding-top: 20px;
+	padding: 10px 0 0 30px;
 }
 div#content_left h3{
 	color:red;
 }
-#footer{
-	margin:0 auto;
-}
-ul.footer{
-	list-style-type:none;
-	text-align:center;
-}
-li.footer{
-	display:inline;
-	width:auto;
-	border-right:solid 1px;
-	padding:0 10px;
-}
-li.footer_last{
-	border:none;
-	padding:0 10px;
-	display:inline;
-	width:auto;
+#val_about{
+	background: #CFCFCF;
+    margin-top: 25px;
+    padding: 15px;
 }
\ No newline at end of file