zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-11 23:24:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert to old flash behavior

Browse source
This commit is contained in:
Maciej Szlosarczyk 2018-06-26 15:52:46 +03:00
parent 3c44472ea8
commit 278522cfc3
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
4 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/views/application/_flash_messages.html.erb
View file

@ -1,24 +1,8 @@
<% if flash[:notice] %>
<div class="alert alert-success alert-dismissible">
<button class="close" data-dismiss="alert" type=button><span>&times;</span></button>
<% if flash[:notice].respond_to?(:join) %>
<p><%= flash[:notice].join('<br>').html_safe %></p>
<% else %>
<p><%= flash[:notice] %></p>
<% end %>
<% display = (flash[:notice] || flash[:alert] || flash[:warning]) ? 'block' : 'none' %>
<div id="flash" style="display: <%= display %>;">
<% type = (flash[:notice]) ? 'bg-success' : 'bg-danger' %>
<% type = 'bg-warning' if flash[:warning] %>
<div class="<%= type %> alert">
<%= flash[:notice] || flash[:alert] || flash[:warning] %>
</div>
<% end %>
<% if flash[:alert] %>
<div class="alert alert-danger alert-dismissible">
<button class="close" data-dismiss="alert" type=button><span>&times;</span></button>
<p><%= flash[:alert] %></p>
</div>
<% end %>
<% if flash[:info] %>
<div class="alert alert-info alert-dismissible">
<button class="close" data-dismiss="alert" type=button><span>&times;</span></button>
<p><%= flash[:info] %></p>
</div>
<% end %>
</div>

2
app/views/layouts/registrant/application.html.erb
View file

@ -65,7 +65,7 @@
</div>
</nav>
<div class="container">
<%= render 'shared/flash' %>
<%= render 'flash_messages' %>
<%= yield %>
</div>
<footer class="footer">

2
app/views/layouts/registrar/base.html.erb
View file

@ -39,7 +39,7 @@
</div>
</nav>
<div class="container">
<%= render 'shared/flash' %>
<%= render 'flash_messages' %>
<% if depp_controller? %>
<%= render 'registrar/shared/epp_results' %>
<% end %>

2
app/views/layouts/registrar/sessions.html.erb
View file

@ -33,7 +33,7 @@
</nav>
<div class="container">
<%= render 'shared/flash' %>
<%= render 'flash_messages' %>
<%= yield %>
</div>