Merge branch 'master' into refactor-devise-integration

This commit is contained in:
Artur Beljajev 2018-08-25 17:29:00 +03:00
commit 1f78856ea9
13 changed files with 235 additions and 169 deletions

View file

@ -1,20 +1,22 @@
<% domain = DomainPresenter.new(domain: @domain, view: self) %>
<div class="row">
<div class="col-sm-5">
<h1 class="text-center-xs">
Edit: <%= domain.name %>
</h1>
</div>
<div class="col-sm-7">
<h1 class="text-right text-center-xs">
<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="col-sm-8 text-right">
<%= link_to t('.add_new_status_btn'), '#', class: 'btn btn-primary js-add-status' %>
<%= domain.force_delete_toggle_btn %>
<%= link_to t('.back_btn'), [:admin, @domain], class: 'btn btn-default' %>
</h1>
</div>
</div>
</div>
<hr>
<%= render 'form' %>
<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %>
<%= 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>
</dl>
</div>
</div>