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
1=== modified file 'footer.php'
2--- footer.php 2010-11-25 02:58:47 +0000
3+++ footer.php 2010-12-06 18:20:45 +0000
4@@ -1,10 +1,18 @@
5-</div><!-- #main -->
6-
7- <div id="footer">
8- <p>RPAC<br />&copy;<br />2010</p>
9- </div>
10- </div><!-- #footer -->
11-</div><!-- #content -->
12-</div><!-- #wrapper -->
13+</div>
14+</div>
15+<div id="footer">
16+ <img src="images/footer_logo.gif" alt="" title="" width="61" height="61" class="left" />
17+ <div class="left_footer">
18+ Open Source Democracy Foundation &copy; 2010
19+ </div>
20+ <div class="right_footer">
21+ <a href="/index.php">Home</a> |
22+ <a href="/about.php">About</a> |
23+ <a href="/action.php">Action</a> |
24+ <a href="/volunteer.php">Help</a> |
25+ <a href="/contact.php">Contact</a>
26+ </div>
27+</div>
28+</div>
29 </body>
30 </html>
31\ No newline at end of file
32
33=== modified file 'header.php'
34--- header.php 2010-11-25 02:58:47 +0000
35+++ header.php 2010-12-06 18:20:45 +0000
36@@ -23,19 +23,30 @@
37 <link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
38 </head>
39 <body>
40-<div id="wrapper" class="hfeed">
41- <div id='content'>
42- <div id="branding">
43- <h1><span class="hr">R</span>PAC</h1>
44- <ul id="top">
45- <li><a href="/index.html">Home</a></li>
46- <li><a class="current" href="/blog">News</a></li>
47- <li><a href="/volunteer.html">Volunteer</a></li>
48- <li><a href="/donate.html">Donate</a></li>
49- <li><a href="/contact.html">Contact</a></li>
50- </ul>
51- <div id="intro">
52- <p>RPAC News.</p>
53- </div>
54-
55- <div id="main">
56\ No newline at end of file
57+ <div id="main_container">
58+ <div id="header">
59+ <div id="logo">
60+ <a href="index.php"><img src="images/logo2.png" alt="" title="" border="0" width="289" height="100" /></a>
61+ </div>
62+ <div class="top_phone">
63+ <img src="images/phone_arrows.png" alt="" title="" class="left" width="49" height="32" />
64+ <div class="phone_text">
65+ The Open Source<br/>Democracy Foundation
66+ </div>
67+ </div>
68+ <div id="menu_tab">
69+ <ul class="menu">
70+ <li><a href="/index.php" id='home_link' class="nav">Home</a></li>
71+ <li><a href="/wp" id='home_link' class="nav_selected">News</a></li>
72+ <li><a href="/about.php" id='about_link' class="nav">About</a></li>
73+ <!--li><a target="new" id='updates_link' href="http://www.r-pac.org/blog" class="nav">Updates</a></li-->
74+
75+ <li><a href="/action.php" id='action_link' class="nav">Action</a></li>
76+ <li><a href="/policy.php" id='policy_link' class="nav">Policy</a></li>
77+ <li><a href="/volunteer.php" id='help_link' class="nav">Volunteer</a></li>
78+ <li><a href="/contact.php" id='contact_link' class="nav">Contact</a></li>
79+ </ul>
80+ </div>
81+ </div>
82+ <div id="main_content">
83+ <div class='big_block'>
84\ No newline at end of file
85
86=== modified file 'style.css'
87--- style.css 2010-11-25 02:58:47 +0000
88+++ style.css 2010-12-06 18:20:45 +0000
89@@ -1,15 +1,15 @@
90 /*
91-Theme Name: RPAC
92-Theme URI: http://rpac.org
93-Description: A search engine optimized website framework for WordPress.
94+Theme Name: Open Source Democracy Foundation
95+Theme URI: http://theosdf.org
96+Description: A search engine optimized website framework for WordPress for the OSDF.
97 Author: Andrew Ettinger
98-Author URI: http://frugalprogrammer.com/
99-Version: 1.1
100+Author URI: http://andrewsbrain.com/
101+Version: 2.0
102 .
103 */
104-@import "http://r-pac.org/css/style.css";
105+@import "http://theosdf.org/style.css";
106
107-body { url(http://r-pac.org/images/bg.gif) repeat-x; }
108+/* body { url(http://r-pac.org/images/bg.gif) repeat-x; } */
109
110 h1.entry-title { color: black; display: block; width: 100%; font-size: 40px; margin-bottom: 20px;}
111
112@@ -38,7 +38,7 @@
113 background: #EEE;
114 border: 1px solid #DEDEDE;
115 font-size: x-small;
116- margin: 0px 0px 30px;
117+ margin: 20px 0px 30px;
118 padding: 15px 0px 15px 20px;
119 }
120

Subscribers

People subscribed via source and target branches