--- src/app/views/settings/_section_header.haml | 3 +-- src/app/views/settings/general_settings.haml | 5 ++--- src/app/views/settings/index.haml | 6 ++---- src/app/views/settings/self_service.haml | 7 ++++--- src/config/navigation.rb | 2 +- 5 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/app/views/settings/_section_header.haml b/src/app/views/settings/_section_header.haml index 6231e5b..b03ee3c 100644 --- a/src/app/views/settings/_section_header.haml +++ b/src/app/views/settings/_section_header.haml @@ -1,4 +1,3 @@ -%header.page-header +%header.admin-page-header %h1{:class => controller.controller_name} Settings #obj_actions.button-group - .corner diff --git a/src/app/views/settings/general_settings.haml b/src/app/views/settings/general_settings.haml index 64c3f02..e0ef01f 100644 --- a/src/app/views/settings/general_settings.haml +++ b/src/app/views/settings/general_settings.haml @@ -1,9 +1,8 @@ -%header.page-header +%header.admin-page-header %h1{:class => controller.controller_name} General Settings #obj_actions.button-group - .corner
-%section.content-section.settings +%section.admin-content-section.settings %header %h2 Settings
diff --git a/src/app/views/settings/index.haml b/src/app/views/settings/index.haml index 0ddd839..e1f51d8 100644 --- a/src/app/views/settings/index.haml +++ b/src/app/views/settings/index.haml @@ -1,10 +1,7 @@ = render :partial => 'layouts/admin_nav' = render :partial => 'section_header'
-%section.content-section.settings - %header - %h2 Settings - +%section.admin-content-section.settings .content %ul.tiles{:class => 'container_16'} -#%li#services.grid_8.disabled @@ -37,6 +34,7 @@ = t('.define_locales_desc') %button{:disabled => "disabled"} = t(:continue) + .clear
:javascript $(document).ready(function () { diff --git a/src/app/views/settings/self_service.haml b/src/app/views/settings/self_service.haml index bb4d1fc..b3e79f5 100644 --- a/src/app/views/settings/self_service.haml +++ b/src/app/views/settings/self_service.haml @@ -1,9 +1,9 @@ -%header.page-header += render :partial => 'layouts/admin_nav' +%header.admin-page-header %h1{:class => controller.controller_name} Self-service Settings #obj_actions.button-group - .corner
-%section.content-section.settings +%section.admin-content-section.settings %header %h2 Settings
@@ -128,3 +128,4 @@ .grid_13.omega.alpha.gap %button.formbutton Reset = submit_tag t(:save), :class => "submit formbutton" + .clear diff --git a/src/config/navigation.rb b/src/config/navigation.rb index 9e6a579..8a72a56 100644 --- a/src/config/navigation.rb +++ b/src/config/navigation.rb @@ -23,7 +23,7 @@ SimpleNavigation::Configuration.run do |navigation| first_level.item :monitor, t(:monitor), pools_path, :class => 'monitor', :link => { :id => 'monitor' }, :highlights_on => //deployments|/pools|/instances/ first_level.item :administer, t(:administer), users_path, :class => 'administer' do |second_level| second_level.item :users_and_groups, "Users & Groups", users_path, :link => { :class => 'users' }, :highlights_on => //users|/roles/ - second_level.item :environments, "Environments", settings_path, :link => { :class => 'environments' }, :highlights_on => //settings/ + second_level.item :environments, "Environments", settings_path, :link => { :class => 'environments' }, :highlights_on => //settings|/self_service/ second_level.item :content, "Content", catalogs_path, :link => { :class => 'content' }, :highlights_on => //catalogs|/catalog_entries/ second_level.item :cloud_providers, "Cloud Providers", providers_path, :link => { :class => 'providers' }, :highlights_on => //providers|/realms|/realm_mappingsi|/hardware_profiles/ end