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

[Toast McFarland]

Almost done here.

[Andrew Ettinger (sillydeveloper)]

review: Approve

[lp:~daimoneze/osdf/wp-theme]

7. By Andrew Ettinger <email address hidden> on 2010-12-09

merge lp:~daimoneze/osdf/wp-theme

=== modified file 'footer.php'
--- footer.php	2010-12-09 04:23:26 +0000
+++ footer.php	2010-12-09 06:11:56 +0000
@@ -1,15 +1,15 @@
 </div>
 <div id="footer">
-	<img src="/osdf/wp-content/themes/osdf/images/footer_logo.gif" alt="" title="" width="61" height="61" class="left" />
+	<img src="images/footer_logo.gif" alt="" title="" width="61" height="61" class="left" />
 	<div class="left_footer">
 		Open Source Democracy Foundation &copy; 2010
 	</div>
-	<div class="right_footer">
+	<!-- div class="right_footer">
 		<a href="/index.php">Home</a> |
 		<a href="/about">About</a> |
 		<a href="/action">Action</a> |
 		<a href="/volunteer">Help</a> |
-		<a href="/contact">Contact</a>
+		<a href="/contact">Contact</a-->
 		<?php wp_nav_menu( array( 'menu' => 'footer' ) ); ?>
 	</div>
 </div>

=== modified file 'header.php'
--- header.php	2010-12-09 04:23:26 +0000
+++ header.php	2010-12-09 06:11:56 +0000
@@ -35,28 +35,27 @@
     				</div>
     			</div>
     			<div id="menu_tab">          
-    				<ul class="menu">                         
+    				<!-- <ul class="menu">                         
     					 <li><a href="/index.php" id='home_link' class="nav">Home</a></li>
     					 <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-->
+    					 <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="/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 'index.php'
--- index.php	2010-12-09 04:00:58 +0000
+++ index.php	2010-12-09 06:11:56 +0000
@@ -77,7 +77,6 @@
 			
 <!-- <div id="container">
 <div class='big_block'>
-<div id="container">
   <div id="left">
 
       <?php /* The Loop — with comments! */ ?>  
@@ -126,7 +125,6 @@
 
  <div id="secondary" class="widget-area">
  </div><!-- #secondary --> END LARGE COMMENT BLOCK -->
- </div><!-- #secondary -->
 </div> <!-- big block -->
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>
\ No newline at end of file

=== modified file 'style.css'
--- style.css	2010-12-09 04:23:26 +0000
+++ style.css	2010-12-09 06:11:56 +0000
@@ -1,6 +1,6 @@
 /*  
 Theme Name: Open Source Democracy Foundation
-Theme URI: 
+Theme URI: /osdf/wp-content/themes/osdf
 Description: A search engine optimized website framework for WordPress for the OSDF.
 Author: Andrew Ettinger and Toast McFarland
 Version: 2.0
@@ -119,6 +119,7 @@
     margin: auto;
     padding: 0;
     width: auto;
+	float: right;
 }
 ul.menu li {
     display: inline;
@@ -126,6 +127,27 @@
     font-weight: bold;
     line-height: 26px;
 }
+#menu-footer {
+	padding: 25px 10px 0 0;
+}
+ul#menu-footer li a {
+    color: #50A6C7;
+    padding: 0;
+    text-decoration: none;
+	font-size: 10px;
+}
+#menu-footer li{
+	display:inline; 
+	list-style-type:none; 
+	padding-left:5px; 
+	margin-left:2px; 
+	border-left:1px solid #ccc;
+}
+#menu-footer li:first-child {
+   border-left:none
+}
+
+}
 a.nav:link, a.nav:visited {
     color: #FFFFFF;
     display: block;
@@ -372,11 +394,7 @@
 
 #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 {
     margin-bottom: 60px;
 }