osdf-devteam team mailing list archive

[Toast <daimoneze@xxxxxxxxx>]

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

Requested reviews:
  OSDF Dev Team (osdf-devteam)


Re-merge fix (relative paths, css, et al.)
-- 
https://code.launchpad.net/~daimoneze/osdf/wp-theme-fix/+merge/43158
Your team OSDF Dev Team is requested to review the proposed merge of lp:~daimoneze/osdf/wp-theme-fix into lp:osdf/wp.

=== modified file 'footer.php'
--- footer.php	2010-12-09 04:00:58 +0000
+++ footer.php	2010-12-09 04:32:59 +0000
@@ -10,6 +10,7 @@
 		<a href="/action">Action</a> |
 		<a href="/volunteer">Help</a> |
 		<a href="/contact">Contact</a>
+		<?php wp_nav_menu( array( 'menu' => 'footer' ) ); ?>
 	</div>
 </div>
 </div>

=== modified file 'functions.php'
--- functions.php	2010-12-08 22:21:58 +0000
+++ functions.php	2010-12-09 04:32:59 +0000
@@ -8,6 +8,18 @@
 if ( is_readable($locale_file) )
  require_once($locale_file);
  
+// support menus:
+add_action( 'init', 'register_my_menus' );
+ 
+function register_my_menus() {
+    register_nav_menus(
+        array(
+            'header' => __( 'header' ),
+            'footer' => __( 'footer' )
+        )
+    );
+}
+ 
 // Get the page number
 function get_page_number() {
     if ( get_query_var('paged') ) {

=== modified file 'header.php'
--- header.php	2010-12-09 04:00:58 +0000
+++ header.php	2010-12-09 04:32:59 +0000
@@ -40,12 +40,23 @@
     					 <li><a href="/blog" id='home_link' class="nav_selected">News</a></li>
     					 <li><a href="/about" id='about_link' class="nav">About</a></li>
     					 <!--li><a target="new" id='updates_link' href="http://www.r-pac.org/blog"; class="nav">Updates</a></li-->
-
+                    <?php wp_nav_menu( array( 'menu' => 'header' ) ); ?>
+        					 
+    <? /*
+        					 <li><a href="/wp" id='home_link' class="nav_selected">News</a></li>
+        					 <li><a href="/about.php" id='about_link' class="nav">About</a></li>
+        					 <!--li><a target="new" id='updates_link' href="http://www.r-pac.org/blog"; class="nav">Updates</a></li-->
     					 <li><a href="/action" id='action_link' class="nav">Action</a></li>
     					 <!--li><a href="/policy.php" id='policy_link' class="nav">Policy</a></li-->
     					 <li><a href="/volunteer" id='help_link' class="nav">Volunteer</a></li>
     					 <li><a href="/contact" id='contact_link' class="nav">Contact</a></li>
     				</ul>
+        					 <li><a href="/action.php" id='action_link' class="nav">Action</a></li>
+        					 <!--li><a href="/policy.php" id='policy_link' class="nav">Policy</a></li-->
+        					 <li><a href="/volunteer.php" id='help_link' class="nav">Volunteer</a></li>
+        					 <li><a href="/contact.php" id='contact_link' class="nav">Contact</a></li>
+        */
+?>
     			</div>        
     		</div><script>$(function() {  $('#home_link').addClass('nav_selected'); });</script>
     		<div id="main_content">
\ No newline at end of file

=== modified file 'style.css'
--- style.css	2010-12-09 04:00:58 +0000
+++ style.css	2010-12-09 04:32:59 +0000
@@ -362,7 +362,19 @@
 .right_footer a:hover {
     text-decoration: underline;
 }
-
+#menu_tab ul.menu li a, #menu_tab ul.menu li  a:visited {
+display:block; float:left; padding:0px; margin:0;width:71px; height:37px; margin:0px 4px 0px 4px; text-align:center; color:#FFFFFF;
+text-decoration:none;}
+
+#menu_tab ul.menu li a:link, #menu_tab ul.menu li  a:visited {
+display:block; float:left; padding:0px; margin:0;width: 71px;margin:0px 4px 0px 4px;text-align:center; height:37px;
+text-decoration:none; color: #d34124; background:url(http://theosdf.org/images/bt_bg.gif) no-repeat center;}
+
+#menu_tab ul.menu li a:hover {
+color: #d34124; text-decoration:none;background:url(http://theosdf.org/images/bt_bg.gif) no-repeat center;}
+
+
+/* body { url(http://r-pac.org/images/bg.gif) repeat-x; } */
 h1.entry-title { color: black; display: block; width: 100%; font-size: 40px; margin-bottom: 20px;}
 
 .post {