From: Benjamin Mako Hill <mako@atdot.cc>
Date: Sun, 17 Jun 2012 23:23:16 +0000 (-0400)
Subject: Merge branch 'master' of git://gitorious.org/~ruinar/selectricity/ruinar-selectricity
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/15870a550ddd18192efc71c1355a238e7c7c53e8?ds=sidebyside;hp=-c

Merge branch 'master' of git://gitorious.org/~ruinar/selectricity/ruinar-selectricity
---

15870a550ddd18192efc71c1355a238e7c7c53e8
diff --combined app/views/account/summary.rhtml
index 4d79f5b,61a4b24..075d096
--- a/app/views/account/summary.rhtml
+++ b/app/views/account/summary.rhtml
@@@ -10,6 -10,12 +10,12 @@@ E-mail: <%=h @user.email %><br /
  Member since: <%=h @user.created_at.strftime("%x") %>
  </p>
  
+ <p>
+ 	<%= link_to "Update Email Address", :action => 'change_contact',
+ 	 								  :id => @user.id %>
+ </p>
+ 
+ 
  <p>Your Elections:
    <table class="voterbox" id="election">
      <tr>
@@@ -36,7 -42,6 +42,7 @@@
      <% end -%>
    </table>
  </p>
 +<p><%= link_to "Create a new election", :controller => 'election', :action => 'new' %>.</p>
  
  <br />
  
@@@ -74,4 -79,3 +80,4 @@@ Your Quickvotes
    </tr>
  <% end %>
  </table>
 +<p><%= link_to( "Create a new QuickVote", :controller => 'quickvote', :action => 'create') %>.</p>