Download as
Browse Code »

Commit b625785a22b60813279c48a47bdd9c03c7a6f30c

Authored by Antonio Terceiro
1 parent d418a50a
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

ActionItem1050: moving flash display to common layout code

Showing 2 changed files with 11 additions and 11 deletions   Show diff stats
app/views/layouts/application.rhtml
  Diff comments   View file @b625785
@@ -63,17 +63,6 @@ @@ -63,17 +63,6 @@
63 registerDocumentSize(); 63 registerDocumentSize();
64 </script> 64 </script>
65 65
66 - <% unless flash[:notice].nil? %>  
67 - <div id="notice" onclick="Element.hide('notice');" style="display:none">  
68 - <%= flash[:notice] %>  
69 - <%= javascript_tag(  
70 - visual_effect( :appear, 'notice', :duration => 2, :queue => :end ) +  
71 - visual_effect( :highlight, 'notice', :duration => 3, :queue => :end ) +  
72 - visual_effect( :fade, 'notice', :duration => 2, :queue => :end )  
73 - ) %>  
74 - </div>  
75 - <% end %>  
76 -  
77 <div id="accessibility_menu"> 66 <div id="accessibility_menu">
78 <a href="#content" id="link_go_content"><span><%= _('Go to content') %></span></a> 67 <a href="#content" id="link_go_content"><span><%= _('Go to content') %></span></a>
79 </div><!-- accessibility_menu --> 68 </div><!-- accessibility_menu -->
app/views/shared/noosfero_layout_features.rhtml
  Diff comments   View file @b625785
  1 + <% unless flash[:notice].nil? %>
  2 + <div id="notice" onclick="Element.hide('notice');" style="display:none">
  3 + <%= flash[:notice] %>
  4 + <%= javascript_tag(
  5 + visual_effect( :appear, 'notice', :duration => 0.5, :queue => :end ) +
  6 + visual_effect( :highlight, 'notice', :duration => 3, :queue => :end ) +
  7 + visual_effect( :fade, 'notice', :duration => 1.5, :queue => :end )
  8 + ) %>
  9 + </div>
  10 + <% end %>
  11 +
1 <% if is_testing_theme %> 12 <% if is_testing_theme %>
2 <%= render :file => 'shared/theme_test_panel' %> 13 <%= render :file => 'shared/theme_test_panel' %>
3 <% end %> 14 <% end %>