Merge branch 'master' of github.com:domify/registry

app/models/depp/domain.rb

@@ -73,7 +73,7 @@ module Depp
       current_user.request(epp_xml.renew(
         name: { value: params[:domain_name] },
         curExpDate: { value: params[:cur_exp_date] },
-        period: { value: params[:period], attrs: { unit: params[:period_unit] } }
+        period: { value: params[:period].to_s[0], attrs: { unit: params[:period].to_s[1] } }
       ))
     end
 

app/views/registrar/contacts/_form.haml

@@ -2,21 +2,21 @@
 = f.hidden_field :id
 = f.hidden_field :password
 .row
-  .col-md-12
+  .col-md-8
     = render 'registrar/contacts/form_partials/general', f: f
 .row
-  .col-md-12
+  .col-md-8
     = render 'registrar/contacts/form_partials/address', f: f
 - if !@contact.persisted? 
   .row
-    .col-md-12
+    .col-md-8
       = render 'registrar/contacts/form_partials/code', f: f
 .row
-  .col-md-12
+  .col-md-8
     = render 'registrar/contacts/form_partials/legal_document', f: f
 
 .row
-  .col-md-12.text-right
+  .col-md-8.text-right
     - if @contact.persisted?
       = button_tag(t(:save), class: 'btn btn-primary')
     - else

app/views/registrar/contacts/delete.haml

@@ -9,12 +9,12 @@
     = f.hidden_field :password
 
     .row
-      .col-md-12
+      .col-md-8
         = render 'registrar/contacts/form_partials/legal_document', f: f
 
     %hr
     .row
-      .col-md-12.text-right
+      .col-md-8.text-right
         = button_tag t(:delete), class: 'btn btn-danger'
 - else
   %h2= "#{t(:delete)}: #{t(:not_found)}"

app/views/registrar/contacts/form_partials/_address.haml

@@ -3,31 +3,31 @@
     .pull-left= t(:address)
   .panel-body
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :street, t(:street) + '*'
-      .col-md-10
+      .col-md-7
         = f.text_field :street, class: 'form-control'
 
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :city, t(:city) + '*'
-      .col-md-10
+      .col-md-7
         = f.text_field :city, class: 'form-control'
 
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :zip, t(:zip) + '*'
-      .col-md-10
+      .col-md-7
         = f.text_field :zip, class: 'form-control'
 
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :state, t(:state)
-      .col-md-10
+      .col-md-7
         = f.text_field :state, class: 'form-control'
 
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :country_code, t(:country) + '*'
-      .col-md-10
+      .col-md-7
         = f.select(:country_code, SortedCountry.all_options(f.object.country_code))

app/views/registrar/contacts/form_partials/_general.haml

@@ -3,23 +3,23 @@
     .pull-left= t(:ident)
   .panel-body
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :ident_country_code, t(:country) + '*'
-      .col-md-10
+      .col-md-7
         = f.select(:ident_country_code, SortedCountry.all_options(f.object.ident_country_code), {}, 
           class: 'js-ident-country-code')
 
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :ident_type, t(:type) + '*'
-      .col-md-10
+      .col-md-7
         = f.select(:ident_type, Depp::Contact::SELECTION_TYPES, { selected: f.object.ident_type },
           class: 'js-ident-type')
 
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :ident, t(:ident) + '*'
-      .col-md-10
+      .col-md-7
         = f.text_field :ident, class: 'form-control'
         - tip_visibility = f.object.ident_type == 'birthday' ? '' : 'display: none'
         .js-ident-tip{ style: tip_visibility }
@@ -30,21 +30,21 @@
     .pull-left= t(:general)
   .panel-body
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :name, t(:name) + '*'
-      .col-md-10
+      .col-md-7
         = f.text_field :name, class: 'form-control'
 
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :email, t(:email) + '*'
-      .col-md-10
+      .col-md-7
         = f.text_field :email, class: 'form-control'
 
     .form-group
-      .col-md-2.control-label
+      .col-md-3.control-label
         = f.label :phone, t(:phone) + '*'
-      .col-md-10
+      .col-md-7
         = f.text_field(:phone, class: 'form-control', placeholder: '+372.12323344')
 
 

app/views/registrar/domains/delete.haml

@@ -1,17 +1,18 @@
 = render 'registrar/shared/title', name: "#{t(:delete)}: #{params[:domain_name]}"
 
 = form_tag(destroy_registrar_domains_path, class: 'form-horizontal', multipart: true, method: :delete) do
-  .panel.panel-default
+  .col-md-8
-    .panel-heading.clearfix
+    .panel.panel-default
-      = t(:legal_document)
+      .panel-heading.clearfix
-    .panel-body
+        = t(:legal_document)
-      .form-group
+      .panel-body
-        .col-md-4.control-label
+        .form-group
-          = label_tag 'domain[legal_document]', t('legal_document')
+          .col-md-3.control-label
-        .col-md-6
+            = label_tag 'domain[legal_document]', t('legal_document')
-          = file_field_tag 'domain[legal_document]'
+          .col-md-7
-          = hidden_field_tag 'domain[name]', params[:domain_name]
+            = file_field_tag 'domain[legal_document]'
+            = hidden_field_tag 'domain[name]', params[:domain_name]
   %hr
   .row
-    .col-md-12.text-right
+    .col-md-8.text-right
       = button_tag t('delete'), class: 'btn btn-danger'

app/views/registrar/domains/renew.haml

@@ -1,14 +1,14 @@
 = render 'registrar/shared/title', name: t(:renew_domain)
 
 .row
-  .col-md-12
+  .col-md-8
     .panel.panel-default
       .panel-heading
-        %h3.panel-title= t('result')
+        %h3.panel-title= t(:result)
       .panel-body
         %dl.dl-horizontal
-          %dt= t('domain_name')
+          %dt= t(:domain_name)
           %dd= @data.css('name').text
 
-          %dt= t('valid_to')
+          %dt= t(:valid_to)
           %dd= @data.css('exDate').text

app/views/registrar/domains/renew_index.haml

@@ -1,22 +1,21 @@
 = render 'registrar/shared/title', name: t(:renew_domain)
 
 .row
-  .col-md-12
+  .col-md-8
     = form_tag renew_registrar_domains_path, class: 'form-horizontal', method: :get do
       .form-group
-        = label_tag :domain_name, t('name'), class: 'col-md-2 control-label'
+        = label_tag :domain_name, t(:name), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = text_field_tag :domain_name, params[:domain_name], class: 'form-control', placeholder: t('domain_name'), autocomplete: 'off'
       .form-group
-        = label_tag :cur_exp_date, t('cur_exp_date'), class: 'col-md-2 control-label'
+        = label_tag :cur_exp_date, t(:cur_exp_date), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = text_field_tag :cur_exp_date, params[:cur_exp_date], class: 'form-control', placeholder: 'yyyy-mm-dd', autocomplete: 'off'
       .form-group
-        = label_tag :domain_period, t('period'), class: 'col-md-2 control-label'
+        = label_tag :domain_period, t(:period), class: 'col-md-3 control-label'
-        .col-md-5
+        .col-md-7
-          = text_field_tag(:period, params[:period], class: 'form-control')
+          = select_tag :period, 
-        .col-md-5
+            options_for_select(Depp::Domain::PERIODS, params[:period]), { class: 'form-control' }
-          = select_tag :period_unit, options_for_select(['y', 'm', 'd'], params[:period_unit]), { class: 'form-control' }
       .form-group
-        .col-md-offset-2.col-md-10
+        .col-md-10.text-right
-          %button.btn.btn-primary= t('renew')
+          %button.btn.btn-primary= t(:renew)

app/views/registrar/domains/transfer_index.haml

@@ -1,22 +1,22 @@
 = render 'registrar/shared/title', name: t(:transfer_domain)
 
 .row
-  .col-md-12
+  .col-md-8
     = form_tag transfer_registrar_domains_path, class: 'form-horizontal', method: :post, multipart: true do
       .form-group
-        = label_tag :domain_name, t('name'), class: 'col-md-2 control-label'
+        = label_tag :domain_name, t('name'), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = text_field_tag :domain_name, params[:domain_name], class: 'form-control', placeholder: t('domain_name'), autocomplete: 'off', autofocus: true
       .form-group
-        = label_tag :password, t('password'), class: 'col-md-2 control-label'
+        = label_tag :password, t('password'), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = text_field_tag :password, params[:password], class: 'form-control', autocomplete: 'off'
       .form-group
-        = label_tag 'legal_document', t('legal_document'),class: 'col-md-2 control-label'
+        = label_tag 'legal_document', t('legal_document'),class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = file_field_tag 'legal_document'
       .form-group
-        .col-md-offset-2.col-md-10
+        .col-md-10.text-right
           %button.btn.btn-primary{ name: 'query' }= t('query')
           %button.btn.btn-primary{ name: 'approve' }= t('approve')
           %button.btn.btn-primary{ name: 'reject' }= t('reject')

app/views/registrar/keyrelays/show.haml

@@ -1,55 +1,55 @@
 .row
-  .col-sm-12
+  .col-sm-8
-    %h2.text-center-xs= t('keyrelay')
+    %h2.text-center-xs= t(:keyrelay)
 %hr
 .row
-  .col-md-12
+  .col-md-8
     = form_tag registrar_keyrelay_path, class: 'form-horizontal', method: :post, multipart: true do
       .form-group
-        = label_tag :domain_name, t('domain_name'), class: 'col-md-2 control-label'
+        = label_tag :domain_name, t(:domain_name), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = text_field_tag :domain_name, params[:domain_name], class: 'form-control', autocomplete: 'off'
 
       .form-group
-        = label_tag :password, t('password'), class: 'col-md-2 control-label'
+        = label_tag :password, t(:password), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = text_field_tag :password, params[:password], class: 'form-control', autocomplete: 'off'
 
       .form-group
-        = label_tag :expiry_relative, t('expiry_relative'), class: 'col-md-2 control-label'
+        = label_tag :expiry_relative, t(:expiry_relative), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = text_field_tag :expiry_relative, params[:expiry_relative], class: 'form-control', autocomplete: 'off'
 
       .form-group
-        = label_tag :expiry_absolute, t('expiry_absolute'), class: 'col-md-2 control-label'
+        = label_tag :expiry_absolute, t(:expiry_absolute), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = text_field_tag :expiry_absolute, params[:expiry_absolute], class: 'form-control', autocomplete: 'off'
 
       .form-group
-        = label_tag :key_data_flags, t('flag'), class: 'col-md-2 control-label'
+        = label_tag :key_data_flags, t(:flag), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = select_tag :key_data_flags, options_for_select(Depp::Dnskey::FLAGS, params['key_data_flags']), {class: 'form-control'}
 
       .form-group
-        = label_tag :key_data_protocol, t('protocol'), class: 'col-md-2 control-label'
+        = label_tag :key_data_protocol, t(:protocol), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = select_tag :key_data_protocol, options_for_select(Depp::Dnskey::PROTOCOLS, params['key_data_protocol']), {class: 'form-control'}
 
       .form-group
-        = label_tag :key_data_alg, t('algorithm'), class: 'col-md-2 control-label'
+        = label_tag :key_data_alg, t(:algorithm), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = select_tag :key_data_alg, options_for_select(Depp::Dnskey::ALGORITHMS, params['key_data_alg']), {class: 'form-control'}
 
       .form-group
-        = label_tag :key_data_public_key, t('public_key'), class: 'col-md-2 control-label'
+        = label_tag :key_data_public_key, t(:public_key), class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = text_field_tag :key_data_public_key, params['key_data_public_key'], class: 'form-control'
 
       .form-group
-        = label_tag :legal_document, t('legal_document'),class: 'col-md-2 control-label'
+        = label_tag :legal_document, t(:legal_document),class: 'col-md-3 control-label'
-        .col-md-10
+        .col-md-7
           = file_field_tag :legal_document
 
       .form-group
-        .col-md-offset-2.col-md-10
+        .col-md-10.text-right
           %button.btn.btn-primary= t('upload_key')

app/views/registrar/xml_consoles/show.haml

@@ -1,3 +1,4 @@
+= render 'registrar/shared/title', name: t(:xml_console)
 .row
   .col-md-8
     = form_tag(registrar_xml_console_path) do