X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/3e545735b4784af19edec9bfcc8e25ff17cb7f12..008cc97a2f0d84b4de46f2125133afe6c7f620c7:/app/views/layouts/main.rhtml?ds=sidebyside diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml index 027ef14..a1c9173 100644 --- a/app/views/layouts/main.rhtml +++ b/app/views/layouts/main.rhtml @@ -1,49 +1,55 @@ -<% %> - - - <%= @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" %> + <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %> + - -
- - <% if flash[:notice]%> -
<%= flash[:notice] %>
- <% end%> + +
+ +
+ <%= link_to "

Selectricity

", + :controller => 'site', :action => 'index' %> + +
+ <%= @sidebar_content %> +
-
- <%= @content_for_layout %> +
+ +
+
+
+ <% 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]%> +
<%= flash[:notice] %>
+ <% end%> + <%= @content_for_layout %> +
- +
+
+ <%= render_partial 'layouts/footer' %> +
+