zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-05 17:28:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'registry-791' into registry-790

Browse source 
# Conflicts:
#	app/views/admin/domains/edit.html.erb
#	config/locales/admin/domains.en.yml
This commit is contained in:
Artur Beljajev 2018-08-09 16:42:43 +03:00
commit 732997bf9e
6 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/views/admin/domains/edit.html.erb
View file

@ -7,11 +7,11 @@
<div class="page-header">
<div class="row">
<div class="col-sm-3">
<h1>Edit: <%= domain.name %></h1>
<div class="col-sm-4">
<h1><%= t '.header', domain: domain.name %></h1>
</div>
<div class="col-sm-9 text-right">
<div class="col-sm-8 text-right">
<%= link_to t('.add_new_status_btn'), '#', class: 'btn btn-primary js-add-status' %>
<%= domain.keep_btn %>
<%= domain.force_delete_toggle_btn %>
@ -20,4 +20,4 @@
</div>
<%= render 'form' %>
<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %>
<%= render 'force_delete_dialog', domain: @domain, templates: force_delete_templates %>