fixed the string modification function and added support for a titlecase method

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

diff --git a/app/views/quickvote/create.rhtml b/app/views/quickvote/create.rhtml
index 7074218ecd17e5a336b9b4cd9195986a2d84f837..0a5d4aab1bb144f684403e6901adddda6c6b1dca 100644 (file)
--- a/app/views/quickvote/create.rhtml
+++ b/app/views/quickvote/create.rhtml
@@ -1,15 +1,16 @@
 <% -%>
 <% -%>

-<h1>Create QuickVote</h1>
+<h1><%= @quickvote ? "Review and Confirm" : "Create QuickVote" %></h1>

 
 <%= error_messages_for 'quickvote' %>
 
 <% if @quickvote %>
 
 <%= error_messages_for 'quickvote' %>
 
 <% if @quickvote %>

-<p>Please review the data you've entered and confirm. The candidates for
-the election submitted include:</p>
+
+<p>Please review the data you've entered and confirm it. The candidates
+for the vote you've submitted include:</p>

 
 <ul>
 <% for candidate in @quickvote.raw_candidates %>
 
 <ul>
 <% for candidate in @quickvote.raw_candidates %>

-  <li><%= candidate %></li>
+  <li><%= candidate.capitalize %></li>

 <% end %>
 </ul>
 
 <% end %>
 </ul>
 


@@ -18,27 +19,27 @@ the election submitted include:</p>
 <%= form_tag :action => 'create' %>
 <!--[form:election]-->
 
 <%= form_tag :action => 'create' %>
 <!--[form:election]-->
 

-<p><label for="quickvote_name">Vote Name<br />
+<p><label for="quickvote_name">Super-short name (for URL)<br />

 
 

-<em><font size="-1">Required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>
+<em><font size="-1">required; 5-12 characters; only letters and numbers; no spaces</font></em></label><br/>

 
 

-<%= text_field 'quickvote', 'name'  %></p>
+<%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12  %></p>

 
 

-<p><label for="quickvote_description">Description <em><font
-size="-1">Optional</font></em></label><br/>
+<p><label for="quickvote_description">Description<em><br />
+<font size="-1">optional; one line summary on the first line</font></em></label><br/>

 
 

-<%= text_area 'quickvote', 'description', :rows => 2 %></p>
+<%= text_area 'quickvote', 'description', :cols => 50, :rows => 4 %></p>

 
 <p><label for="quickvote_candidatelist">Choices/Candidates<em><br />
 
 <p><label for="quickvote_candidatelist">Choices/Candidates<em><br />

-<font size="-1">Seperate choices with a ";". At least two are required.</font></em></label><br/>
+<font size="-1">seperate choices with a ";"; at least two are required</font></em></label><br/>

 
 

-<%= text_area 'quickvote', 'candidatelist', :rows => 3 %></p>
+<%= text_area 'quickvote', 'candidatelist', :cols => 50, :rows => 2 %></p>

 
 <p><% if @quickvote -%>
      <%= submit_tag "Confirm" -%>
      <%= hidden_field :quickvote, :reviewed, :value => 1 %>
    <% else %>
 
 <p><% if @quickvote -%>
      <%= submit_tag "Confirm" -%>
      <%= hidden_field :quickvote, :reviewed, :value => 1 %>
    <% else %>

-     <%= submit_tag "Create QuickVote" -%>
+     <%= submit_tag "Submit" -%>

    <%- end -%>
 </p>
 
    <%- end -%>
 </p>