Merge trunk

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

diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 7ccb6443120e8d7f50a1a506176b8b828b9c0b1c..b1b6004ec7a75d60b76244a58f74138cf63576d2 100644 (file)
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -1,8 +1,34 @@
-<% -%>
-<h1>Create QuickVote</h1>
+<div id="voters-title">
+       <span class="header">Title</span>
+       <span class="subheader">Subtitle</span>
+       <div style="clear:both;"></div>
+</div>
+
+<div id="controlroom-title">
+       <span class="header">Title</span>
+       <span class="subheader">Subtitle</span>
+       <div style="clear:both;"></div>
+</div>
+
+<div id="quickvote-title">
+       <span class="header">Quickvote</span>
+       <span class="subheader"></span>
+       <div style="clear:both;"></div>
+</div>
 
 <%= error_messages_for 'quickvote' %>
 
+<span class="header">Header</span>
+<span class="subheader">Subheader</span>
+<div style="clear:both;"></div>
+
+<span class="header">Header</span>
+<span class="subheader"></span>
+<div style="clear:both;"></div>
+
+<span class="header">Header</span>
+<div style="clear:both;"></div>
+
 <p><label for="quickvote_candidate_names">Choices</p>
 
 <!-- the list of candidates -->
@@ -13,14 +39,15 @@
 <% form_tag(:action => 'create') do %>
 <!--[form:election]-->
 
-<p><label for="quickvote_name">One Word Description (for URL)<br />
+<p><label for="quickvote_name">One Word Description (for URL)</label></p>
+
+<p><em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></p>
 
-<em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>
+<p><%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>
 
-<%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>
+<p><label for="quickvote_description">Description</label></p>
 
-<p><label for="quickvote_description">Description<em><br />
-<font size="-1">required; one line summary on the first line</font></em></label><br/>
+<p><font size="-1">required; one line summary on the first line</font></em><br/>
 
 <%= text_area 'quickvote', 'description', :cols => 50, :rows => 4 %></p>
 
@@ -32,7 +59,7 @@
 </div>
 <br />
 
-<%= submit_tag "Create Quickvote" -%>
+<p><%= submit_tag "Create Quickvote" -%></p>
 
 <% end %>