Merge head

diff --git a/app/views/account/summary.rhtml b/app/views/account/summary.rhtml
index 2f24e2801f165c51de6d7b37d9f2c7dd28839e3a..d15e4425b36e6abb3d0e48043900b577cbb705db 100644 (file)
--- a/app/views/account/summary.rhtml
+++ b/app/views/account/summary.rhtml
@@ -1,4 +1,4 @@
-<h2>This is your user summary profile, <%=h @user.login.capitalize %></h2>
+<h3>This is your user summary profile, <%=h @user.login.capitalize %></h3>
 
 <p>
 E-mail: <%=h @user.email %><br />
@@ -6,11 +6,11 @@ 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") %>
+         || column.name.eql?("active") || column.name.eql?("anonymous") %>
            <th><%= column.human_name %></th>
          <% end -%>
     </tr>
@@ -26,13 +26,6 @@ Member since: <%=h @user.created_at.strftime("%x") %>
                <% end -%>
          </td>
          <td><%=h election.description %></td>
-         <td>
-         <% if election.anonymous == 0 -%>
-              No
-            <% else -%>
-              Yes
-            <% end -%>
-         </td>
          <td><%=h election.startdate.strftime("%x") %></td>
       <td><%=h election.enddate.strftime("%x") %></td>
       <td>
@@ -48,6 +41,8 @@ Member since: <%=h @user.created_at.strftime("%x") %>
   </table>
 </p>
 
+<br />
+
 <p>
 Your Quickvotes:
 <table class="voterbox">

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index 856d74e154e3d2b0cd1bdca6159738e40dc8fdaf..d1018cf0a1da36563edf27d2f5fedf53b13bc06b 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -3,6 +3,8 @@
        <span class="subheader"><%=h @voter.election.description.capitalize %></span>
 </div>
 
+<div class="clear-div"></div>
+
 <div class="main-content">
 
 <% if @voter.voted? %>

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index a77ca83e47927e7f4331a5423a06fd381b9597ab..16b10bfef028ed463ab08fae6dd91802b60b66cf 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -325,6 +325,17 @@ li.moveable {
   padding-left: 5px;
 }
 
+/* voterbox#election is used on user summary page */
+.voterbox#election { border-color: #990d13; }
+
+.voterbox#election th {
+        background-color: #dc0d13;
+        border-color: #dc0d13; 
+}
+       
+.voterbox#election td { border-color: #990d13;}
+
+
 .rbmoreinfo hr {
   width: 100%;
   height: 10px;