Download as
Browse Code »

Commit 8e3f59448367f1a621dfbd9eac2b4efd1a0338e9

Authored by AntonioTerceiro
1 parent d8304d6b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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,6 +21,9 @@
21 <% if params[:controller] == 'cms' %> 21 <% if params[:controller] == 'cms' %>
22 <%= javascript_include_tag 'cms' %> 22 <%= javascript_include_tag 'cms' %>
23 <% end %> 23 <% end %>
  24 +
  25 + <%# FIXME this is temporary for tests %>
  26 + <%= stylesheet_link_tag 'composer' %>
24 </head> 27 </head>
25 28
26 <body class='category<%= category_color %>'> 29 <body class='category<%= category_color %>'>
@@ -31,7 +34,6 @@ @@ -31,7 +34,6 @@
31 <%= javascript_tag(visual_effect(:fade, "notice", :duration => 2.0)) %> 34 <%= javascript_tag(visual_effect(:fade, "notice", :duration => 2.0)) %>
32 </div> 35 </div>
33 <% end %> 36 <% end %>
34 - <%= image_tag 'comatose/spinner.gif', :id=>'spinner', :align=>'absmiddle', :style=>'display:none;' %>  
35 37
36 <div id="wrap"> 38 <div id="wrap">
37 39
@@ -42,7 +44,7 @@ @@ -42,7 +44,7 @@
42 <!-- <%= shortcut_header_links %> --> 44 <!-- <%= shortcut_header_links %> -->
43 </div><!-- accessibility_menu --> 45 </div><!-- accessibility_menu -->
44 <div id='path_category'> 46 <div id='path_category'>
45 - Voce esta navgeando na FIXME.. 47 + Voce esta navgeando na FIXME.
46 <% if @category %> 48 <% if @category %>
47 <%= @category.full_name %> 49 <%= @category.full_name %>
48 <% end %> 50 <% end %>
@@ -79,7 +81,12 @@ @@ -79,7 +81,12 @@
79 <div id='header_content'> 81 <div id='header_content'>
80 </div> 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 </div><!-- id="content" --> 91 </div><!-- id="content" -->
85 <div id="footer_content"><!-- Rodape do onteudo --> 92 <div id="footer_content"><!-- Rodape do onteudo -->