zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-08 13:44:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-791

Browse source
This commit is contained in:
Artur Beljajev 2018-06-20 12:34:26 +03:00
commit f8290f90c5
3 changed files with 90 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/registrant/whois_controller.rb
View file

@ -1,11 +0,0 @@
# As non-GDPR compliant, this controller is deprecated. Needs to be replaced with one that relies
# on the REST WHOIS API.
class Registrant::WhoisController < RegistrantController
def index
authorize! :view, :registrant_whois
if params[:domain_name].present?
@domain = WhoisRecord.find_by(name: params[:domain_name]);
end
end
end

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

@ -1,84 +1,86 @@
<!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(:registrant_head_title) %> <%= t(:registrant_head_title) %>
</title> </title>
<% end %>
<%= csrf_meta_tags %>
<%= stylesheet_link_tag 'registrant-manifest', media: 'all' %>
<%= favicon_link_tag 'favicon.ico' %>
</head>
<body>
<!-- Fixed navbar
-->
<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 registrant_root_path, class: 'navbar-brand' do %>
<%= t(:registrant_head_title) %>
<% if unstable_env.present? %>
<div class="text-center">
<small style="color: #0074B3;">
<%= unstable_env %>
</small>
</div>
<% end %>
<% end %>
</div>
<% if current_user %>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav public-nav">
<% if can? :view, Depp::Domain %>
<% active_class = %w(registrant/domains registrant/check registrant/renew registrant/tranfer registrant/keyrelays).include?(params[:controller]) ? 'active' :nil %>
<li class="<%= active_class %>">
<%= link_to t(:domains), registrant_domains_path %>
</li>
<% end %>
<% active_class = %w(registrant/whois).include?(params[:controller]) ? 'active' :nil %>
<li class="<%= active_class %>">
<%= link_to 'Internet.ee', 'https://internet.ee' %>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<% if user_signed_in? %>
<li>
<%= link_to t(:log_out, user: current_user), '/registrant/logout' %>
</li>
<% end %>
</ul>
</div>
<% end %> <% end %>
</div> <%= csrf_meta_tags %>
</nav> <%= stylesheet_link_tag 'registrant-manifest', media: 'all' %>
<div class="container"> <%= favicon_link_tag 'favicon.ico' %>
<%= render 'shared/flash' %> </head>
<%= yield %> <body>
</div> <!-- Fixed navbar
<footer class="footer"> -->
<div class="container"> <nav class="navbar navbar-default navbar-fixed-top">
<div class="row"> <div class="container">
<div class="col-md-6"> <div class="navbar-header">
<%= image_tag 'eis-logo-et.png' %> <button aria-expanded="false" class="navbar-toggle collapsed" data-target="#navbar" data-toggle="collapse" type="button">
</div> <span class="sr-only">Toggle navigation</span>
<div class="col-md-6 text-right"> <span class="icon-bar"></span>
Version <span class="icon-bar"></span>
<%= CURRENT_COMMIT_HASH %> <span class="icon-bar"></span>
</div> </button>
<%= link_to registrant_root_path, class: 'navbar-brand' do %>
<%= t(:registrant_head_title) %>
<% if unstable_env.present? %>
<div class="text-center">
<small style="color: #0074B3;">
<%= unstable_env %>
</small>
</div>
<% end %>
<% end %>
</div>
<% if current_user %>
<div class="navbar-collapse collapse">
<ul class="nav navbar-nav public-nav">
<% if can? :view, Depp::Domain %>
<% active_class = %w(registrant/domains registrant/check registrant/renew registrant/tranfer registrant/keyrelays).include?(params[:controller]) ? 'active' :nil %>
<li class="<%= active_class %>">
<%= link_to t(:domains), registrant_domains_path %>
</li>
<li class="<%= active_class %>">
<%= link_to 'WHOIS', 'https://whois.internet.ee' %>
</li>
<li class="<%= active_class %>">
<%= link_to 'Internet.ee', 'https://internet.ee' %>
</li>
<% end %>
</ul>
<ul class="nav navbar-nav navbar-right">
<% if user_signed_in? %>
<li>
<%= link_to t(:log_out, user: current_user), '/registrant/logout' %>
</li>
<% end %>
</ul>
</div>
<% end %>
</div>
</nav>
<div class="container">
<%= render 'shared/flash' %>
<%= yield %>
</div> </div>
</div> <footer class="footer">
</footer> <div class="container">
<%= javascript_include_tag 'registrant-manifest', async: true %> <div class="row">
</body> <div class="col-md-6">
<%= image_tag 'eis-logo-et.png' %>
</div>
<div class="col-md-6 text-right">
Version
<%= CURRENT_COMMIT_HASH %>
</div>
</div>
</div>
</footer>
<%= javascript_include_tag 'registrant-manifest', async: true %>
</body>
</html> </html>

11
test/integration/registrant/layout_test.rb
View file

@ -9,9 +9,16 @@ class RegistrantLayoutTest < ActionDispatch::IntegrationTest
travel_to Time.zone.parse('2010-07-05') travel_to Time.zone.parse('2010-07-05')
end end
def test_has_link_to_rest_whois def teardown
super
travel_back
end
def test_has_link_to_rest_whois_and_internet_ee
visit registrant_domains_url visit registrant_domains_url
assert(has_link?('Internet.ee', href: 'https://internet.ee')) assert(has_link?('Internet.ee', href: 'https://internet.ee'))
refute(has_link?('WHOIS', href: 'registrant/whois')) assert(has_link?('WHOIS', href: 'https://whois.internet.ee'))
end end
end end