Revert flash_messages to shared/flash

This commit is contained in:
Maciej Szlosarczyk 2018-06-26 15:44:34 +03:00
parent 68faff40cc
commit 3c44472ea8
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
3 changed files with 59 additions and 59 deletions

View file

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= I18n.locale.to_s %>"> <html lang="<%= I18n.locale.to_s %>">
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<meta content="width=device-width, initial-scale=1" name="viewport"/> <meta content="width=device-width, initial-scale=1" name="viewport"/>
<% if content_for? :head_title %> <% if content_for? :head_title %>
@ -13,9 +13,9 @@
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<%= stylesheet_link_tag 'registrar-manifest', media: 'all' %> <%= stylesheet_link_tag 'registrar-manifest', media: 'all' %>
<%= favicon_link_tag 'favicon.ico' %> <%= favicon_link_tag 'favicon.ico' %>
</head> </head>
<body> <body>
<nav class="navbar navbar-default navbar-fixed-top"> <nav class="navbar navbar-default navbar-fixed-top">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
<button aria-expanded="false" class="navbar-toggle collapsed" data-target="#navbar" data-toggle="collapse" type="button"> <button aria-expanded="false" class="navbar-toggle collapsed" data-target="#navbar" data-toggle="collapse" type="button">
@ -37,15 +37,15 @@
</div> </div>
<%= render 'navbar' %> <%= render 'navbar' %>
</div> </div>
</nav> </nav>
<div class="container"> <div class="container">
<%= render 'flash_messages' %> <%= render 'shared/flash' %>
<% if depp_controller? %> <% if depp_controller? %>
<%= render 'registrar/shared/epp_results' %> <%= render 'registrar/shared/epp_results' %>
<% end %> <% end %>
<%= yield %> <%= yield %>
</div> </div>
<footer class="footer"> <footer class="footer">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
@ -57,7 +57,7 @@
</div> </div>
</div> </div>
</div> </div>
</footer> </footer>
<%= javascript_include_tag 'registrar-manifest', async: true %> <%= javascript_include_tag 'registrar-manifest', async: true %>
</body> </body>
</html> </html>

View file

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