Download as
Browse Code »

Commit 8e3f59448367f1a621dfbd9eac2b4efd1a0338e9

Authored by AntonioTerceiro
1 parent d8304d6b
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem135: coisinhas no layout 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1090 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 1 changed file with 10 additions and 3 deletions   Show diff stats
app/views/layouts/application.rhtml
  Diff comments   View file @8e3f594
... ... @@ -21,6 +21,9 @@
21 21 <% if params[:controller] == 'cms' %>
22 22 <%= javascript_include_tag 'cms' %>
23 23 <% end %>
  24 +
  25 + <%# FIXME this is temporary for tests %>
  26 + <%= stylesheet_link_tag 'composer' %>
24 27 </head>
25 28  
26 29 <body class='category<%= category_color %>'>
... ... @@ -31,7 +34,6 @@
31 34 <%= javascript_tag(visual_effect(:fade, "notice", :duration => 2.0)) %>
32 35 </div>
33 36 <% end %>
34   - <%= image_tag 'comatose/spinner.gif', :id=>'spinner', :align=>'absmiddle', :style=>'display:none;' %>
35 37  
36 38 <div id="wrap">
37 39  
... ... @@ -42,7 +44,7 @@
42 44 <!-- <%= shortcut_header_links %> -->
43 45 </div><!-- accessibility_menu -->
44 46 <div id='path_category'>
45   - Voce esta navgeando na FIXME..
  47 + Voce esta navgeando na FIXME.
46 48 <% if @category %>
47 49 <%= @category.full_name %>
48 50 <% end %>
... ... @@ -79,7 +81,12 @@
79 81 <div id='header_content'>
80 82 </div>
81 83  
82   - <%= design_display(yield) %>
  84 + <%# FIXME this is temporary %>
  85 + <% if params[:controller] == 'composer' %>
  86 + <%= yield %>
  87 + <% else %>
  88 + <%= design_display(yield) %>
  89 + <% end %>
83 90  
84 91 </div><!-- id="content" -->
85 92 <div id="footer_content"><!-- Rodape do onteudo -->
... ...