Merge branch 'live' of ssh://ephesus.xvm.mit.edu/org/selectricity/selectricity-live

[selectricity] / app / views / account / summary.rhtml

diff --git a/app/views/account/summary.rhtml b/app/views/account/summary.rhtml
index 2f24e2801f165c51de6d7b37d9f2c7dd28839e3a..0ea9f241dcb729614205a6445581998fc1b3335a 100644 (file)
--- a/app/views/account/summary.rhtml
+++ b/app/views/account/summary.rhtml
@@ -1,4 +1,9 @@
-<h2>This is your user summary profile, <%=h @user.login.capitalize %></h2>
+<div id="title-header">
+  <span class="header">Account Summary</span>
+  <span class="subheader"></span>
+</div>
+
+<h3>This is your account summary profile, <%=h @user.login.capitalize %></h3>
 
 <p>
 E-mail: <%=h @user.email %><br />
@@ -6,48 +11,34 @@ Member since: <%=h @user.created_at.strftime("%x") %>
 </p>
 
 <p>Your Elections:
-  <table class="voterbox">
+  <table class="voterbox" id="election">
     <tr>
-         <% Election.content_columns.each do |column| -%>
-         <% next if column.name.eql?("viewable") || column.name.eql?("quickuser")\
-         || column.name.eql?("active") %>
-           <th><%= column.human_name %></th>
+      <% ["Name", "Description", "Details"].each do |column| -%>
+           <th><%= column %></th>
          <% end -%>
     </tr>
     
     <% @user.elections.select {|e| e.instance_of?(Election)}.each do |election| %>
     <tr>
-         <td>
-       <% if election.active == 1 -%>
+         <td style="text-align: left;">
            <%= link_to "#{election.name}", :controller => 'election', 
                            :action => 'show', :id => election %>
-               <% else -%>
-                 <%=h election.name %>
-               <% end -%>
          </td>
-         <td><%=h election.description %></td>
-         <td>
-         <% if election.anonymous == 0 -%>
-              No
-            <% else -%>
-              Yes
-            <% end -%>
+         <td style="text-align: left;"><%=h election.description %></td>
+         <td style="text-align: left;">
+        <strong>Start:</strong> <%=h election.startdate.strftime("%x") %><br />
+        <strong>End:</strong> <%=h election.enddate.strftime("%x") %><br />
+        <strong>Method:</strong> <%=h ELECTION_TYPES[election.election_method] %><br />
+           <strong>Open:</strong> <%= (not election.authenticated?).to_s.capitalize %>
          </td>
-         <td><%=h election.startdate.strftime("%x") %></td>
-      <td><%=h election.enddate.strftime("%x") %></td>
-      <td>
-         <% if election.notices == 0 -%>
-              No
-            <% else -%>
-              Yes
-            <% end -%>
-         </td>   
-         <td><%=h election.election_method %></td>
+         
     </tr>
     <% end -%>
   </table>
 </p>
 
+<br />
+
 <p>
 Your Quickvotes:
 <table class="voterbox">