X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/3e545735b4784af19edec9bfcc8e25ff17cb7f12..ee280d9250b5b4c925cc6b4809ce40437d600e7d:/app/views/layouts/main.rhtml?ds=inline diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml index 027ef14..75f196a 100644 --- a/app/views/layouts/main.rhtml +++ b/app/views/layouts/main.rhtml @@ -1,49 +1,61 @@ -<% %> - - - <%= @page_title || "Selectricity" %> - <%= 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 %> - - -
- + + + + <%= @page_title || "Selectricity" %> + <%= stylesheet_link_tag "common", :media => "all" %> + <%= stylesheet_link_tag "main", :media => "all" %> + <%= stylesheet_link_tag *(@stylesheets) %> + <%begin%> + <%= stylesheet_link_tag "ie6hacks", :media => "all" if + request.user_agent =~ /msie\s(5\.[5-9]|[6]\.[0-9]*).*(win)/i %> + <%rescue NoMethodError%> + <%end%> + <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %> + + + +
+ +
+ <%= link_to "

Selectricity

", :controller => 'front' %> + +
<% if flash[:notice]%> -
<%= flash[:notice] %>
+
<%= flash[:notice] %>
<% end%> -
- <%= @content_for_layout %> + <%= @sidebar_content %> +
+ +
+ +
+
+
+ <% if session[:user] %> + <%= link_to User.find(session[:user]).login.downcase, + :controller => "account", + :action => "summary", :id => session[:user][:id] %> + <%= link_to "logout", :controller => "account", + :action => "logout" %> + <% else %> + <%= link_to "login", :controller => "account", :action => "login" + %> + <% end %>
- +
+ <%= link_to "help/about", :controller => 'about' %> +
+
+ +
+ <%= @content_for_layout %> +
- +
+
+ <%= render :partial => 'layouts/footer' %> +
+