- <% if @page_title %> -

<%= @page_title %>

- <% else %> - <%= link_to('

Selectricity
- Voting Machinery for the Masses

', :controller => - 'site', :action => 'index')%> - <% end %> +

- <% if session[:user] %> - Welcome <%= User.find(session[:user]).login.capitalize %> - <%= link_to("Profile", :controller => "account", - :action => "summary", :id => session[:user][:id] )%> - <%= link_to("Logout", :controller => "account", - :action => "logout") %> | - <% else %> - <%= link_to("Login", :controller => "account", :action => "login") - %>/<%= link_to("Sign up", :controller => "account", :action => "signup")%> - <% end %> | - - <%= link_to("Help/About", :controller => "site", :action => "about") %> -

+ <%= link_to "

Selectricity

", + :controller => 'site', :action => 'index' %> + +

+ <%= @sidebar_content %> +

+ +

+ <% if session[:user] %> + <%= link_to User.find(session[:user]).login.capitalize, + :controller => "account", + :action => "summary", :id => session[:user][:id] %> + <%= link_to "logout", :controller => "account", + :action => "logout" %> + <% else %> + <%= link_to("login", :controller => "account", :action => "login") + %>/<%= link_to("sign up", :controller => "account", :action => "signup")%> + <% end %> +

+ +

+ <%= link_to("help/about", :controller => "site", :action => "about") %> +

- <% if flash[:notice]%> +

+ <% if flash[:notice]%>

<%= flash[:notice] %>

- <% end%> - -

+ <% end%> <%= @content_for_layout %>

- <%= render_partial 'layouts/footer' %> +

+ <%= render_partial 'layouts/footer' %> +

diff --git a/app/views/quickvote/_advanced.rhtml b/app/views/quickvote/_advanced.rhtml index 0255fbd..d8228cf 100644 --- a/app/views/quickvote/_advanced.rhtml +++ b/app/views/quickvote/_advanced.rhtml @@ -1,20 +1,26 @@ - <% fields_for 'quickvote', quickvote do |quickform| %> -Election Method
-<%= quickform.select('election_method', - %w(ssd condorcet plurality approval borda) ) %>
+

Election Method

+ +

<%= quickform.select('election_method', + %w(ssd condorcet plurality approval borda) ) %>

+ +

End Time

<%= quickform.date_select(:enddate, :start_year => Time.now.year) %>

-End Time
-<%= quickform.date_select(:enddate, :start_year => Time.now.year) %>
+

Visibility

Want the results to be visible while the election is active? -Yes <%= quickform.radio_button(:viewable, 1)%> +

Do you want the results to be visible while the election is active?

+ +

Yes <%= quickform.radio_button(:viewable, 1)%> No <%= quickform.radio_button(:viewable, 0)%>

<% if session[:user] %> -

Would you like to be e-mailed when this QuickVote concludes? -Yes <%= quickform.radio_button(:notices, 1)%> +

Notification

+ +

Would you like to be e-mailed when this QuickVote concludes?

+ +

Yes <%= quickform.radio_button(:notices, 1)%> No <%= quickform.radio_button(:notices, 0)%>

<% end -%> diff --git a/app/views/quickvote/_candidate_list.rhtml b/app/views/quickvote/_candidate_list.rhtml index 76de0ac..4ec3db8 100644 --- a/app/views/quickvote/_candidate_list.rhtml +++ b/app/views/quickvote/_candidate_list.rhtml @@ -1,4 +1,3 @@ -<% %> <% if flash[:candidate_names] %>

Create QuickVote

+ + Subtitle +

+ + +

Subheader

Choices

One Word Description (for URL)
+

One Word Description (for URL)

required; 5-12 characters; only letters and numbers; no spaces

<%= text_field 'quickvote', 'name', :size => 15, :maxsize => 12 %>

Description

Description
-required; one line summary on the first line
+

required; one line summary on the first line
<%= text_area 'quickvote', 'description', :cols => 50, :rows => 4 %>

<%= @page_title %>

Selectricity - Voting Machinery for the Masses

Selectricity

Create QuickVote

Selectricity
- Voting Machinery for the Masses