Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git@github.com:cooperq/theballot

  • Loading branch information...
commit 629c3aa1584add4a6ca8dacfa9d5ffae140d1d2e 2 parents dd7ed3f + 89de548
radicalDESIGNS radicaldesigns authored
3  app/controllers/resources_controller.rb
View
@@ -16,4 +16,7 @@ def new
def edit
@resource = Resource.find(params[:id])
end
+
+ def howto
+ end
end
1  app/views/guides/_menu.rhtml
View
@@ -1,4 +1,3 @@
<div class="resource-link"><a href="http://www.rockthevote.com/election-center/contact-sos/" target="_blank">Find Your Polling Place</a></div>
<div class="resource-link"><a href="http://www.rockthevote.com/election-center/contact-sos/" target="_blank">Find If You're Registered</a></div>
<div class="resource-link"><a href="http://ballotpedia.org" target="_blank">Local Ballot Info</a></div>
- <div class="resource-link"><a href="http://www.youtube.com/watch?v=RRL-FAVEHvM" target="_blank">Watch a video about Voter Guide creation</a></div>
13 app/views/guides/index.rhtml
View
@@ -36,14 +36,21 @@
<div id="polling-place">
<%= render :partial => 'menu' %>
</div>
-
+<div style="text-align: center">
+<img src="/images/voterguide-contest.png">
+<a href="http://www.youtube.com/watch?v=RRL-FAVEHvM"><img src="/images/voter-guide.jpg" border="0" style="margin-left: 4px;"></a>
+<a href="/resources/howto"><img src="/images/voterguide-button.png" border="0"></a>
+<br /> <br />
+</div>
<% if (Guide.count_published > 19) -%>
<div id="guide-count">
<span id="guide-count-number"><%= Guide.count_published %></span> guides and counting... Join the fun!
</div>
<% end -%>
-
-
+<a href="javascript:window.location=%22http://www.facebook.com/sharer.php?u=%22+encodeURIComponent(document.location)+%22&#38;t=%22+encodeURIComponent(document.title)"><img align="absmiddle" src="/images/facebook-icon.png" alt="facebook" border="0" style="margin: 6px;" target="_blank"></a>
+<a href="javascript:window.location='http://twitter.com/home?status='+encodeURIComponent(document.location.href)"><img align="absmiddle" src="/images/twitter-icon.png" alt="twitter" border="0" style="margin: 6px;"></a>
+<span style="color: #333333; font-weight: bold; font-size: 14px;">Share</span>
+<br />
<div id="voter-guides">
<h3><span>Browse Voter Guides</span></h3>
<div id="voter-guide-links">
11 app/views/guides/sidebar.rhtml
View
@@ -1,7 +1,9 @@
<div id="polling-place" class="sidebar-frame">
<%= render :partial => 'menu' %>
</div>
-
+<img src="/images/voterguide-contest.png">
+<a href="http://www.youtube.com/watch?v=RRL-FAVEHvM"><img src="/images/voter-guide.jpg" border="0" style="margin-left: 4px;"></a>
+<a href="/resources/howto"><img src="/images/voterguide-button.png" border="0"></a>
<div id="world-actions" class="sidebar-frame">
<% if @guide.attached_pdf -%>
@@ -61,6 +63,13 @@
<a href="#comments">Add a comment</a>
</div>
+<div id="guide-share" class="sidebar-frame">
+ <h3>Share this guide</h3>
+ <a href="javascript:window.location=%22http://www.facebook.com/sharer.php?u=%22+encodeURIComponent(document.location)+%22&#38;t=%22+encodeURIComponent(document.title)"><img src="/images/facebook-icon.png" alt="facebook" border="0" style="margin: 6px;"></a>
+ <a href="Javascript:window.location='http://twitter.com/home?status='+encodeURIComponent(document.location.href)"><img src="/images/twitter-icon.png" alt="twitter" border="0" style="margin: 6px;"></a>
+</div>
+
+
<div id="guide-members" class="sidebar-frame">
<h3>Voter Bloc for this guide</h3>
<h4>(a.k.a. Friends of the guide)</h4>
Please sign in to comment.
Something went wrong with that request. Please try again.