Made a large number of mostly cosmetic fixes after a detailed

[selectricity] / app / views / quickvote / index.rhtml

diff --git a/app/views/quickvote/index.rhtml b/app/views/quickvote/index.rhtml
index 2c5bcd147067e28f9676a1c61041c380cb2f2117..84211ff77eb4c25e55bb324630769d57145f7b96 100644 (file)
--- a/app/views/quickvote/index.rhtml
+++ b/app/views/quickvote/index.rhtml
@@ -1,10 +1,18 @@
 <% %>
-<h1>QuickVote: <em><%= @voter.election.name %></em></h1>
 
-<p><strong>Description:</strong></p>
-<blockquote><%= @voter.election.description %></blockquote>
+<% if @voter.election.shortdesc %>
+  <h1><%= @voter.election.shortdesc %></h1>
+<% else %>
+  <h1>QuickVote</h1>
+<% end %>
+
+<% if @voter.election.longdesc %>
+  <p><strong>Description:</strong></p>
+  <blockquote><%= @voter.election.longdesc %></blockquote>
+
+<h2>Vote</h2>
+<% end %>
 
-<h2>Vote in Election</h2>
 <% if @voter.session_id %>
   <p>You have already voted. You can:</p>