Commit b625785a22b60813279c48a47bdd9c03c7a6f30c
1 parent
d418a50a
Exists in
master
and in
22 other branches
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
... | ... | @@ -63,17 +63,6 @@ |
63 | 63 | registerDocumentSize(); |
64 | 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 | 66 | <div id="accessibility_menu"> |
78 | 67 | <a href="#content" id="link_go_content"><span><%= _('Go to content') %></span></a> |
79 | 68 | </div><!-- accessibility_menu --> | ... | ... |
app/views/shared/noosfero_layout_features.rhtml
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 | 12 | <% if is_testing_theme %> |
2 | 13 | <%= render :file => 'shared/theme_test_panel' %> |
3 | 14 | <% end %> | ... | ... |