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 5af431b628651dfca826bef74c10b210fd7e962d..0ea9f241dcb729614205a6445581998fc1b3335a 100644 (file)
--- a/app/views/account/summary.rhtml
+++ b/app/views/account/summary.rhtml
@@ -13,35 +13,23 @@ Member since: <%=h @user.created_at.strftime("%x") %>
 <p>Your Elections:
   <table class="voterbox" id="election">
     <tr>
 <p>Your Elections:
   <table class="voterbox" id="election">
     <tr>

-         <% Election.content_columns.each do |column| -%>
-         <% dontPrint = ["viewable", "quickuser", "active", "anonymous", \
-                                         "early_results", "embed_custom_string", "embeddable", \
-                                         "notices"]%>
-         <% next if dontPrint.include?(column.name)%>
-           <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>
          <% 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 %>
            <%= link_to "#{election.name}", :controller => 'election', 
                            :action => 'show', :id => election %>

-               <% else -%>
-                 <%=h election.name %>
-               <% end -%>

          </td>
          </td>

-         <td><%=h election.description %></td>
-         <td><%=h election.startdate.strftime("%x") %></td>
-      <td><%=h election.enddate.strftime("%x") %></td>
-      <td><%=h election.election_method %></td>   
-         <td>
-                 <% if election.authenticated? %>
-              Yes
-             <% else -%>
-              No
-             <% 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>
          
     </tr>
          </td>
          
     </tr>