projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added first stab at a kiosk mode
[selectricity-live]
/
app
/
views
/
voter
/
full_vote.rhtml
diff --git
a/app/views/voter/full_vote.rhtml
b/app/views/voter/full_vote.rhtml
index 5534090db12f11b5c38311dfb838e9854f98a92e..80ea98676d01b72bb50066677ea6548a85f3fe89 100644
(file)
--- a/
app/views/voter/full_vote.rhtml
+++ b/
app/views/voter/full_vote.rhtml
@@
-1,15
+1,17
@@
<div id="title-header">
<div id="title-header">
- <span class="header">Vote
Recorded
</span>
- <span class="subheader"></span>
+ <span class="header">Vote</span>
+ <span class="subheader"><
%= @voter.election.name %><
/span>
</div>
<p><strong>Description:</strong></p>
<p><%= @voter.election.description %></p>
</div>
<p><strong>Description:</strong></p>
<p><%= @voter.election.description %></p>
+<% if @voter.election.authenticated? %>
<div class="normal-header">
<span class="header">Current Voter</span>
<span class="subheader"></span>
</div>
<div class="normal-header">
<span class="header">Current Voter</span>
<span class="subheader"></span>
</div>
+<% end %>
<p><strong><%= @voter.email %></strong></p>
<p><strong><%= @voter.email %></strong></p>
@@
-18,7
+20,7
@@
<span class="subheader"></span>
</div>
<span class="subheader"></span>
</div>
-<p>Drag and drop the items on <strong>list in the
righ
t column</strong>
+<p>Drag and drop the items on <strong>list in the
lef
t column</strong>
until they are in order from most preferred at the top to least
preferred at the bottom. When you are done, press confirm to record your
vote.</p>
until they are in order from most preferred at the top to least
preferred at the bottom. When you are done, press confirm to record your
vote.</p>
@@
-30,12
+32,10
@@
vote.</p>
<% @voter.election.candidates.each do |candidate| %>
<% @current_candidate = candidate %>
<% @voter.election.candidates.each do |candidate| %>
<% @current_candidate = candidate %>
-
<div id="cand<%= @current_candidate.id %>">
<div id="cand<%= @current_candidate.id %>">
- <h3><%=h @current_candidate.name -%></h3>
- <blockquote>
- <%=h (@current_candidate.description) %>
- </blockquote>
+ <h3><%= h @current_candidate.name %></h3>
+ <%= render :partial => 'election/candidate_box_info' %>
</div>
<% end %>
</ul>
</div>
<% end %>
</ul>
+
Benjamin Mako Hill
||
Want to submit a patch?