Commit bb97911dacef4481edb62c97964b73ec349fa04f
1 parent
6f8c68e2
Exists in
master
and in
29 other branches
ActionItem0: only include comatose stuff if they are actually needed.
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@298 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
1 changed file
with
10 additions
and
5 deletions
Show diff stats
app/views/layouts/application.rhtml
| @@ -2,8 +2,10 @@ | @@ -2,8 +2,10 @@ | ||
| 2 | <head> | 2 | <head> |
| 3 | <%= javascript_include_tag :defaults %> | 3 | <%= javascript_include_tag :defaults %> |
| 4 | <%= design_all_header_tags %> | 4 | <%= design_all_header_tags %> |
| 5 | - <%= stylesheet_link_tag 'comatose_admin' %> | ||
| 6 | - <%= javascript_include_tag 'comatose_admin' %> | 5 | + <% if params[:controller] == 'comatose_admin' %> |
| 6 | + <%= stylesheet_link_tag 'comatose_admin' %> | ||
| 7 | + <%= javascript_include_tag 'comatose_admin' %> | ||
| 8 | + <% end %> | ||
| 7 | 9 | ||
| 8 | </head> | 10 | </head> |
| 9 | 11 | ||
| @@ -23,9 +25,12 @@ | @@ -23,9 +25,12 @@ | ||
| 23 | <%= header %> | 25 | <%= header %> |
| 24 | </div> | 26 | </div> |
| 25 | 27 | ||
| 26 | - <div id='notice'> | ||
| 27 | - <%= flash[:notice] %> | ||
| 28 | - </div> | 28 | + <% unless flash[:notice].nil? %> |
| 29 | + <div id='notice'> | ||
| 30 | + <%= flash[:notice] %> | ||
| 31 | + </div> | ||
| 32 | + <% end %> | ||
| 33 | + | ||
| 29 | <a name='main_content'/></a> | 34 | <a name='main_content'/></a> |
| 30 | <div id='content'> | 35 | <div id='content'> |
| 31 | <%= design_display(yield) %> | 36 | <%= design_display(yield) %> |