From 318dec4f528be7a2a625168693ad418d60ec5d6b Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Tue, 28 Jun 2022 10:24:35 -0300 Subject: [PATCH 1/6] Download pdf with domain data --- app/controllers/admin/domains_controller.rb | 7 +- app/models/domain.rb | 6 + app/views/admin/domains/show.html.erb | 5 +- app/views/domain/pdf.haml | 315 ++++++++++++++++++++ config/routes.rb | 1 + 5 files changed, 331 insertions(+), 3 deletions(-) create mode 100644 app/views/domain/pdf.haml diff --git a/app/controllers/admin/domains_controller.rb b/app/controllers/admin/domains_controller.rb index 707b40654..0b3a8b785 100644 --- a/app/controllers/admin/domains_controller.rb +++ b/app/controllers/admin/domains_controller.rb @@ -2,7 +2,7 @@ module Admin class DomainsController < BaseController DEFAULT_VERSIONS_PER_PAGE = 10 - before_action :set_domain, only: %i[show edit update keep] + before_action :set_domain, only: %i[show edit update download keep] authorize_resource # rubocop:disable Metrics/MethodLength @@ -65,6 +65,11 @@ module Admin .per(DEFAULT_VERSIONS_PER_PAGE) end + def download + filename = "#{@domain.name}.pdf" + send_data @domain.as_pdf, filename: filename + end + def keep @domain.keep redirect_to edit_admin_domain_url(@domain), notice: t('.kept') diff --git a/app/models/domain.rb b/app/models/domain.rb index 68c5bc611..193fd96fd 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -740,6 +740,12 @@ class Domain < ApplicationRecord ] end + def as_pdf + domain_html = ApplicationController.render(template: 'domain/pdf', assigns: { domain: self }) + generator = PDFKit.new(domain_html) + generator.to_pdf + end + def registrant_name return registrant.name if registrant diff --git a/app/views/admin/domains/show.html.erb b/app/views/admin/domains/show.html.erb index 2b2835429..7fde9f7b1 100644 --- a/app/views/admin/domains/show.html.erb +++ b/app/views/admin/domains/show.html.erb @@ -6,11 +6,12 @@
-
+

<%= domain.name_with_status %>

-
+
+ <%= link_to t('.download'), download_admin_domain_path(@domain), class: 'btn btn-primary' %> <%= link_to t('.edit_btn'), edit_admin_domain_path(@domain), class: 'btn btn-primary' %> <%= link_to t('.history_btn'), admin_domain_domain_versions_path(@domain), class: 'btn btn-primary' %> diff --git a/app/views/domain/pdf.haml b/app/views/domain/pdf.haml new file mode 100644 index 000000000..12cde3746 --- /dev/null +++ b/app/views/domain/pdf.haml @@ -0,0 +1,315 @@ +%html{lang: I18n.locale.to_s} + %head + %meta{charset: "utf-8"} + :css + .container { + margin: auto; + font-size: 12px; + } + + .col-md-12 { + + } + + .col-md-6 { + width: 49%; + display: inline-block; + } + + .col-xs-4 { + width: 33%; + } + + .col-xs-2 { + width: 16%; + } + + .col-md-3 { + width: 24%; + display: inline-block; + } + + .left { + float: left; + } + + .left { + padding-right: 5px; + } + + .right { + float: right; + } + + .text-right { + text-align: right; + } + + dt { + float: left; + width: 100px; + clear: left; + text-align: right; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + font-weight: bold; + line-height: 1.42857; + } + + dd { + margin-left: 120px; + line-height: 1.42857; + } + + table { + width: 100%; + border-collapse: collapse; + font-size: 12px; + } + + th { + text-align: left; + border: 0px; + border-top: 1px solid #DDD; + padding: 6px; + } + + thead th { + border-bottom: 2px solid #DDD; + border-top: 0px; + } + + td { + border-top: 1px solid #DDD; + } + + td { + padding: 6px; + } + + .no-border { + border: 0px; + } + + hr { + height: 1px; + border: 0; + color: #DDD; + background-color: #DDD; + } + + .clear { + clear: both; + } + + .pull-down { + margin-top: 50px; + } + + #header { + position: relative; + min-height: 100px; + } + + img { + width: 106px; + height: 102px; + } + + #header-content { + position: absolute; + bottom: 0; + } + + #footer { + position: absolute; + bottom: 0px; + width: 99%; + } + + h1 { + margin-bottom: 5px; + } + + %body + .container + #header.row + .col-sm-6.left + #header-content + %h1 + = @domain.name + .col-sm-6.right + %img{src: "#{Rails.root}/public/eis-logo-black-et.png"} + .clear + %hr + .row + .col-md-6 + .panel.panel-default + .panel-heading + %h3.panel-title + = t(:general) + .panel-body + %dl.dl-horizontal + %dt= t(:name) + %dd= @domain.name + %dt= Domain.human_attribute_name :registered_at + %dd= l(@domain.registered_at) + %dt= t(:registrar_name) + %dd= @domain.registrar + %dt= Domain.human_attribute_name :transfer_code + %dd= @domain.transfer_code + %dt= t(:valid_to) + %dd= l(@domain.valid_to) + %dt= t('.outzone_time') + %dd= l(@domain.outzone_at) + %dt= Domain.human_attribute_name :delete_date + %dd= l @domain.delete_date + %dt= Domain.human_attribute_name :force_delete_date + %dd= l @domain.force_delete_date + %dt= t('.locked_by_registrant_at') + %dd= l(@domain.locked_by_registrant_at) + .col-md-6 + .panel.panel-default + .panel-heading + %h3.panel-title= t('activerecord.models.registrant') + .panel-body + %dl.dl-horizontal + %dt.left_25= t(:name) + %dd.left_25= @domain.registrant + + %dt.left_25= t(:id) + %dd.left_25= @domain.registrant.code + + %dt.left_25= t(:identity_code) + %dd.left_25= @domain.registrant.ident + + %dt.left_25= t(:email) + %dd.left_25= @domain.registrant.email + + %dt.left_25= t(:phone) + %dd.left_25= @domain.registrant.phone + .row + .col-md-12 + - tech_contacts_invalid = @domain.errors.include?(:tech_contacts) + - panel_class = tech_contacts_invalid ? 'panel-danger' : 'panel-default' + .panel{class: panel_class} + .panel-heading.clearfix + = t(:tech_contacts) + .table-responsive + %table.table.table-hover.table-bordered.table-condensed + %thead + %tr + %th{class: 'col-xs-4'}= t(:name) + %th{class: 'col-xs-4'}= t(:id) + %th{class: 'col-xs-4'}= t(:email) + %tbody + - @domain.tech_contacts.each do |tc| + %tr + %td= tc + %td= tc.code + %td= tc.email + - if tech_contacts_invalid + %tfoot + - @domain.errors.messages[:tech_contacts].each do |x| + %tr + %td{colspan: 4}= x + .row + .col-md-12 + - admin_contacts_invalid = @domain.errors.include?(:admin_contacts) + - panel_class = admin_contacts_invalid ? 'panel-danger' : 'panel-default' + .panel{class: panel_class} + .panel-heading.clearfix + = t(:admin_contacts) + .table-responsive + %table.table.table-hover.table-bordered.table-condensed + %thead + %tr + %th{class: 'col-xs-4'}= t(:name) + %th{class: 'col-xs-4'}= t(:id) + %th{class: 'col-xs-4'}= t(:email) + %tbody + - @domain.admin_contacts.each do |ac| + %tr + %td= ac + %td= ac.code + %td= ac.email + - if admin_contacts_invalid + %tfoot + - @domain.errors.messages[:admin_contacts].each do |x| + %tr + %td{colspan: 4}= x + .row + .col-md-12 + #domain_statuses.panel.panel-default + .panel-heading.clearfix + = t(:statuses) + .table-responsive + %table.table.table-hover.table-bordered.table-condensed + %thead + %tr + %th{class: 'col-xs-6'}= t(:status) + %th{class: 'col-xs-6'}= t(:notes) + %tbody + - @domain.statuses.each do |status| + %tr + %td + - if @domain.pending_json.present? && [DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE].include?(status) + = link_to status, admin_domain_domain_versions_path(@domain.id) + - else + = status + %td= @domain.status_notes[status] + .row + .col-md-12 + .panel.panel-default + .panel-heading.clearfix + = t(:nameservers) + .table-responsive + %table.table.table-hover.table-bordered.table-condensed + %thead + %tr + %th{class: 'col-xs-4'}= t(:hostname) + %th{class: 'col-xs-4'}= t(:ipv4) + %th{class: 'col-xs-4'}= t(:ipv6) + %tbody + - @domain.nameservers.each do |x| + %tr + %td= x + %td= x.ipv4 + %td= x.ipv6 + .row + .col-md-12 + .panel.panel-default + .panel-heading.clearfix + = t(:dnskeys) + .table-responsive + %table.table.table-hover.table-bordered.table-condensed + %thead + %tr + %th{class: 'col-xs-1'}= t(:flag) + %th{class: 'col-xs-1'}= t(:protocol) + %th{class: 'col-xs-1'}= t(:algorithm) + %th{class: 'col-xs-9'}= t(:public_key) + %tbody + - @domain.dnskeys.each do |x| + %tr + %td= x.flags + %td= x.protocol + %td= x.alg + %td= x.public_key + .row + .col-md-12 + .panel.panel-default + .panel-heading.clearfix + = t(:legal_documents) + .table-responsive + %table.table.table-hover.table-bordered.table-condensed + %thead + %tr + %th{class: 'col-xs-8'}= t(:created_at) + %th{class: 'col-xs-4'}= t(:type) + %tbody + - @domain.legal_documents.each do |x| + %tr + %td= link_to(x.created_at, [:admin, x]) + %td= x.document_type diff --git a/config/routes.rb b/config/routes.rb index 8fd80f923..2526aa922 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -310,6 +310,7 @@ Rails.application.routes.draw do resource :registry_lock, controller: 'domains/registry_lock', only: :destroy member do + get :download patch :keep end end From b909578c2cb75dc538d74eef4010bbd1f1e541f1 Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Tue, 28 Jun 2022 11:29:25 -0300 Subject: [PATCH 2/6] Improve pdf style --- app/views/domain/pdf.haml | 317 +++++++++++++++++--------------------- 1 file changed, 138 insertions(+), 179 deletions(-) diff --git a/app/views/domain/pdf.haml b/app/views/domain/pdf.haml index 12cde3746..44e9a1213 100644 --- a/app/views/domain/pdf.haml +++ b/app/views/domain/pdf.haml @@ -11,24 +11,10 @@ } - .col-md-6 { - width: 49%; - display: inline-block; - } - .col-xs-4 { width: 33%; } - .col-xs-2 { - width: 16%; - } - - .col-md-3 { - width: 24%; - display: inline-block; - } - .left { float: left; } @@ -41,10 +27,6 @@ float: right; } - .text-right { - text-align: right; - } - dt { float: left; width: 100px; @@ -88,10 +70,6 @@ padding: 6px; } - .no-border { - border: 0px; - } - hr { height: 1px; border: 0; @@ -104,7 +82,7 @@ } .pull-down { - margin-top: 50px; + margin-top: 30px; } #header { @@ -122,12 +100,6 @@ bottom: 0; } - #footer { - position: absolute; - bottom: 0px; - width: 99%; - } - h1 { margin-bottom: 5px; } @@ -137,179 +109,166 @@ #header.row .col-sm-6.left #header-content - %h1 - = @domain.name + %h1= @domain.name .col-sm-6.right %img{src: "#{Rails.root}/public/eis-logo-black-et.png"} .clear %hr .row - .col-md-6 - .panel.panel-default - .panel-heading - %h3.panel-title - = t(:general) - .panel-body - %dl.dl-horizontal - %dt= t(:name) - %dd= @domain.name - %dt= Domain.human_attribute_name :registered_at - %dd= l(@domain.registered_at) - %dt= t(:registrar_name) - %dd= @domain.registrar - %dt= Domain.human_attribute_name :transfer_code - %dd= @domain.transfer_code - %dt= t(:valid_to) - %dd= l(@domain.valid_to) - %dt= t('.outzone_time') - %dd= l(@domain.outzone_at) - %dt= Domain.human_attribute_name :delete_date - %dd= l @domain.delete_date - %dt= Domain.human_attribute_name :force_delete_date - %dd= l @domain.force_delete_date - %dt= t('.locked_by_registrant_at') - %dd= l(@domain.locked_by_registrant_at) - .col-md-6 - .panel.panel-default - .panel-heading - %h3.panel-title= t('activerecord.models.registrant') - .panel-body - %dl.dl-horizontal - %dt.left_25= t(:name) - %dd.left_25= @domain.registrant + .col-sm-6.left + %h3= t(:general) + %hr + %dl.dl-horizontal + %dt= t(:name) + %dd= @domain.name + %dt= Domain.human_attribute_name :registered_at + %dd= l(@domain.registered_at) + %dt= t(:registrar_name) + %dd= @domain.registrar + %dt= Domain.human_attribute_name :transfer_code + %dd= @domain.transfer_code + %dt= t(:valid_to) + %dd= l(@domain.valid_to) + %dt= t('.outzone_time') + %dd= l(@domain.outzone_at) + %dt= Domain.human_attribute_name :delete_date + %dd= l @domain.delete_date + %dt= Domain.human_attribute_name :force_delete_date + %dd= l @domain.force_delete_date + %dt= t('.locked_by_registrant_at') + %dd= l(@domain.locked_by_registrant_at) + .col-sm-6.right + %h3= t('activerecord.models.registrant') + %hr + %dl.dl-horizontal + %dt.left_25= t(:name) + %dd.left_25= @domain.registrant - %dt.left_25= t(:id) - %dd.left_25= @domain.registrant.code + %dt.left_25= t(:id) + %dd.left_25= @domain.registrant.code - %dt.left_25= t(:identity_code) - %dd.left_25= @domain.registrant.ident + %dt.left_25= t(:identity_code) + %dd.left_25= @domain.registrant.ident - %dt.left_25= t(:email) - %dd.left_25= @domain.registrant.email + %dt.left_25= t(:email) + %dd.left_25= @domain.registrant.email - %dt.left_25= t(:phone) - %dd.left_25= @domain.registrant.phone - .row + %dt.left_25= t(:phone) + %dd.left_25= @domain.registrant.phone + .clear + .row.pull-down .col-md-12 - tech_contacts_invalid = @domain.errors.include?(:tech_contacts) - - panel_class = tech_contacts_invalid ? 'panel-danger' : 'panel-default' - .panel{class: panel_class} - .panel-heading.clearfix - = t(:tech_contacts) - .table-responsive - %table.table.table-hover.table-bordered.table-condensed - %thead + %h3= t(:tech_contacts) + %hr + .table-responsive + %table.table.table-hover.table-condensed + %thead + %tr + %th{class: 'col-xs-4'}= t(:name) + %th{class: 'col-xs-4'}= t(:id) + %th{class: 'col-xs-4'}= t(:email) + %tbody + - @domain.tech_contacts.each do |tc| %tr - %th{class: 'col-xs-4'}= t(:name) - %th{class: 'col-xs-4'}= t(:id) - %th{class: 'col-xs-4'}= t(:email) - %tbody - - @domain.tech_contacts.each do |tc| + %td= tc + %td= tc.code + %td= tc.email + - if tech_contacts_invalid + %tfoot + - @domain.errors.messages[:tech_contacts].each do |x| %tr - %td= tc - %td= tc.code - %td= tc.email - - if tech_contacts_invalid - %tfoot - - @domain.errors.messages[:tech_contacts].each do |x| - %tr - %td{colspan: 4}= x + %td{colspan: 4}= x .row .col-md-12 - admin_contacts_invalid = @domain.errors.include?(:admin_contacts) - - panel_class = admin_contacts_invalid ? 'panel-danger' : 'panel-default' - .panel{class: panel_class} - .panel-heading.clearfix - = t(:admin_contacts) - .table-responsive - %table.table.table-hover.table-bordered.table-condensed - %thead + %h3= t(:admin_contacts) + %hr + .table-responsive + %table.table.table-hover.table-condensed + %thead + %tr + %th{class: 'col-xs-4'}= t(:name) + %th{class: 'col-xs-4'}= t(:id) + %th{class: 'col-xs-4'}= t(:email) + %tbody + - @domain.admin_contacts.each do |ac| %tr - %th{class: 'col-xs-4'}= t(:name) - %th{class: 'col-xs-4'}= t(:id) - %th{class: 'col-xs-4'}= t(:email) - %tbody - - @domain.admin_contacts.each do |ac| + %td= ac + %td= ac.code + %td= ac.email + - if admin_contacts_invalid + %tfoot + - @domain.errors.messages[:admin_contacts].each do |x| %tr - %td= ac - %td= ac.code - %td= ac.email - - if admin_contacts_invalid - %tfoot - - @domain.errors.messages[:admin_contacts].each do |x| - %tr - %td{colspan: 4}= x - .row + %td{colspan: 4}= x + .clear + .row.pull-down .col-md-12 - #domain_statuses.panel.panel-default - .panel-heading.clearfix - = t(:statuses) - .table-responsive - %table.table.table-hover.table-bordered.table-condensed - %thead + %h3= t(:statuses) + %hr + .table-responsive + %table.table.table-hover.table-condensed + %thead + %tr + %th{class: 'col-xs-6'}= t(:status) + %th{class: 'col-xs-6'}= t(:notes) + %tbody + - @domain.statuses.each do |status| %tr - %th{class: 'col-xs-6'}= t(:status) - %th{class: 'col-xs-6'}= t(:notes) - %tbody - - @domain.statuses.each do |status| - %tr - %td - - if @domain.pending_json.present? && [DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE].include?(status) - = link_to status, admin_domain_domain_versions_path(@domain.id) - - else - = status - %td= @domain.status_notes[status] - .row + %td= status + %td= @domain.status_notes[status] + .clear + .row.pull-down .col-md-12 - .panel.panel-default - .panel-heading.clearfix - = t(:nameservers) - .table-responsive - %table.table.table-hover.table-bordered.table-condensed - %thead + %h3= t(:nameservers) + %hr + .table-responsive + %table.table.table-hover.table-condensed + %thead + %tr + %th{class: 'col-xs-4'}= t(:hostname) + %th{class: 'col-xs-4'}= t(:ipv4) + %th{class: 'col-xs-4'}= t(:ipv6) + %tbody + - @domain.nameservers.each do |x| %tr - %th{class: 'col-xs-4'}= t(:hostname) - %th{class: 'col-xs-4'}= t(:ipv4) - %th{class: 'col-xs-4'}= t(:ipv6) - %tbody - - @domain.nameservers.each do |x| - %tr - %td= x - %td= x.ipv4 - %td= x.ipv6 - .row + %td= x + %td= x.ipv4 + %td= x.ipv6 + .clear + .row.pull-down .col-md-12 - .panel.panel-default - .panel-heading.clearfix - = t(:dnskeys) - .table-responsive - %table.table.table-hover.table-bordered.table-condensed - %thead + %h3= t(:dnskeys) + %hr + .table-responsive + %table.table.table-hover.table-condensed + %thead + %tr + %th{class: 'col-xs-1'}= t(:flag) + %th{class: 'col-xs-1'}= t(:protocol) + %th{class: 'col-xs-1'}= t(:algorithm) + %th{class: 'col-xs-9'}= t(:public_key) + %tbody + - @domain.dnskeys.each do |x| %tr - %th{class: 'col-xs-1'}= t(:flag) - %th{class: 'col-xs-1'}= t(:protocol) - %th{class: 'col-xs-1'}= t(:algorithm) - %th{class: 'col-xs-9'}= t(:public_key) - %tbody - - @domain.dnskeys.each do |x| - %tr - %td= x.flags - %td= x.protocol - %td= x.alg - %td= x.public_key - .row + %td= x.flags + %td= x.protocol + %td= x.alg + %td= x.public_key + .clear + .row.pull-down .col-md-12 - .panel.panel-default - .panel-heading.clearfix - = t(:legal_documents) - .table-responsive - %table.table.table-hover.table-bordered.table-condensed - %thead + %h3= t(:legal_documents) + %hr + .table-responsive + %table.table.table-hover.table-condensed + %thead + %tr + %th{class: 'col-xs-8'}= t(:created_at) + %th{class: 'col-xs-4'}= t(:type) + %tbody + - @domain.legal_documents.each do |x| %tr - %th{class: 'col-xs-8'}= t(:created_at) - %th{class: 'col-xs-4'}= t(:type) - %tbody - - @domain.legal_documents.each do |x| - %tr - %td= link_to(x.created_at, [:admin, x]) - %td= x.document_type + %td= x.created_at + %td= x.document_type From b33f3a93d95f85f118dd850cbfb2cdb0c4d68e9c Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Wed, 29 Jun 2022 10:44:17 -0300 Subject: [PATCH 3/6] Add tests --- test/integration/admin_area/domain_test.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 test/integration/admin_area/domain_test.rb diff --git a/test/integration/admin_area/domain_test.rb b/test/integration/admin_area/domain_test.rb new file mode 100644 index 000000000..081214bc8 --- /dev/null +++ b/test/integration/admin_area/domain_test.rb @@ -0,0 +1,18 @@ +require 'test_helper' + +class DomainTest < ApplicationIntegrationTest + setup do + @domain = domains(:shop) + sign_in users(:admin) + end + + def test_downloads_domain + filename = "#{@domain.name}.pdf" + get download_admin_domain_path(@domain) + + assert_response :ok + assert_equal 'application/pdf', response.headers['Content-Type'] + assert_equal "attachment; filename=\"#{filename}\"; filename*=UTF-8''#{filename}", response.headers['Content-Disposition'] + assert_not_empty response.body + end +end From 006baa9c357806aef0165e8ebf1600cb88be1d1e Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Wed, 29 Jun 2022 10:45:04 -0300 Subject: [PATCH 4/6] Show just important data and Estonian translation --- app/views/domain/pdf.haml | 155 +++++++++++++++----------------------- 1 file changed, 61 insertions(+), 94 deletions(-) diff --git a/app/views/domain/pdf.haml b/app/views/domain/pdf.haml index 44e9a1213..7696ddfc7 100644 --- a/app/views/domain/pdf.haml +++ b/app/views/domain/pdf.haml @@ -1,4 +1,4 @@ -%html{lang: I18n.locale.to_s} +%html{lang: 'et'} %head %meta{charset: "utf-8"} :css @@ -104,130 +104,108 @@ margin-bottom: 5px; } + #footer { + position: absolute; + bottom: 0px; + width: 99%; + } + + .blue { + color: #0098da; + } + %body .container #header.row .col-sm-6.left #header-content - %h1= @domain.name + %h1= "#{@domain.name} (#{Time.zone.now.to_date.strftime("%d/%m/%Y")})" .col-sm-6.right %img{src: "#{Rails.root}/public/eis-logo-black-et.png"} .clear %hr .row - .col-sm-6.left - %h3= t(:general) + .col-sm-8.left + %h3 Üldine %hr %dl.dl-horizontal - %dt= t(:name) + %dt Nimi %dd= @domain.name - %dt= Domain.human_attribute_name :registered_at - %dd= l(@domain.registered_at) - %dt= t(:registrar_name) - %dd= @domain.registrar - %dt= Domain.human_attribute_name :transfer_code - %dd= @domain.transfer_code - %dt= t(:valid_to) - %dd= l(@domain.valid_to) - %dt= t('.outzone_time') - %dd= l(@domain.outzone_at) - %dt= Domain.human_attribute_name :delete_date - %dd= l @domain.delete_date - %dt= Domain.human_attribute_name :force_delete_date - %dd= l @domain.force_delete_date - %dt= t('.locked_by_registrant_at') - %dd= l(@domain.locked_by_registrant_at) - .col-sm-6.right - %h3= t('activerecord.models.registrant') + %dt Registreeritud + %dd= @domain.registered_at.to_date.strftime("%d/%m/%Y") + %dt Registreering aegub + %dd= @domain.valid_to.to_date.strftime("%d/%m/%Y") + %dt Registripidaja + %dd= "#{@domain.registrar} #{@domain.registrar.website}" + + .col-sm-4.right + %h3 Registreerija %hr %dl.dl-horizontal - %dt.left_25= t(:name) + %dt.left_25 Nimi %dd.left_25= @domain.registrant - %dt.left_25= t(:id) - %dd.left_25= @domain.registrant.code + %dt.left_25 Isikukood + %dd.left_25= @domain.registrant.ident_human_description - %dt.left_25= t(:identity_code) - %dd.left_25= @domain.registrant.ident - - %dt.left_25= t(:email) + %dt.left_25 E-mail %dd.left_25= @domain.registrant.email - %dt.left_25= t(:phone) + %dt.left_25 Telefon %dd.left_25= @domain.registrant.phone + .clear .row.pull-down .col-md-12 - - tech_contacts_invalid = @domain.errors.include?(:tech_contacts) - %h3= t(:tech_contacts) + %h3 Administraatori kontaktid %hr .table-responsive %table.table.table-hover.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t(:name) - %th{class: 'col-xs-4'}= t(:id) - %th{class: 'col-xs-4'}= t(:email) - %tbody - - @domain.tech_contacts.each do |tc| - %tr - %td= tc - %td= tc.code - %td= tc.email - - if tech_contacts_invalid - %tfoot - - @domain.errors.messages[:tech_contacts].each do |x| - %tr - %td{colspan: 4}= x - .row - .col-md-12 - - admin_contacts_invalid = @domain.errors.include?(:admin_contacts) - %h3= t(:admin_contacts) - %hr - .table-responsive - %table.table.table-hover.table-condensed - %thead - %tr - %th{class: 'col-xs-4'}= t(:name) - %th{class: 'col-xs-4'}= t(:id) - %th{class: 'col-xs-4'}= t(:email) + %th{class: 'col-xs-3'} Nimi + %th{class: 'col-xs-3'} Isikukood + %th{class: 'col-xs-3'} E-mail + %th{class: 'col-xs-3'} Telefon %tbody - @domain.admin_contacts.each do |ac| %tr - %td= ac - %td= ac.code + %td= ac.name + %td= ac.ident_human_description %td= ac.email - - if admin_contacts_invalid - %tfoot - - @domain.errors.messages[:admin_contacts].each do |x| - %tr - %td{colspan: 4}= x + %td= ac.phone + .clear .row.pull-down .col-md-12 - %h3= t(:statuses) + %h3 Tehnilised kontaktid %hr .table-responsive %table.table.table-hover.table-condensed %thead %tr - %th{class: 'col-xs-6'}= t(:status) - %th{class: 'col-xs-6'}= t(:notes) + %th{class: 'col-xs-3'} Nimi + %th{class: 'col-xs-3'} Isikukood + %th{class: 'col-xs-3'} E-mail + %th{class: 'col-xs-3'} Telefon %tbody - - @domain.statuses.each do |status| + - @domain.tech_contacts.each do |tc| %tr - %td= status - %td= @domain.status_notes[status] + %td= tc.name + %td= tc.ident_human_description + %td= tc.email + %td= tc.phone + .clear .row.pull-down .col-md-12 - %h3= t(:nameservers) + %h3 Nimeserverid %hr .table-responsive %table.table.table-hover.table-condensed %thead %tr - %th{class: 'col-xs-4'}= t(:hostname) + %th{class: 'col-xs-4'} Hostinimi %th{class: 'col-xs-4'}= t(:ipv4) %th{class: 'col-xs-4'}= t(:ipv6) %tbody @@ -245,10 +223,10 @@ %table.table.table-hover.table-condensed %thead %tr - %th{class: 'col-xs-1'}= t(:flag) - %th{class: 'col-xs-1'}= t(:protocol) - %th{class: 'col-xs-1'}= t(:algorithm) - %th{class: 'col-xs-9'}= t(:public_key) + %th{class: 'col-xs-1'} Lipp + %th{class: 'col-xs-1'} Protokolli + %th{class: 'col-xs-1'} Algoritm + %th{class: 'col-xs-9'} Avalik võti %tbody - @domain.dnskeys.each do |x| %tr @@ -256,19 +234,8 @@ %td= x.protocol %td= x.alg %td= x.public_key - .clear - .row.pull-down - .col-md-12 - %h3= t(:legal_documents) - %hr - .table-responsive - %table.table.table-hover.table-condensed - %thead - %tr - %th{class: 'col-xs-8'}= t(:created_at) - %th{class: 'col-xs-4'}= t(:type) - %tbody - - @domain.legal_documents.each do |x| - %tr - %td= x.created_at - %td= x.document_type + #footer + %hr + %p{class: 'blue'} Eesti Interneti SA + %p Paldiski mnt 80, 10617 Tallinn, Estonia T +372 727 1000 E info@internet.ee www.internet.ee + %p Reg. nr 90010019 KMKR EE101286464 From 962dc9e45e0646faeb773d0473c49fcca9054372 Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Wed, 29 Jun 2022 11:16:19 -0300 Subject: [PATCH 5/6] Fix wrong Estonian translation --- app/views/domain/pdf.haml | 4 ++-- .../admin_area/{domain_test.rb => domain_show_test.rb} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename test/integration/admin_area/{domain_test.rb => domain_show_test.rb} (90%) diff --git a/app/views/domain/pdf.haml b/app/views/domain/pdf.haml index 7696ddfc7..517192bef 100644 --- a/app/views/domain/pdf.haml +++ b/app/views/domain/pdf.haml @@ -133,7 +133,7 @@ %dd= @domain.name %dt Registreeritud %dd= @domain.registered_at.to_date.strftime("%d/%m/%Y") - %dt Registreering aegub + %dt Aegub %dd= @domain.valid_to.to_date.strftime("%d/%m/%Y") %dt Registripidaja %dd= "#{@domain.registrar} #{@domain.registrar.website}" @@ -157,7 +157,7 @@ .clear .row.pull-down .col-md-12 - %h3 Administraatori kontaktid + %h3 Halduskontaktid %hr .table-responsive %table.table.table-hover.table-condensed diff --git a/test/integration/admin_area/domain_test.rb b/test/integration/admin_area/domain_show_test.rb similarity index 90% rename from test/integration/admin_area/domain_test.rb rename to test/integration/admin_area/domain_show_test.rb index 081214bc8..0e016bf45 100644 --- a/test/integration/admin_area/domain_test.rb +++ b/test/integration/admin_area/domain_show_test.rb @@ -1,6 +1,6 @@ require 'test_helper' -class DomainTest < ApplicationIntegrationTest +class DomainShowTest < ApplicationIntegrationTest setup do @domain = domains(:shop) sign_in users(:admin) From 74ab6fd771f3698d56b5d604e64682279a8321f1 Mon Sep 17 00:00:00 2001 From: Thiago Youssef Date: Wed, 29 Jun 2022 11:27:46 -0300 Subject: [PATCH 6/6] Add download button translation --- app/views/admin/domains/show.html.erb | 2 +- config/locales/admin/domains.en.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/admin/domains/show.html.erb b/app/views/admin/domains/show.html.erb index 7fde9f7b1..3055dbca5 100644 --- a/app/views/admin/domains/show.html.erb +++ b/app/views/admin/domains/show.html.erb @@ -11,7 +11,7 @@
- <%= link_to t('.download'), download_admin_domain_path(@domain), class: 'btn btn-primary' %> + <%= link_to t('.download_btn'), download_admin_domain_path(@domain), class: 'btn btn-primary' %> <%= link_to t('.edit_btn'), edit_admin_domain_path(@domain), class: 'btn btn-primary' %> <%= link_to t('.history_btn'), admin_domain_domain_versions_path(@domain), class: 'btn btn-primary' %> diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml index ce59294dd..35e209011 100644 --- a/config/locales/admin/domains.en.yml +++ b/config/locales/admin/domains.en.yml @@ -6,6 +6,7 @@ en: registrant: Registrant show: + download_btn: Download PDF edit_btn: Edit statuses history_btn: History