diff --git a/app/views/admin/_menu.haml b/app/views/admin/_menu.haml index 4077e58f2..668ba9a5c 100644 --- a/app/views/admin/_menu.haml +++ b/app/views/admin/_menu.haml @@ -14,9 +14,9 @@ = t(:settings) %span.caret %ul.dropdown-menu{role: "menu"} - %li.dropdown-header= t(:users) - %li= link_to t(:api_users), admin_api_users_path - %li= link_to t(:admin_users), admin_admin_users_path + %li.dropdown-header= t('.users') + %li= link_to t('.api_users'), admin_api_users_path + %li= link_to t('.admin_users'), admin_admin_users_path %li.divider %li.dropdown-header= t(:billing) - if can? :view, Pricelist @@ -25,9 +25,9 @@ %li= link_to t(:invoices), admin_invoices_path %li= link_to t(:account_activities), admin_account_activities_path(created_after: 'today') %li.divider - %li.dropdown-header= t(:archive) - %li= link_to t(:domains_history), admin_domain_versions_path - %li= link_to t(:contacts_history), admin_contact_versions_path + %li.dropdown-header= t('.archive') + %li= link_to t('.domain_history'), admin_domain_versions_path + %li= link_to t('.contact_history'), admin_contact_versions_path %li.divider %li.dropdown-header= t(:system) %li= link_to t(:settings), admin_settings_path @@ -37,7 +37,7 @@ %li= link_to t(:mail_templates), admin_mail_templates_path %li= link_to t(:epp_logs), admin_epp_logs_path(created_after: 'today') %li= link_to t(:repp_logs), admin_repp_logs_path(created_after: 'today') - %li= link_to t(:que), '/admin/que' + %li= link_to t('.que'), '/admin/que' - if signed_in? %ul.nav.navbar-nav.navbar-right diff --git a/app/views/admin/contacts/index.haml b/app/views/admin/contacts/index.haml index 9c015c372..07cf640ce 100644 --- a/app/views/admin/contacts/index.haml +++ b/app/views/admin/contacts/index.haml @@ -70,8 +70,7 @@   %span.glyphicon.glyphicon-search   - %button.btn.btn-default.js-reset-form - = t(:clear_fields) + = link_to(t('.reset_btn'), admin_contacts_path, class: 'btn btn-default') %hr .row .col-md-12 @@ -106,8 +105,3 @@ .col-md-6.text-right .pagination = t(:result_count, count: @contacts.total_count) - -:coffee - $(".js-reset-form").on "click", (e) -> - e.preventDefault(); - window.location = "#{admin_contacts_path}" diff --git a/app/views/admin/domains/index.haml b/app/views/admin/domains/index.haml index f901354a6..244b3dff7 100644 --- a/app/views/admin/domains/index.haml +++ b/app/views/admin/domains/index.haml @@ -47,8 +47,7 @@   %span.glyphicon.glyphicon-search   - %button.btn.btn-default.js-reset-form - = t(:clear_fields) + = link_to(t(:clear_fields), admin_domains_path, class: 'btn btn-default') %hr .row .col-md-12 @@ -80,8 +79,3 @@ .col-md-6.text-right .pagination = t(:result_count, count: @domains.total_count) - -:coffee - $(".js-reset-form").on "click", (e) -> - e.preventDefault(); - window.location = "#{admin_domains_path}" diff --git a/app/views/admin/domains/versions.haml b/app/views/admin/domains/versions.haml index 9e2cf2803..b4da9165d 100644 --- a/app/views/admin/domains/versions.haml +++ b/app/views/admin/domains/versions.haml @@ -8,11 +8,11 @@ %table.table.table-bordered.table-condensed %thead %tr - %th{class: 'col-xs-1'}= t(:timestap) + %th{class: 'col-xs-1'}= t('.time') %th{class: 'col-xs-2'}= t(:statuses) %th{class: 'col-xs-1'}= t(:period) %th{class: 'col-xs-2'}= t(:registrant) - %th{class: 'col-xs-2'}= t(:admin) + %th{class: 'col-xs-2'}= t('.admin_contact') %th{class: 'col-xs-2'}= t(:tech) %th{class: 'col-xs-2'}= t(:nameservers) %th{class: 'col-xs-2'}= t(:dnskeys) diff --git a/config/locales/admin/contacts.en.yml b/config/locales/admin/contacts.en.yml new file mode 100644 index 000000000..f38e6611f --- /dev/null +++ b/config/locales/admin/contacts.en.yml @@ -0,0 +1,5 @@ +en: + admin: + contacts: + index: + reset_btn: Reset diff --git a/config/locales/admin/domains.en.yml b/config/locales/admin/domains.en.yml new file mode 100644 index 000000000..6fc5f2f5d --- /dev/null +++ b/config/locales/admin/domains.en.yml @@ -0,0 +1,6 @@ +en: + admin: + domains: + versions: + time: Time + admin_contact: Admin contact diff --git a/config/locales/admin/menu.en.yml b/config/locales/admin/menu.en.yml new file mode 100644 index 000000000..5ca490b80 --- /dev/null +++ b/config/locales/admin/menu.en.yml @@ -0,0 +1,10 @@ +en: + admin: + menu: + users: Users + api_users: API users + admin_users: Admin users + archive: Archive + domain_history: Domain history + contact_history: Contact history + que: Que diff --git a/config/locales/en.yml b/config/locales/en.yml index 8e4d26b9b..d4f1c6602 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -408,7 +408,6 @@ en: users: 'Users' create_new_user: 'Create new user' - admin: 'Admin' user_details: 'User details' edit_user: 'Edit user' back_to_user: 'Back to user' @@ -459,11 +458,9 @@ en: ds_digest_type: 'DS digest type' zonefile_settings: 'Zonefile settings' background_jobs: Background jobs - domain_history: Domain history domains_history: Domains history admin_users: Admin users role: 'Role' - admin: 'Administrator' user: 'User' customer_service: 'Customer service' keyrelays: 'Keyrelays' @@ -850,7 +847,6 @@ en: webserver_missing_client_cert_directive: 'Webserver missing client cert directive' webserver_client_cert_directive_should_be_required: 'Webserver client cert directive should be required' tech: Tech contact - admin: Admin contact pricelists: Pricelists new_pricelist: New Pricelist valid: Valid