Open Source Democracy Foundation

Merge lp:~sillydeveloper/osdf/wp-experimental into lp:osdf/wp

  1. wp-experimental
  2. Merge into wp
Proposed by Andrew Ettinger
Status: Merged
Merged at revision: 2
Proposed branch: lp:~sillydeveloper/osdf/wp-experimental
Merge into: lp:osdf/wp
Diff against target: 119 lines (+51/-32)
3 files modified
footer.php (+16/-8)
header.php (+27/-16)
style.css (+8/-8)
To merge this branch: bzr merge lp:~sillydeveloper/osdf/wp-experimental
Reviewer Review Type Date Requested Status
Andrew Ettinger Approve
Review via email: mp+42864@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrew Ettinger (sillydeveloper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1</div><!-- #main -->1</div>
2 2</div>
3 <div id="footer">3<div id="footer">
4 <p>RPAC<br />&copy;<br />2010</p>4 <img src="images/footer_logo.gif" alt="" title="" width="61" height="61" class="left" />
5 </div>5 <div class="left_footer">
6 </div><!-- #footer -->6 Open Source Democracy Foundation &copy; 2010
7</div><!-- #content -->7 </div>
8</div><!-- #wrapper -->8 <div class="right_footer">
9 <a href="/index.php">Home</a> |
10 <a href="/about.php">About</a> |
11 <a href="/action.php">Action</a> |
12 <a href="/volunteer.php">Help</a> |
13 <a href="/contact.php">Contact</a>
14 </div>
15</div>
16</div>
9</body>17</body>
10</html>18</html>
11\ No newline at end of file19\ No newline at end of file
1220
=== 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 @@
23 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />23 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
24</head>24</head>
25<body>25<body>
26<div id="wrapper" class="hfeed">
27 <div id='content'>
28 <div id="branding">
29 <h1><span class="hr">R</span>PAC</h1>
30 <ul id="top">
31 <li><a href="/index.html">Home</a></li>
32 <li><a class="current" href="/blog">News</a></li>
33 <li><a href="/volunteer.html">Volunteer</a></li>
34 <li><a href="/donate.html">Donate</a></li>
35 <li><a href="/contact.html">Contact</a></li>
36 </ul>
37 <div id="intro">
38 <p>RPAC News.</p>
39 </div>
40
41 <div id="main">
42\ No newline at end of file26\ No newline at end of file
27 <div id="main_container">
28 <div id="header">
29 <div id="logo">
30 <a href="index.php"><img src="images/logo2.png" alt="" title="" border="0" width="289" height="100" /></a>
31 </div>
32 <div class="top_phone">
33 <img src="images/phone_arrows.png" alt="" title="" class="left" width="49" height="32" />
34 <div class="phone_text">
35 The Open Source<br/>Democracy Foundation
36 </div>
37 </div>
38 <div id="menu_tab">
39 <ul class="menu">
40 <li><a href="/index.php" id='home_link' class="nav">Home</a></li>
41 <li><a href="/wp" id='home_link' class="nav_selected">News</a></li>
42 <li><a href="/about.php" id='about_link' class="nav">About</a></li>
43 <!--li><a target="new" id='updates_link' href="http://www.r-pac.org/blog" class="nav">Updates</a></li-->
44
45 <li><a href="/action.php" id='action_link' class="nav">Action</a></li>
46 <li><a href="/policy.php" id='policy_link' class="nav">Policy</a></li>
47 <li><a href="/volunteer.php" id='help_link' class="nav">Volunteer</a></li>
48 <li><a href="/contact.php" id='contact_link' class="nav">Contact</a></li>
49 </ul>
50 </div>
51 </div>
52 <div id="main_content">
53 <div class='big_block'>
43\ No newline at end of file54\ No newline at end of file
4455
=== 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 @@
1/* 1/*
2Theme Name: RPAC2Theme Name: Open Source Democracy Foundation
3Theme URI: http://rpac.org3Theme URI: http://theosdf.org
4Description: A search engine optimized website framework for WordPress.4Description: A search engine optimized website framework for WordPress for the OSDF.
5Author: Andrew Ettinger5Author: Andrew Ettinger
6Author URI: http://frugalprogrammer.com/6Author URI: http://andrewsbrain.com/
7Version: 1.17Version: 2.0
8.8.
9*/9*/
10@import "http://r-pac.org/css/style.css";10@import "http://theosdf.org/style.css";
1111
12body { url(http://r-pac.org/images/bg.gif) repeat-x; }12/* body { url(http://r-pac.org/images/bg.gif) repeat-x; } */
1313
14h1.entry-title { color: black; display: block; width: 100%; font-size: 40px; margin-bottom: 20px;}14h1.entry-title { color: black; display: block; width: 100%; font-size: 40px; margin-bottom: 20px;}
1515
@@ -38,7 +38,7 @@
38 background: #EEE;38 background: #EEE;
39 border: 1px solid #DEDEDE;39 border: 1px solid #DEDEDE;
40 font-size: x-small;40 font-size: x-small;
41 margin: 0px 0px 30px;41 margin: 20px 0px 30px;
42 padding: 15px 0px 15px 20px;42 padding: 15px 0px 15px 20px;
43}43}
4444

Subscribers

People subscribed via source and target branches