osdf-devteam team mailing list archive

[Toast <daimoneze@xxxxxxxxx>]

Toast has proposed merging lp:~daimoneze/osdf/wp-theme into lp:osdf/wp.

Requested reviews:
  OSDF Dev Team (osdf-devteam)


Fixed an issue with relative paths. 
-- 
https://code.launchpad.net/~daimoneze/osdf/wp-theme/+merge/43473
Your team OSDF Dev Team is requested to review the proposed merge of lp:~daimoneze/osdf/wp-theme into lp:osdf/wp.

=== modified file 'footer.php'
--- footer.php	2010-12-11 03:07:58 +0000
+++ footer.php	2010-12-12 16:19:09 +0000
@@ -1,6 +1,6 @@
 </div>
 <div id="footer">
-	<img src="images/footer_logo.gif" alt="" title="" width="61" height="61" class="left" />
+	<img src="<?php bloginfo('template_directory'); ?>/images/footer_logo.gif" alt="" title="" width="61" height="61" class="left" />
 	<div class="left_footer">
 		Open Source Democracy Foundation &copy; 2010
 	</div>

=== modified file 'front-page.php'
--- front-page.php	2010-12-11 03:00:39 +0000
+++ front-page.php	2010-12-12 16:19:09 +0000
@@ -10,7 +10,7 @@
 				</div>
 				
 				<div class="box">
-					<img title="" alt="" class="left_img" src="images/calendar_icon.gif"/>
+					<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">
@@ -19,7 +19,7 @@
 					</div>
 				</div>            
 				<div class="box">
-					<img width="96" height="99" title="" alt="" class="left_img" src="images/icon3.png"/>
+					<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.php">Net Neutrality</a></h2>
 						<p class="box_text">
@@ -58,7 +58,7 @@
 							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.php">Sign Up</a> page.
 						</p>
 						<p style="text-align: center;">
-							<a href="donate.php"><img alt="Donate" border="0" src="images/donate.jpg"/></a>
+							<a href="donate.php"><img alt="Donate" border="0" src="<?php bloginfo('template_directory'); ?>/images/donate.jpg"/></a>
 						</p>
 					</div>
 				</div>

=== modified file 'header.php'
--- header.php	2010-12-11 03:07:58 +0000
+++ header.php	2010-12-12 16:19:09 +0000
@@ -26,10 +26,10 @@
     	<div id="main_container">
     		<div id="header">
     			<div id="logo">
-    				<a href="index.php"><img src="images/logo2.png" alt="" title="" border="0" width="289" height="100" /></a>
+    				<a href="index.php"><img src="<?php bloginfo('template_directory'); ?>/images/logo2.png" alt="" title="" border="0" width="289" height="100" /></a>
     			</div>
     			<div class="top_phone">
-    				<img src="images/phone_arrows.png" alt="" title="" class="left" width="49" height="32" />
+    				<img src="<?php bloginfo('template_directory'); ?>/images/phone_arrows.png" alt="" title="" class="left" width="49" height="32" />
     				<div class="phone_text">
     					The Open Source<br/>Democracy Foundation
     				</div>
@@ -37,5 +37,5 @@
     			   
 					<?php wp_nav_menu( array( 'menu' => 'header' ) ); ?><div class="clear"></div>
         					        
-    		</div><script type="text/javascript">$(function() {  $('#home_link').addClass('nav_selected'); });</script>
+    		</div><script type="text/javascript">//$(function() {  $('#home_link').addClass('nav_selected'); });</script>
     		<div id="main_content">
\ No newline at end of file

=== modified file 'page.php'
--- page.php	2010-12-11 03:07:58 +0000
+++ page.php	2010-12-12 16:19:09 +0000
@@ -6,7 +6,7 @@
 <?php the_post(); ?>
    
     <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-     <h1 class="entry-title"><?php the_title(); ?></h1>
+     <!-- Don't show page title <h1 class="entry-title"><?php //the_title(); ?></h1> -->
      <div class="entry-content">
 <?php the_content(); ?>
 <?php wp_link_pages('before=<div class="page-link">' . __( 'Pages:', 'osdf' ) . '&after=</div>') ?>    

=== modified file 'style.css'
--- style.css	2010-12-11 04:02:11 +0000
+++ style.css	2010-12-12 16:19:09 +0000
@@ -1,7 +1,7 @@
 /*
  Theme Name: Open Source Democracy Foundation
  Theme URI: /osdf/wp-content/themes/osdf
- Description: A search engine optimized website framework for WordPress for the OSDF. lp:~daimoneze/osdf/wp-theme
+ Description: A search engine optimized website framework for WordPress for the OSDF. lp:~daimoneze/osdf/wp
  Author: Andrew Ettinger and Toast McFarland
  Version: 2.0
  .