From b36315faf70efb879a5fc6f8647a44057794c6c8 Mon Sep 17 00:00:00 2001 From: Priit Tark Date: Wed, 15 Apr 2015 13:07:43 +0300 Subject: [PATCH] Updated contact, domain etc to narrow column --- app/views/registrar/contacts/_form.haml | 10 ++--- app/views/registrar/contacts/delete.haml | 4 +- .../contacts/form_partials/_address.haml | 20 ++++----- .../contacts/form_partials/_general.haml | 24 +++++----- app/views/registrar/domains/delete.haml | 23 +++++----- app/views/registrar/domains/renew.haml | 2 +- app/views/registrar/domains/renew_index.haml | 21 +++++---- .../registrar/domains/transfer_index.haml | 16 +++---- app/views/registrar/keyrelays/show.haml | 44 +++++++++---------- app/views/registrar/xml_consoles/show.haml | 1 + 10 files changed, 83 insertions(+), 82 deletions(-) diff --git a/app/views/registrar/contacts/_form.haml b/app/views/registrar/contacts/_form.haml index 129983b20..559855c46 100644 --- a/app/views/registrar/contacts/_form.haml +++ b/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 diff --git a/app/views/registrar/contacts/delete.haml b/app/views/registrar/contacts/delete.haml index 475246d87..3f95d39a1 100644 --- a/app/views/registrar/contacts/delete.haml +++ b/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)}" diff --git a/app/views/registrar/contacts/form_partials/_address.haml b/app/views/registrar/contacts/form_partials/_address.haml index 352de0cc7..236e4147c 100644 --- a/app/views/registrar/contacts/form_partials/_address.haml +++ b/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)) diff --git a/app/views/registrar/contacts/form_partials/_general.haml b/app/views/registrar/contacts/form_partials/_general.haml index 70abe4171..54048de38 100644 --- a/app/views/registrar/contacts/form_partials/_general.haml +++ b/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') diff --git a/app/views/registrar/domains/delete.haml b/app/views/registrar/domains/delete.haml index 8a2a04c32..6e6ee6033 100644 --- a/app/views/registrar/domains/delete.haml +++ b/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 - .panel-heading.clearfix - = t(:legal_document) - .panel-body - .form-group - .col-md-4.control-label - = label_tag 'domain[legal_document]', t('legal_document') - .col-md-6 - = file_field_tag 'domain[legal_document]' - = hidden_field_tag 'domain[name]', params[:domain_name] + .col-md-8 + .panel.panel-default + .panel-heading.clearfix + = t(:legal_document) + .panel-body + .form-group + .col-md-3.control-label + = label_tag 'domain[legal_document]', t('legal_document') + .col-md-7 + = 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' diff --git a/app/views/registrar/domains/renew.haml b/app/views/registrar/domains/renew.haml index eded972c9..fd08845be 100644 --- a/app/views/registrar/domains/renew.haml +++ b/app/views/registrar/domains/renew.haml @@ -1,7 +1,7 @@ = 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') diff --git a/app/views/registrar/domains/renew_index.haml b/app/views/registrar/domains/renew_index.haml index ef5a72b99..fa113801c 100644 --- a/app/views/registrar/domains/renew_index.haml +++ b/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' - .col-md-10 + = label_tag :domain_name, t('name'), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :cur_exp_date, t('cur_exp_date'), class: 'col-md-3 control-label' + .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' - .col-md-5 - = text_field_tag(:period, params[:period], class: 'form-control') - .col-md-5 - = select_tag :period_unit, options_for_select(['y', 'm', 'd'], params[:period_unit]), { class: 'form-control' } + = label_tag :domain_period, t('period'), class: 'col-md-3 control-label' + .col-md-7 + = select_tag :period_unit, + options_for_select(Depp::Domain::PERIODS, params[:period]), { class: 'form-control' } .form-group - .col-md-offset-2.col-md-10 + .col-md-10.text-right %button.btn.btn-primary= t('renew') diff --git a/app/views/registrar/domains/transfer_index.haml b/app/views/registrar/domains/transfer_index.haml index 694c060ed..ad61af469 100644 --- a/app/views/registrar/domains/transfer_index.haml +++ b/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' - .col-md-10 + = label_tag :domain_name, t('name'), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :password, t('password'), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag 'legal_document', t('legal_document'),class: 'col-md-3 control-label' + .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') diff --git a/app/views/registrar/keyrelays/show.haml b/app/views/registrar/keyrelays/show.haml index d78731722..d698a0fa4 100644 --- a/app/views/registrar/keyrelays/show.haml +++ b/app/views/registrar/keyrelays/show.haml @@ -1,55 +1,55 @@ .row - .col-sm-12 - %h2.text-center-xs= t('keyrelay') + .col-sm-8 + %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' - .col-md-10 + = label_tag :domain_name, t(:domain_name), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :password, t(:password), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :expiry_relative, t(:expiry_relative), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :expiry_absolute, t(:expiry_absolute), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :key_data_flags, t(:flag), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :key_data_protocol, t(:protocol), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :key_data_alg, t(:algorithm), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :key_data_public_key, t(:public_key), class: 'col-md-3 control-label' + .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' - .col-md-10 + = label_tag :legal_document, t(:legal_document),class: 'col-md-3 control-label' + .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') diff --git a/app/views/registrar/xml_consoles/show.haml b/app/views/registrar/xml_consoles/show.haml index bcb39d88a..6f5f1f006 100644 --- a/app/views/registrar/xml_consoles/show.haml +++ b/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