Merge branch 'master' into registry-927

This commit is contained in:
Maciej Szlosarczyk 2018-08-24 12:58:29 +03:00
commit 0dc0ac4d16
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765
13 changed files with 233 additions and 176 deletions

View file

@ -1,30 +1,22 @@
<% domain = DomainPresenter.new(domain: @domain, view: self) %>
<div class="row">
<div class="col-sm-8">
<h1 class="text-center-xs">
Edit: <%= domain.name_with_status %>
</h1>
</div>
<div class="col-sm-4 text-right">
<div class="btn-group">
<%= link_to t('.back_btn'), [:admin, @domain], class: 'btn btn-default' %>
<ol class="breadcrumb">
<li><%= link_to t('admin.domains.index.header'), admin_domains_path %></li>
<li><%= link_to @domain, admin_domain_path(@domain) %></li>
</ol>
<div class="page-header">
<div class="row">
<div class="col-sm-4">
<h1><%= t '.header', domain: domain.name %></h1>
</div>
<div class="btn-group">
<button class="btn btn-primary" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Actions
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><%= domain.force_delete_toggle_btn %></li>
<li><%= domain.remove_registry_lock_btn %></li>
<div class="divider"></div>
<li><%= link_to t('.add_new_status_btn'), '#', class: 'js-add-status' %></li>
</ul>
<div class="col-sm-8 text-right">
<%= link_to t('.add_new_status_btn'), '#', class: 'btn btn-primary js-add-status' %>
<%= domain.force_delete_toggle_btn %>
</div>
</div>
</div>
<hr>
<%= render 'form' %>
<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %>

View file

@ -31,8 +31,8 @@
<dt><%= t('.delete_time') %></dt>
<dd><%= l(@domain.delete_at) %></dd>
<dt><%= t('.force_delete_time') %></dt>
<dd><%= l(@domain.force_delete_at) %></dd>
<dt><%= Domain.human_attribute_name :force_delete_at %></dt>
<dd><%= l @domain.force_delete_at %></dd>
<dt><%= t('.locked_by_registrant_at') %></dt>
<dd><%= l(@domain.locked_by_registrant_at) %></dd>