Open Source Democracy Foundation

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

  1. wp-theme
  2. Merge into wp
Proposed by Toast McFarland
Status: Merged
Merge reported by: Toast McFarland
Merged at revision: not available
Proposed branch: lp:~daimoneze/osdf/wp-theme
Merge into: lp:osdf/wp
Diff against target: 182 lines (+21/-71)
4 files modified
footer.php (+2/-1)
front-page.php.bak (+0/-64)
header.php (+6/-2)
style.css (+13/-4)
To merge this branch: bzr merge lp:~daimoneze/osdf/wp-theme
Reviewer Review Type Date Requested Status
Andrew Ettinger Pending
Review via email: mp+51412@code.launchpad.net

Commit message

Added button for automation of donation for betterment of organization.

Description of the change

Added donate button. Removed valentines pages. Landing page is now list of latest blog posts.

To post a comment you must log in.
lp:~daimoneze/osdf/wp-theme updated
29. By Toast McFarland

Moved donate button to header.

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 2011-01-24 13:09:35 +0000
3+++ footer.php 2011-03-08 04:36:36 +0000
4@@ -1,6 +1,6 @@
5 </div>
6 <div id="footer">
7- <img src="<?php bloginfo('template_directory'); ?>/images/OSDFLogo_footer.png" alt="" title="" width="61" class="left" id="logo_footer" />
8+ <div style="padding:0;margin:0"><img src="<?php bloginfo('template_directory'); ?>/images/OSDFLogo_footer.png" alt="" title="" width="61" class="left" id="logo_footer" /></div>
9 <div class="left_footer">
10 &lt;&#47; The Open Source Democracy Foundation &gt; &copy; 2010
11 </div>
12@@ -11,6 +11,7 @@
13 <a href="/volunteer">Help</a> |
14 <a href="/contact">Contact</a-->
15 <?php wp_nav_menu( array( 'menu' => 'footer' ) ); ?>
16+ <div class="clear"></div>
17 </div>
18 </div>
19 </body>
20
21=== renamed file 'front-page.php' => 'front-page.php.bak'
22=== removed file 'front-page.php.bak'
23--- front-page.php.bak 2011-01-21 00:08:17 +0000
24+++ front-page.php.bak 1970-01-01 00:00:00 +0000
25@@ -1,64 +0,0 @@
26-<?php get_header(); ?>
27-<div class="boxes_tab">
28- <div class="box">
29- <div class="full_box_text">
30- <h2><a href="about">About Us</a></h2>
31- <p class="full_box_text">
32- The Open Source Democracy Foundation is committed to improving our government by harnessing the Internet as a tool for education and advocacy.
33- </p>
34- </div>
35- </div>
36-
37- <div class="box">
38- <img title="" alt="" class="left_img" src="<?php bloginfo('template_directory'); ?>/images/calendar_icon.gif"/>
39- <div class="box_text">
40- <h2><a href="http://www.r-pac.org/blog" target="new">Speak Up</a></h2>
41- <p class="box_text">
42- Join the discussion on <a href="http://reddit.com/r/rpac">Reddit</a>!
43- </p>
44- </div>
45- </div>
46- <div class="box">
47- <img width="96" height="99" title="" alt="" class="left_img" src="<?php bloginfo('template_directory'); ?>/images/icon3.png"/>
48- <div class="box_text">
49- <h2><a href="/policy">Net Neutrality</a></h2>
50- <p class="box_text">
51- The OSDF is<br/>currently<br/>advocating<br/>Net Neutrality.
52- </p>
53- </div>
54- </div>
55- </div>
56-
57-<div class="home" id="center_big_box">
58- <?php query_posts('showposts=1'); ?>
59- <?php /* Ze Loop */ ?>
60- <?php while (have_posts()) : the_post(); ?>
61- <div id="excerpt_wrap">
62- <?php the_title('<h3>','</h3>'); ?>
63- <?php global $more; $more = 0; the_content('<br/>Read more...'); ?>
64- </div>
65- <?php endwhile;?>
66-</div>
67-
68-<div class="bottom_content">
69- <div class="left_signup_box">
70- <div class="left_form_content">
71- <iframe width="220" height="250" frameborder="0" scrolling="no" marginwidth="0" marginheight="0" src="https://spreadsheets.google.com/embeddedform?formkey=dDZZMVpPNlR5dC1RYXZJOWVBRUctMmc6MQ">Loading...</iframe>
72- </div>
73- </div>
74- <div class="left_box">
75- <h3>Help OSDF</h3>
76- <div class="left_text_content">
77- <p>
78- The OSDF relies on the help of the public to make an impact, so if you enjoy working with others for a good cause, please visit our <a href="/volunteer">volunteer</a> page!<br/><br/>
79-
80- If you are unable to volunteer your time, please consider showing your support by signing up on the left or by visiting our full <a href="signup">Sign Up</a> page.
81- </p>
82- <p style="text-align: center;">
83- <a href="donate"><img alt="Donate" border="0" src="<?php bloginfo('template_directory'); ?>/images/donate.jpg"/></a>
84- </p>
85- </div>
86- </div>
87-</div> <!-- big block -->
88-<?php get_sidebar(); ?>
89-<?php get_footer(); ?>
90\ No newline at end of file
91
92=== modified file 'header.php'
93--- header.php 2011-01-25 18:00:53 +0000
94+++ header.php 2011-03-08 04:36:36 +0000
95@@ -36,7 +36,6 @@
96 }
97 ?>
98 <!-- End -->
99-
100 <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
101
102 <?php wp_head(); ?>
103@@ -48,6 +47,11 @@
104 <body>
105 <div id="main_container">
106 <div id="header">
107+ <div id="donate_button">
108+ <a href="https://www.wepay.com/donate/116170" target="_blank" >
109+ <img src="<?php bloginfo('template_directory'); ?>/images/donate.png" alt="Donate with WePay"/>
110+ </a>
111+ </div>
112 <div id="logo">
113 <a href="<?php bloginfo('url'); ?>"><img src="<?php bloginfo('template_directory'); ?>/images/OSDFLogo_header.png" alt="" title="" border="0" height="100%" /></a>
114 </div>
115@@ -62,4 +66,4 @@
116 <?php wp_nav_menu( array( 'menu' => 'header' ) ); ?><div class="clear"></div>
117
118 </div><script type="text/javascript">//$(function() { $('#home_link').addClass('nav_selected'); });</script>
119- <div id="main_content">
120+ <div id="main_content">
121\ No newline at end of file
122
123=== removed file 'images/OSDFLogo2.png'
124Binary files images/OSDFLogo2.png 2011-01-21 00:08:17 +0000 and images/OSDFLogo2.png 1970-01-01 00:00:00 +0000 differ
125=== added file 'images/donate.png'
126Binary files images/donate.png 1970-01-01 00:00:00 +0000 and images/donate.png 2011-03-08 04:36:36 +0000 differ
127=== removed file 'images/subtitle1.gif'
128Binary files images/subtitle1.gif 2011-01-19 22:37:50 +0000 and images/subtitle1.gif 1970-01-01 00:00:00 +0000 differ
129=== removed file 'images/valentine.jpg'
130Binary files images/valentine.jpg 2011-01-17 16:48:48 +0000 and images/valentine.jpg 1970-01-01 00:00:00 +0000 differ
131=== removed file 'images/valentine_header.jpg'
132Binary files images/valentine_header.jpg 2011-01-17 16:48:48 +0000 and images/valentine_header.jpg 1970-01-01 00:00:00 +0000 differ
133=== modified file 'style.css'
134--- style.css 2011-01-25 13:54:38 +0000
135+++ style.css 2011-03-08 04:36:36 +0000
136@@ -83,9 +83,10 @@
137 .top_phone {
138 color: #FFFFFF;
139 float: right;
140- padding: 44px 59px 19px;
141+ padding: 0 0 14px;
142 width: 60%;
143 font:normal 28px "Times New Roman",times,serif;
144+ clear:right;
145 }
146
147 .phone_text {
148@@ -246,7 +247,7 @@
149 #main_content {
150 background: url("images/center_bg.gif") repeat-x scroll center top #FFFFFF;
151 height: auto;
152- padding: 0;
153+ padding: 10px 0;
154 width: 880px;
155 }
156
157@@ -461,7 +462,7 @@
158 #footer {
159 background-color: #E7E6E1;
160 color: #000;
161- height: 70px;
162+ height: 73px;
163 width: 880px;
164 margin: 0 auto;
165 }
166@@ -470,7 +471,15 @@
167 height:62px;
168 padding:5px 15px 0 18px;
169 }
170-
171+#donate_button {
172+ float:right;
173+ margin:0;
174+ width:150px;
175+ padding:10px 13px;
176+}
177+#donate_button img {
178+ border-style:none;
179+}
180 .left_footer {
181 float: left;
182 padding: 31px 0 0 10px;

Subscribers

People subscribed via source and target branches