zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-12 04:29:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert flash_messages to shared/flash

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/registrar/sessions_controller.rb
View file

@ -91,7 +91,7 @@ class Registrar
@user = find_user_by_idc_and_allowed(response.user_id_code) @user = find_user_by_idc_and_allowed(response.user_id_code)
else else
@user = find_user_by_idc(response.user_id_code) @user = find_user_by_idc(response.user_id_code)
end end
if @user.persisted? if @user.persisted?
session[:user_id_code] = response.user_id_code session[:user_id_code] = response.user_id_code

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

@ -1,63 +1,63 @@
<!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 %>
<%= yield :head_title %> <%= yield :head_title %>
<% else %> <% else %>
<title> <title>
<%= t(:registrar_head_title) %>
</title>
<% end %>
<%= 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">
<div class="container">
<div class="navbar-header">
<button aria-expanded="false" class="navbar-toggle collapsed" data-target="#navbar" data-toggle="collapse" type="button">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<%= link_to registrar_root_path, class: 'navbar-brand' do %>
<%= t(:registrar_head_title) %> <%= t(:registrar_head_title) %>
<% if unstable_env.present? %> </title>
<div class="text-center"> <% end %>
<small style="color: #0074B3;"> <%= csrf_meta_tags %>
<%= unstable_env %> <%= stylesheet_link_tag 'registrar-manifest', media: 'all' %>
</small> <%= favicon_link_tag 'favicon.ico' %>
</div> </head>
<% end %> <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">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<%= link_to registrar_root_path, class: 'navbar-brand' do %>
<%= t(:registrar_head_title) %>
<% if unstable_env.present? %>
<div class="text-center">
<small style="color: #0074B3;">
<%= unstable_env %>
</small>
</div>
<% end %>
<% end %>
</div>
<%= render 'navbar' %>
</div>
</nav>
<div class="container">
<%= render 'shared/flash' %>
<% if depp_controller? %>
<%= render 'registrar/shared/epp_results' %>
<% end %> <% end %>
<%= yield %>
</div> </div>
<%= render 'navbar' %> <footer class="footer">
</div> <div class="container">
</nav> <div class="row">
<div class="container"> <div class="col-md-6">
<%= render 'flash_messages' %> <%= image_tag 'eis-logo-et.png' %>
<% if depp_controller? %> </div>
<%= render 'registrar/shared/epp_results' %> <div class="col-md-6 text-right">
<% end %> Version
<%= yield %> <%= CURRENT_COMMIT_HASH %>
</div> </div>
<footer class="footer"> </div>
<div class="container">
<div class="row">
<div class="col-md-6">
<%= image_tag 'eis-logo-et.png' %>
</div> </div>
<div class="col-md-6 text-right"> </footer>
Version <%= javascript_include_tag 'registrar-manifest', async: true %>
<%= CURRENT_COMMIT_HASH %> </body>
</div>
</div>
</div>
</footer>
<%= javascript_include_tag 'registrar-manifest', async: true %>
</body>
</html> </html>

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

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