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

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

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

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

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

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

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 'flash_messages' %>
<% 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>

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

@ -51,4 +51,4 @@
</div> </div>
</footer> </footer>
</body> </body>
</html> </html>