osdf-devteam team mailing list archive
-
osdf-devteam team
-
Mailing list archive
-
Message #00001
[Merge] lp:~sillydeveloper/osdf/wp-experimental into lp:osdf
Andrew Ettinger has proposed merging lp:~sillydeveloper/osdf/wp-experimental into lp:osdf.
Requested reviews:
OSDF Dev Team (osdf-devteam)
--
https://code.launchpad.net/~sillydeveloper/osdf/wp-experimental/+merge/42864
Your team OSDF Dev Team is requested to review the proposed merge of lp:~sillydeveloper/osdf/wp-experimental into lp:osdf.
=== modified file 'footer.php'
--- footer.php 2010-11-25 02:58:47 +0000
+++ footer.php 2010-12-06 18:20:45 +0000
@@ -1,10 +1,18 @@
-</div><!-- #main -->
-
- <div id="footer">
- <p>RPAC<br />©<br />2010</p>
- </div>
- </div><!-- #footer -->
-</div><!-- #content -->
-</div><!-- #wrapper -->
+</div>
+</div>
+<div id="footer">
+ <img src="images/footer_logo.gif" alt="" title="" width="61" height="61" class="left" />
+ <div class="left_footer">
+ Open Source Democracy Foundation © 2010
+ </div>
+ <div class="right_footer">
+ <a href="/index.php">Home</a> |
+ <a href="/about.php">About</a> |
+ <a href="/action.php">Action</a> |
+ <a href="/volunteer.php">Help</a> |
+ <a href="/contact.php">Contact</a>
+ </div>
+</div>
+</div>
</body>
</html>
\ No newline at end of file
=== modified file 'header.php'
--- header.php 2010-11-25 02:58:47 +0000
+++ header.php 2010-12-06 18:20:45 +0000
@@ -23,19 +23,30 @@
<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
</head>
<body>
-<div id="wrapper" class="hfeed">
- <div id='content'>
- <div id="branding">
- <h1><span class="hr">R</span>PAC</h1>
- <ul id="top">
- <li><a href="/index.html">Home</a></li>
- <li><a class="current" href="/blog">News</a></li>
- <li><a href="/volunteer.html">Volunteer</a></li>
- <li><a href="/donate.html">Donate</a></li>
- <li><a href="/contact.html">Contact</a></li>
- </ul>
- <div id="intro">
- <p>RPAC News.</p>
- </div>
-
- <div id="main">
\ No newline at end of file
+ <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>
+ </div>
+ <div class="top_phone">
+ <img src="images/phone_arrows.png" alt="" title="" class="left" width="49" height="32" />
+ <div class="phone_text">
+ The Open Source<br/>Democracy Foundation
+ </div>
+ </div>
+ <div id="menu_tab">
+ <ul class="menu">
+ <li><a href="/index.php" id='home_link' class="nav">Home</a></li>
+ <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.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>
+ </ul>
+ </div>
+ </div>
+ <div id="main_content">
+ <div class='big_block'>
\ No newline at end of file
=== modified file 'style.css'
--- style.css 2010-11-25 02:58:47 +0000
+++ style.css 2010-12-06 18:20:45 +0000
@@ -1,15 +1,15 @@
/*
-Theme Name: RPAC
-Theme URI: http://rpac.org
-Description: A search engine optimized website framework for WordPress.
+Theme Name: Open Source Democracy Foundation
+Theme URI: http://theosdf.org
+Description: A search engine optimized website framework for WordPress for the OSDF.
Author: Andrew Ettinger
-Author URI: http://frugalprogrammer.com/
-Version: 1.1
+Author URI: http://andrewsbrain.com/
+Version: 2.0
.
*/
-@import "http://r-pac.org/css/style.css";;
+@import "http://theosdf.org/style.css";;
-body { url(http://r-pac.org/images/bg.gif) repeat-x; }
+/* 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;}
@@ -38,7 +38,7 @@
background: #EEE;
border: 1px solid #DEDEDE;
font-size: x-small;
- margin: 0px 0px 30px;
+ margin: 20px 0px 30px;
padding: 15px 0px 15px 20px;
}
