Merge pull request #107 from internetee/105842700-registrants_portal

105842700 registrants portal

app/views/registrant/contacts/partials/_domains.haml

@@ -1,4 +1,4 @@
-- domains = contact.all_domains(page: params[:domain_page], per: 20, params: params)
+- domains = contact.all_domains(page: params[:domain_page], per: 20, params: params.merge(leave_domains: domain_ids))
 #contacts.panel.panel-default
   .panel-heading
     .pull-left
@@ -18,7 +18,7 @@
           %th{class: 'col-xs-3'}=custom_sort_link t(:domain_name), :name
           %th{class: 'col-xs-3'}=custom_sort_link t(:registrar), :registrar_name
           %th{class: 'col-xs-3'}=custom_sort_link t(:valid_to), :valid_to
-          %th{class: 'col-xs-3'}= t(:roles)
+          %th{class: 'col-xs-3'}=custom_sort_link t(:roles), :roles
       %tbody
         - domains.each do |x|
           %tr

app/views/registrant/contacts/partials/_general.haml

@@ -6,6 +6,9 @@
       %dt= t(:id)
       %dd= @contact.code
 
+      %dt= t(:name)
+      %dd= @contact.name
+
       %dt= t(:password)
       %dd
         = text_field_tag :auth_info, @contact.auth_info, readonly: true, class: 'partially-hidden'
@@ -31,13 +34,13 @@
       %dd
         = l(@contact.created_at, format: :short)
         by
-        = creator_link(@contact)
+        = @contact.name
 
       %dt= t(:updated)
       %dd
         = l(@contact.updated_at, format: :short)
         by
-        = updator_link(@contact)
+        = @contact.name
 
       %dt= t(:registrar)
       %dd

app/views/registrant/contacts/show.haml

@@ -1,5 +1,4 @@
-- content_for :actions do
-  = render 'shared/title', name: @contact.name
+= render 'shared/title', name: @contact.name
 
 .row
   .col-md-6= render 'registrant/contacts/partials/general'

app/views/registrant/domains/domain_verification_url.haml

@@ -0,0 +1,13 @@
+- content_for :actions do
+  = render 'shared/title', name: @domain.name
+
+.row
+  .col-md-12
+    .panel.panel-default
+      .panel-heading
+        %h3.panel-title= t(:personal_domain_verification_url)
+      .panel-body
+        .input-group.input-group-lg
+          %span#sizing-addon1.input-group-addon.glyphicon.glyphicon-link
+          %input.form-control{"aria-describedby" => "sizing-addon1", type: "text", value: @verification_url}
+

app/views/registrant/domains/index.haml

@@ -66,10 +66,7 @@
           - @domains.each do |x|
             %tr
               %td= link_to(x, registrant_domain_path(x))
-              %td
-                - if x.registrant
-                  = link_to(x.registrant, [:registrant, x.registrant]) if x.registrant
-
+              %td= link_to(x.registrant.name, registrant_contact_path(x.registrant)) if x.registrant
               %td= l(x.valid_to, format: :short)
               %td= link_to(x.registrar, registrant_registrar_path(x.registrar)) if x.registrar
 

app/views/registrant/domains/partials/_owner.haml

@@ -4,7 +4,7 @@
   .panel-body
     %dl.dl-horizontal
       %dt= t(:name)
-      %dd= link_to(@domain.registrant, [:registrar, @domain.registrant])
+      %dd= link_to(@domain.registrant.name, registrant_contact_path(@domain.registrant))
 
       %dt= t(:id)
       %dd= @domain.registrant_code

app/views/registrant/domains/partials/_statuses.haml

@@ -11,8 +11,8 @@
         - @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)
+              - if [DomainStatus::PENDING_UPDATE, DomainStatus::PENDING_DELETE_CONFIRMATION].include?(status) && @domain.pending_json.present?
+                = link_to(status, domain_verification_url_registrant_domain_url(@domain.id))
               - else
                 = status
             %td= @domain.status_notes[status]

app/views/registrant/domains/show.haml

@@ -1,8 +1,8 @@
-- content_for :actions do
-  = render 'shared/title', name: @domain.name
+= render 'shared/title', name: @domain.name
 
 .row
   .col-md-6= render 'registrant/domains/partials/general'
+  .col-md-6= render 'registrant/domains/partials/owner'
 .row
   .col-md-12= render 'registrant/domains/partials/tech_contacts'
 .row

app/views/registrant/registrants/index.haml

@@ -1,112 +0,0 @@
-= render 'shared/title', name: t(:contacts)
-
-.row
-  .col-md-12
-    = search_form_for [:registrar, @q], html: { style: 'margin-bottom: 0;', class: 'js-form', autocomplete: 'off' } do |f|
-      .row
-        .col-md-3
-          .form-group
-            = f.label :name
-            = f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name)
-        .col-md-3
-          .form-group
-            = f.label t(:id)
-            = f.search_field :code_eq, class: 'form-control', placeholder: t(:id)
-        .col-md-3
-          .form-group
-            = f.label t(:ident)
-            = f.search_field :ident_matches, class: 'form-control', placeholder: t(:ident)
-        .col-md-3
-          .form-group
-            = label_tag t(:ident_type)
-            = select_tag '[q][ident_type_eq]', options_for_select(Contact::IDENT_TYPES, params[:q][:ident_type_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
-      .row
-        .col-md-3
-          .form-group
-            = f.label t(:email)
-            = f.search_field :email_matches, class: 'form-control', placeholder: t(:email)
-        .col-md-3
-          .form-group
-            = label_tag t(:country)
-            = select_tag '[q][country_code_eq]', SortedCountry.all_options(params[:q][:country_code_eq]), { include_blank: true, placeholder: t(:choose), class: 'form-control selectize' }
-        .col-md-3
-          .form-group
-            = f.label t(:is_registrant)
-            %div
-              = f.check_box :registrant_domains_id_not_null
-        .col-md-3
-          .form-group
-            = label_tag t(:contact_type)
-            = select_tag '[q][domain_contacts_type_in]', options_for_select([['admin', 'AdminDomainContact'], ['tech', 'TechDomainContact']], params[:q][:domain_contacts_type_in]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
-      .row
-        .col-md-3
-          .form-group
-            = f.label t(:registrar)
-            = f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize', placeholder: t(:choose)
-        .col-md-3
-          .form-group
-            = f.label t(:created_at_from)
-            = f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
-        .col-md-3
-          .form-group
-            = f.label t(:created_at_until)
-            = f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
-        .col-md-3
-          .form-group
-            = f.label t(:updated_at)
-            = f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control datepicker', placeholder: t(:updated_at)
-      .row
-        .col-md-6
-          .form-group
-            = label_tag t(:status)
-            = select_tag :statuses_contains, options_for_select(Contact::STATUSES, params[:statuses_contains]), { multiple: true, placeholder: t(:choose), class: 'form-control js-combobox' }
-        .col-md-3
-          .form-group
-            = label_tag t(:results_per_page)
-            = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page)
-        .col-md-3{style: 'padding-top: 25px;'}
-          %button.btn.btn-primary
-             
-            %span.glyphicon.glyphicon-search
-             
-          %button.btn.btn-default.js-reset-form
-            = t(:clear_fields)
-%hr
-.row
-  .col-md-12
-    .table-responsive
-      %table.table.table-hover.table-bordered.table-condensed
-        %thead
-          %tr
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'name', t(:name))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'code', t(:id))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'ident', t(:ident))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'email', t(:created_at))
-            %th{class: 'col-xs-2'}
-              = sort_link(@q, 'registrar_name', t(:registrar))
-        %tbody
-          - @contacts.each do |contact|
-            %tr
-              %td= link_to(contact, registrar_contact_path(contact))
-              %td= contact.code
-              %td= ident_for(contact)
-              %td= l(contact.created_at, format: :short)
-              %td
-                - if contact.registrar
-                  = link_to(contact.registrar, registrar_registrar_path(contact.registrar))
-
-.row
-  .col-md-6
-    = paginate @contacts
-  .col-md-6.text-right
-    .pagination
-      = t(:result_count, count: @contacts.total_count)
-
-:coffee
-  $(".js-reset-form").on "click", (e) ->
-    e.preventDefault();
-    window.location = "#{registrar_contacts_path}"

app/views/registrant/registrants/show.haml

@@ -1,75 +0,0 @@
-= render 'shared/title', name: @contact.name
-
-.row
-  .col-md-6
-    .panel.panel-default
-      .panel-heading
-        %h3.panel-title= t(:general)
-      .panel-body
-        %dl.dl-horizontal
-          %dt= t(:id)
-          %dd= @contact.code
-
-          %dt= t(:authinfo_pw)
-          %dd
-            = text_field_tag :auth_info, @contact.auth_info, readonly: true, class: 'partially-hidden'
-
-          %br
-
-          %dt= t(:ident)
-          %dd= ident_for(@contact)
-
-          %dt= t(:email)
-          %dd= @contact.email
-
-          %dt= t(:phone)
-          %dd= @contact.phone
-
-          - if @contact.fax
-            %dt= t(:fax)
-            %dd= @contact.fax
-
-          %br
-
-          %dt= t(:created)
-          %dd
-            = l(@contact.created_at, format: :short)
-            by
-            = creator_link(@contact)
-
-          %dt= t(:updated)
-          %dd
-            = l(@contact.updated_at, format: :short)
-            by
-            = updator_link(@contact)
-
-          %dt= t(:registrar)
-          %dd
-            - if @contact.registrar.present?
-              = link_to(@contact.registrar, registrant_registrar_path(@contact.registrar)) if @contact.registrar
-
-  .col-md-6
-    .panel.panel-default
-      .panel-heading
-        %h3.panel-title= t(:contact)
-      .panel-body
-        %dl.dl-horizontal
-          %dl.dl-horizontal
-          - if @contact.org_name.present?
-            %dt= t(:org_name)
-            %dd= @contact.org_name
-
-          %dt= t(:street)
-          %dd= @contact.street.to_s.gsub("\n", '<br>').html_safe
-
-          %dt= t(:city)
-          %dd= @contact.city
-
-          %dt= t(:zip)
-          %dd= @contact.zip
-
-          %dt= t(:state)
-          %dd= @contact.state
-
-          %dt= t(:country)
-          %dd= @contact.country