From: Date: Tue, 28 Aug 2007 17:04:59 +0000 (-0400) Subject: Moved files around a bit more. X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/86087be54da5f8c3af8fa475fafebd0c5527da9f?ds=inline;hp=--cc Moved files around a bit more. --- 86087be54da5f8c3af8fa475fafebd0c5527da9f diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml index c6a14a3..a1c9173 100644 --- a/app/views/layouts/main.rhtml +++ b/app/views/layouts/main.rhtml @@ -1,44 +1,55 @@ - + + <%= @page_title || "Selectricity" %> + <%= stylesheet_link_tag "common", :media => "all" %> <%= stylesheet_link_tag "main", :media => "all" %> <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %> -
- <% if @page_title %> -

<%= @page_title %>

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

Selectricity
- Voting Machinery for the Masses

', :controller => - 'site', :action => 'index')%> - <% end %> +
- -
+
+ <%= 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..609e84a 100644 --- a/app/views/quickvote/_advanced.rhtml +++ b/app/views/quickvote/_advanced.rhtml @@ -1,20 +1,26 @@ - <% fields_for 'quickvote', quickvote do |quickform| %> -
-<%= quickform.select('election_method', - %w(ssd condorcet plurality approval borda) ) %>
+

+ +

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

+ +

+

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

-
-<%= 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] %>