zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-25 20:18:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-800

Browse source 
# Conflicts:
#	db/structure.sql
This commit is contained in:
Artur Beljajev 2018-04-17 15:09:47 +03:00
commit 22e1d09dfa
11 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/views/admin/domains/partials/_general.html.erb
View file

@ -22,9 +22,6 @@
class: 'form-control input-sm' %>
</dd>
<dt><%= t(:valid_from) %></dt>
<dd><%= l(@domain.valid_from) %></dd>
<dt><%= t(:valid_to) %></dt>
<dd><%= l(@domain.valid_to) %></dd>

4
app/views/admin/domains/partials/_version.haml
View file

@ -66,12 +66,10 @@
%p
= link_to t(:pending_epp), '#', class: 'js-pending'
%td{class: changing_css_class(version, "period", "period_unit", "valid_from", "valid_to")}
%td{class: changing_css_class(version, "period", "period_unit", "valid_to")}
%p
= "#{domain.period}#{domain.period_unit}"
%br
= "#{l(domain.valid_from, format: :date)}"
%br
= "#{l(domain.valid_to, format: :date)}"
%td

3
app/views/registrant/domains/partials/_general.html.erb
View file

@ -22,9 +22,6 @@
class: 'form-control input-sm' %>
</dd>
<dt><%= t(:valid_from) %></dt>
<dd><%= l(@domain.valid_from) %></dd>
<dt><%= t(:valid_to) %></dt>
<dd><%= l(@domain.valid_to) %></dd>