diff --git a/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee b/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee index 45ca04bfe7..f69c5365d5 100644 --- a/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee +++ b/app/assets/javascripts/admin/enterprise_groups/controllers/side_menu_controller.js.coffee @@ -4,12 +4,12 @@ angular.module("admin.enterprise_groups") $scope.select = SideMenu.select $scope.menu.setItems [ - { name: 'Primary Details', icon_class: "icon-user" } - { name: (t('users')), icon_class: "icon-user" } - { name: (t('about')), icon_class: "icon-pencil" } - { name: (t('images')), icon_class: "icon-picture" } - { name: (t('contact')), icon_class: "icon-phone" } - { name: (t('web')), icon_class: "icon-globe" } + { name: 'primary_details', label: t('primary_details'), icon_class: "icon-user" } + { name: 'users', label: t('users'), icon_class: "icon-user" } + { name: 'about', label: t('about'), icon_class: "icon-pencil" } + { name: 'images', label: t('images'), icon_class: "icon-picture" } + { name: 'contact', label: t('admin_entreprise_groups_contact'), icon_class: "icon-phone" } + { name: 'web', label: t('admin_entreprise_groups_web'), icon_class: "icon-globe" } ] $scope.select(0) diff --git a/app/views/admin/enterprise_groups/_form_about.html.haml b/app/views/admin/enterprise_groups/_form_about.html.haml index 1e97697a4e..e7932bc272 100644 --- a/app/views/admin/enterprise_groups/_form_about.html.haml +++ b/app/views/admin/enterprise_groups/_form_about.html.haml @@ -1,6 +1,5 @@ -%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='About'" } } - %legend - = t 'admin_entreprise_groups_about' +%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='about'" } } + %legend {{menu.selected.label}} = f.field_container :long_description do %text-angular{'id' => 'enterprise_group_long_description', 'name' => 'enterprise_group[long_description]', 'class' => 'text-angular', 'ta-toolbar' => "[['h1','h2','h3','h4','p'],['bold','italics','underline','clear'],['insertLink']]"} diff --git a/app/views/admin/enterprise_groups/_form_address.html.haml b/app/views/admin/enterprise_groups/_form_address.html.haml index fa7b1e7e75..2b8add5392 100644 --- a/app/views/admin/enterprise_groups/_form_address.html.haml +++ b/app/views/admin/enterprise_groups/_form_address.html.haml @@ -1,7 +1,6 @@ = f.fields_for :address do |af| - %fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Contact'" } } - %legend - = t 'admin_entreprise_groups_contact' + %fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='contact'" } } + %legend {{menu.selected.label}} .row .alpha.three.columns = af.label :phone diff --git a/app/views/admin/enterprise_groups/_form_images.html.haml b/app/views/admin/enterprise_groups/_form_images.html.haml index 24bfad3bf0..7add7c914a 100644 --- a/app/views/admin/enterprise_groups/_form_images.html.haml +++ b/app/views/admin/enterprise_groups/_form_images.html.haml @@ -1,6 +1,5 @@ -%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Images'" } } - %legend - = t 'admin_entreprise_groups_images' +%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='images'" } } + %legend {{menu.selected.label}} .row .alpha.three.columns = f.label :logo, 'ofn-with-tip' => t('admin_entreprise_groups_data_powertip_logo') diff --git a/app/views/admin/enterprise_groups/_form_primary_details.html.haml b/app/views/admin/enterprise_groups/_form_primary_details.html.haml index 56771c458c..f003963b4e 100644 --- a/app/views/admin/enterprise_groups/_form_primary_details.html.haml +++ b/app/views/admin/enterprise_groups/_form_primary_details.html.haml @@ -1,6 +1,5 @@ -%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Primary Details'" } } - %legend - = t "admin_entreprise_groups_primary_details" +%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='primary_details'" } } + %legend {{menu.selected.label}} = f.field_container :name do = f.label :name %br/ diff --git a/app/views/admin/enterprise_groups/_form_users.html.haml b/app/views/admin/enterprise_groups/_form_users.html.haml index 6bd6eaa4a3..22ac7921ca 100644 --- a/app/views/admin/enterprise_groups/_form_users.html.haml +++ b/app/views/admin/enterprise_groups/_form_users.html.haml @@ -1,6 +1,5 @@ -%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Users'" } } - %legend - = t(:users) +%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='users'" } } + %legend {{menu.selected.label}} .row .three.columns.alpha =f.label :owner_id, t(:admin_entreprise_groups_owner) diff --git a/app/views/admin/enterprise_groups/_form_web.html.haml b/app/views/admin/enterprise_groups/_form_web.html.haml index 5d982f1bbb..e0de2f7159 100644 --- a/app/views/admin/enterprise_groups/_form_web.html.haml +++ b/app/views/admin/enterprise_groups/_form_web.html.haml @@ -1,6 +1,5 @@ -%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='Web'" } } - %legend - = t 'admin_entreprise_groups_web' +%fieldset.alpha.no-border-bottom{ ng: { show: "menu.selected.name=='web'" } } + %legend {{menu.selected.label}} .row .alpha.three.columns = f.label :website diff --git a/config/locales/en.yml b/config/locales/en.yml index e895522903..308e83c076 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -838,12 +838,9 @@ Please follow the instructions there to make your enterprise visible on the Open admin_entreprise_groups_owner: "Owner" admin_entreprise_groups_on_front_page: "On front page ?" admin_entreprise_groups_entreprise: "Enterprises" - admin_entreprise_groups_primary_details: "Primary Details" admin_entreprise_groups_data_powertip: "The primary user responsible for this group." admin_entreprise_groups_data_powertip_logo: "This is the logo for the group" admin_entreprise_groups_data_powertip_promo_image: "This image is displayed at the top of the Group profile" - admin_entreprise_groups_about: "About" - admin_entreprise_groups_images: "Images" admin_entreprise_groups_contact: "Contact" admin_entreprise_groups_contact_phone_placeholder: "eg. 98 7654 3210" admin_entreprise_groups_contact_address1_placeholder: "eg. 123 High Street"