From a3b04786cf7cfa635d15215041f1ffba8507440c Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Fri, 5 Sep 2014 10:36:34 +0300 Subject: [PATCH] Refactor admin interface under namespace --- .../{ => admin}/setting_groups_controller.rb | 4 ++-- app/models/domain.rb | 2 +- app/views/{ => admin}/setting_groups/index.haml | 4 ++-- app/views/{ => admin}/setting_groups/show.haml | 6 +++--- app/views/layouts/application.html.haml | 2 +- config/locales/en.yml | 12 +++++------- config/routes.rb | 6 ++++-- 7 files changed, 18 insertions(+), 18 deletions(-) rename app/controllers/{ => admin}/setting_groups_controller.rb (81%) rename app/views/{ => admin}/setting_groups/index.haml (66%) rename app/views/{ => admin}/setting_groups/show.haml (84%) diff --git a/app/controllers/setting_groups_controller.rb b/app/controllers/admin/setting_groups_controller.rb similarity index 81% rename from app/controllers/setting_groups_controller.rb rename to app/controllers/admin/setting_groups_controller.rb index 410281dda..373e32858 100644 --- a/app/controllers/setting_groups_controller.rb +++ b/app/controllers/admin/setting_groups_controller.rb @@ -1,4 +1,4 @@ -class SettingGroupsController < ApplicationController +class Admin::SettingGroupsController < ApplicationController before_action :set_setting_group, only: [:show, :update] def index @@ -9,7 +9,7 @@ class SettingGroupsController < ApplicationController def update if @setting_group.update(setting_group_params) - redirect_to @setting_group + redirect_to [:admin, @setting_group] else render 'show' end diff --git a/app/models/domain.rb b/app/models/domain.rb index b77b8ea64..34b98eecb 100644 --- a/app/models/domain.rb +++ b/app/models/domain.rb @@ -247,7 +247,7 @@ class Domain < ActiveRecord::Base def approve_pending_transfer(current_user) pt = pending_transfer if current_user.registrar != pt.transfer_from - add_epp_error('2304', nil, nil, I18n.t('transfer_can_be_approved_only_by_current_registrar')) + add_epp_error('2304', nil, nil, I18n.t('shared.transfer_can_be_approved_only_by_current_registrar')) return false end diff --git a/app/views/setting_groups/index.haml b/app/views/admin/setting_groups/index.haml similarity index 66% rename from app/views/setting_groups/index.haml rename to app/views/admin/setting_groups/index.haml index 07bbdcafd..14792d48b 100644 --- a/app/views/setting_groups/index.haml +++ b/app/views/admin/setting_groups/index.haml @@ -5,10 +5,10 @@ %table.table.table-striped.table-bordered %tr %th{class: 'col-xs-9'} - = t('.setting_group') + = t('shared.setting_group') %th{class: 'col-xs-2'} = t('shared.action') - @setting_groups.each do |x| %tr %td= t("setting_groups.codes.#{x.code}") - %td= link_to(t('.edit_settings'), setting_group_path(x), class: 'btn btn-primary btn-xs') + %td= link_to(t('shared.edit_settings'), admin_setting_group_path(x), class: 'btn btn-primary btn-xs') diff --git a/app/views/setting_groups/show.haml b/app/views/admin/setting_groups/show.haml similarity index 84% rename from app/views/setting_groups/show.haml rename to app/views/admin/setting_groups/show.haml index 6f3e897c3..e972e5994 100644 --- a/app/views/setting_groups/show.haml +++ b/app/views/admin/setting_groups/show.haml @@ -1,14 +1,14 @@ %h2= t("setting_groups.codes.#{@setting_group.code}") %hr -= form_for(@setting_group) do |f| += form_for([:admin, @setting_group]) do |f| .row .col-md-12 %table.table.table-striped.table-bordered %tr %th{class: 'col-xs-9'} - = t('.setting') + = t('setting') %th{class: 'col-xs-2'} - = t('shared.value') + = t('value') - @setting_group.settings.each do |setting| = f.fields_for :settings, setting do |sf| %tr diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 11915fc62..69f8b0b72 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -36,7 +36,7 @@ %ul.dropdown-menu{role: "menu"} %li.dropdown-header= t('shared.system') %li - = link_to t('shared.setting_groups'), setting_groups_path + = link_to t('shared.setting_groups'), admin_setting_groups_path %li = link_to t('shared.users'), '#' %li diff --git a/config/locales/en.yml b/config/locales/en.yml index 65b32234d..ba07d4428 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -106,12 +106,7 @@ en: setting_groups: codes: domain_validation: 'Domain validation' - - index: - setting_group: 'Setting group' - edit_settings: 'Edit settings' - show: - setting: 'Setting' + domain_general: 'Domain general' settings: codes: @@ -133,4 +128,7 @@ en: epp_users: 'EPP Users' registrars: 'Registrars' - transfer_can_be_approved_only_by_current_registrar: 'Transfer can be approved only by current domain registrar' + transfer_can_be_approved_only_by_current_registrar: 'Transfer can be approved only by current domain registrar' + edit_settings: 'Edit settings' + setting_group: 'Setting group' + setting: 'Setting' diff --git a/config/routes.rb b/config/routes.rb index 2c796e367..b0f0ea48b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,13 +5,15 @@ Rails.application.routes.draw do get 'error/:command', to: 'errors#error', defaults: { format: :xml } end - resources :setting_groups + namespace(:admin) do + resources :setting_groups + end # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". # You can have the root of your site routed with "root" - root 'setting_groups#index' + root 'admin/setting_groups#index' # Example of regular route: # get 'products/:id' => 'catalog#view'