diff --git a/app/views/registrant/domains/index.haml b/app/views/registrant/domains/index.haml deleted file mode 100644 index c0daa60df..000000000 --- a/app/views/registrant/domains/index.haml +++ /dev/null @@ -1,77 +0,0 @@ -= render 'shared/title', name: t(:domains) - -.row - .col-md-12 - = search_form_for [:registrant, @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(:registrant_ident) - = f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) - .row - .col-md-3 - .form-group - = f.label t(:valid_to_from) - = f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from) - .col-md-3 - .form-group - = f.label t(:valid_to_until) - = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until) - .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 -   - = link_to(t('.reset_btn'), registrant_domains_path, class: 'btn btn-default') - .row - .col-md-3 - .btn-group{:role => "group"} - %button.btn.btn-default.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button"} - Download - %span.caret - %ul.dropdown-menu - %li= link_to 'PDF', download_list_registrant_domains_path(q: params[:q], format: "pdf") - %li= link_to 'CSV', download_list_registrant_domains_path(q: params[:q], format: "csv") - .col-md-3 - .col-md-3 - .col-md-3 - - - -%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') - %th{class: 'col-xs-2'} - = sort_link(@q, 'registrant_name', t('.registrant')) - %th{class: 'col-xs-2'} - = sort_link(@q, 'valid_to', t(:valid_to)) - %th{class: 'col-xs-2'} - = sort_link(@q, 'registrar_name', t(:registrar_name)) - %tbody - - @domains.each do |x| - %tr - %td= link_to(x, registrant_domain_path(x)) - %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 - - .row - .col-md-6 - = paginate @domains - .col-md-6.text-right - .pagination - = t(:result_count, count: @domains.total_count) diff --git a/app/views/registrant/domains/index.html.erb b/app/views/registrant/domains/index.html.erb new file mode 100644 index 000000000..d39ed5a33 --- /dev/null +++ b/app/views/registrant/domains/index.html.erb @@ -0,0 +1,122 @@ +<%= render 'shared/title', name: t(:domains) %> +
+
+ <%= search_form_for [:registrant, @q], html: { style: 'margin-bottom: 0;', class: 'js-form', autocomplete: 'off' } do |f| %> +
+
+
+ <%= f.label :name %> + <%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name) %> +
+
+
+
+ <%= f.label t(:registrant_ident) %> + <%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %> +
+
+
+
+
+
+ <%= f.label t(:valid_to_from) %> + <%= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from) %> +
+
+
+
+ <%= f.label t(:valid_to_until) %> + <%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until) %> +
+
+
+
+ <%= label_tag t(:results_per_page) %> + <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %> +
+
+
+ + <%= link_to(t('.reset_btn'), registrant_domains_path, class: 'btn btn-default') %> +
+
+
+
+
+ +
    +
  • + <%= link_to 'PDF', download_list_registrant_domains_path(q: params[:q], format: "pdf") %> +
    • +
  • + <%= link_to 'CSV', download_list_registrant_domains_path(q: params[:q], format: "csv") %> +
    • +
+
+
+
+
+
+
+ <% end %> +
+
+
+
+
+
+ + + + + + + + + + + <% @domains.each do |x| %> + + + + + + +
+ <% end %> + +
+ <%= sort_link(@q, 'name') %> + + <%= sort_link(@q, 'registrant_name', t('.registrant')) %> + + <%= sort_link(@q, 'valid_to', t(:valid_to)) %> + + <%= sort_link(@q, 'registrar_name', t(:registrar_name)) %> +
+ <%= link_to(x, registrant_domain_path(x)) %> + + <%= link_to(x.registrant.name, registrant_contact_path(x.registrant)) if x.registrant %> + + <%= l(x.valid_to, format: :short) %> + + <%= link_to(x.registrar, registrant_registrar_path(x.registrar)) if x.registrar %> +
+
+
+
+ <%= paginate @domains %> +
+
+ +
+
diff --git a/app/views/registrant/domains/show.haml b/app/views/registrant/domains/show.haml deleted file mode 100644 index 4d524b785..000000000 --- a/app/views/registrant/domains/show.haml +++ /dev/null @@ -1,17 +0,0 @@ -= 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 - .col-md-12= render 'registrant/domains/partials/admin_contacts' -.row - .col-md-12= render 'registrant/domains/partials/statuses' -.row - .col-md-12= render 'registrant/domains/partials/nameservers' -.row - .col-md-12= render 'registrant/domains/partials/dnskeys' -.row - .col-md-12= render 'registrant/domains/partials/keyrelays' diff --git a/app/views/registrant/domains/show.html.erb b/app/views/registrant/domains/show.html.erb new file mode 100644 index 000000000..32dc2584a --- /dev/null +++ b/app/views/registrant/domains/show.html.erb @@ -0,0 +1,46 @@ +<%= render 'shared/title', name: @domain.name %> + +
+
+ <%= render 'registrant/domains/partials/general' %> +
+
+ <%= render 'registrant/domains/partials/owner' %> +
+
+ +
+
+ <%= render 'registrant/domains/partials/tech_contacts' %> +
+
+ +
+
+ <%= render 'registrant/domains/partials/admin_contacts' %> +
+
+ +
+
+ <%= render 'registrant/domains/partials/statuses' %> +
+
+ +
+
+ <%= render 'registrant/domains/partials/nameservers' %> +
+
+ +
+
+ <%= render 'registrant/domains/partials/dnskeys' %> +
+
+ +
+
+ <%= render 'registrant/domains/partials/keyrelays' %> +
+