X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/86087be54da5f8c3af8fa475fafebd0c5527da9f..48f6efa2fbd1e9fd1dd7638ed482fc8ce5a3e136:/app/views/layouts/main.rhtml?ds=sidebyside diff --git a/app/views/layouts/main.rhtml b/app/views/layouts/main.rhtml index a1c9173..5ae18dc 100644 --- a/app/views/layouts/main.rhtml +++ b/app/views/layouts/main.rhtml @@ -4,6 +4,7 @@ <%= @page_title || "Selectricity" %> <%= stylesheet_link_tag "common", :media => "all" %> <%= stylesheet_link_tag "main", :media => "all" %> + <%= stylesheet_link_tag *(@stylesheets) %> <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %> @@ -15,6 +16,10 @@ :controller => 'site', :action => 'index' %>
+ <% if flash[:notice]%> +
<%= flash[:notice] %>
+ <% end%> + <%= @sidebar_content %>
@@ -41,9 +46,6 @@
- <% if flash[:notice]%> -
<%= flash[:notice] %>
- <% end%> <%= @content_for_layout %>