X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/b9f3bbdefb7bb1abd63193e2162aae1e78e1a1cb..171c0354e74b4fdd73e25ea05f5b2d23c0d1642f:/app/views/layouts/main.rhtml?ds=sidebyside diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml index 0b9d5cb..c6a14a3 100644 --- a/app/views/layouts/main.rhtml +++ b/app/views/layouts/main.rhtml @@ -1,52 +1,44 @@ -<% %> - - <%= @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 "main", :media => "all" %> + <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %> + - -
- - <% if flash[:notice]%> -
<%= flash[:notice] %>
- <% end%> + +
+ <% if @page_title %> +

<%= @page_title %>

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

Selectricity
+ Voting Machinery for the Masses

', :controller => + 'site', :action => 'index')%>
+ <% end %> -
- <%= @content_for_layout %> -
+ +
+ + <% if flash[:notice]%> +
<%= flash[:notice] %>
+ <% end%> - +
+ <%= @content_for_layout %> +
- + <%= render_partial 'layouts/footer' %> +