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

Merge pull request #901 from internetee/registry-893

Browse source 
Registry 893
This commit is contained in:
Timo Võhmar 2018-06-26 17:55:26 +03:00 • committed by GitHub
commit e37647477c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 66 additions and 82 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">

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

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