--- src/app/stylesheets/layout.scss | 59 ++++++++++++++++--------------- src/app/views/layouts/_admin_nav.haml | 8 ++-- src/app/views/layouts/application.haml | 11 +----- src/config/locales/en.yml | 4 +- src/config/navigation.rb | 10 ++---- 5 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index 6fbd3cb..0a8a22a 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -966,6 +966,30 @@ nav#primary { height: 34px; margin-right: 6px; z-index: 1; + &.selected{ + z-index: 1000; + height: 43px; + a{ + padding: 12px 20px 12px 20px; + font-size: 16px; + color: #666; + } + } + &.selected.monitor{ + margin-top: -5px; + background: url('../../images/tab-active-right.png') no-repeat right top; + a{ + background:url('../../images/tab-active-left.png') no-repeat left top; + } + } + &.selected.administer{ + margin-top: -6px; + background: url('../../images/administer-tab-active-right.png') no-repeat right top; + a{ + background:url('../../images/administer-tab-active-left.png') no-repeat left top; + } + } + a{ display: block; background:url('../../images/tab-inactive-left.png') no-repeat left top; @@ -981,29 +1005,6 @@ nav#primary { color: #fff; } } - li.active{ - z-index: 1000; - height: 43px; - a{ - padding: 12px 20px 12px 20px; - font-size: 16px; - color: #666; - } - } - li.active.monitor{ - margin-top: -5px; - background: url('../../images/tab-active-right.png') no-repeat right top; - a{ - background:url('../../images/tab-active-left.png') no-repeat left top; - } - } - li.active.administer{ - margin-top: -6px; - background: url('../../images/administer-tab-active-right.png') no-repeat right top; - a{ - background:url('../../images/administer-tab-active-left.png') no-repeat left top; - } - } li + li{ margin-right: 6px; } @@ -1035,6 +1036,12 @@ nav#administer_nav { text-decoration: none; display: block; color: black; + &:hover{ + background: transparent url(../../images/administer_nav_bg_hover.png) center bottom no-repeat; + } + &.selected{ + background: transparent url(../../images/administer_nav_bg_hover.png) center bottom no-repeat; + }
div{padding: 45px 10px 12px 10px;} div.users{background: transparent url(../../images/administer_nav_users_icon.png) center 16px no-repeat;} @@ -1042,12 +1049,6 @@ nav#administer_nav { div.content{background: transparent url(../../images/administer_nav_content_icon.png) center 13px no-repeat;} div.providers{background: transparent url(../../images/administer_nav_providers_icon.png) center 13px no-repeat;} } - a:hover{ - background: transparent url(../../images/administer_nav_bg_hover.png) center bottom no-repeat; - } - a.selected{ - background: transparent url(../../images/administer_nav_bg_hover.png) center bottom no-repeat; - } } }
diff --git a/src/app/views/layouts/_admin_nav.haml b/src/app/views/layouts/_admin_nav.haml index f3b42a6..6c60de9 100644 --- a/src/app/views/layouts/_admin_nav.haml +++ b/src/app/views/layouts/_admin_nav.haml @@ -1,16 +1,16 @@ %nav#administer_nav %ul %li - - link_to users_path do + = link_to users_path do %div.users Users & Groups %li - - link_to users_path do + = link_to users_path do %div.environments Environments %li - - link_to users_path, :class => "selected" do + = link_to users_path, :class => "selected" do %div.content Content %li - - link_to providers_path do + = link_to providers_path do %div.providers Cloud Providers .clear #admin_page_header diff --git a/src/app/views/layouts/application.haml b/src/app/views/layouts/application.haml index f2391f4..7210353 100644 --- a/src/app/views/layouts/application.haml +++ b/src/app/views/layouts/application.haml @@ -37,7 +37,7 @@ = javascript_include_tag "rails.js" = csrf_meta_tag = yield :scripts - %body{:class => "#{controller.top_section == :administer ? 'administer' : 'monitor'}" } + %body{:class => "#{(["pools" ,"deployments", "instances"].include? controller_name) ? 'monitor' : 'administer'}" } #primary-container
%header#masthead @@ -46,14 +46,7 @@ = render :partial => '/layouts/new_notification' unless flash.empty?
%nav#primary - %ul.container - - # NOTE this is a hack to implement switching between the top-level - - # navigation before the proper wireframes exist for all the sections. - - # Then we'll want to switch to the simple-nav gem or something else. - %li{:class => "#{'active' unless [:design, :administer].include? controller.top_section} monitor" } - = link_to 'Monitor', pools_path, :id => 'monitor' - %li{:class => "#{'active' if controller.top_section == :administer} administer" } - = link_to 'Administer', catalog_entries_path + =render_navigation :level => 1
#content -# works with any 960 container (.container_16 or .container_24) diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml index 7ae9e32..35d9a93 100644 --- a/src/config/locales/en.yml +++ b/src/config/locales/en.yml @@ -17,9 +17,9 @@ en: login: Log in logout: Log out operation: Operate - monitor: Dashboard + monitor: Monitor browse_objects: Browse Objecs - administration: Administer + administer: Administer system_settings: System Settings manage_providers: Manage Providers provider_summary: Provider Summary diff --git a/src/config/navigation.rb b/src/config/navigation.rb index 2f66d54..3aa7220 100644 --- a/src/config/navigation.rb +++ b/src/config/navigation.rb @@ -1,12 +1,9 @@ SimpleNavigation::Configuration.run do |navigation| navigation.autogenerate_item_ids = false navigation.items do |first_level| - first_level.item :resource_management, t(:resource_management), pools_path, :highlights_on => /^/$/ do |second_level| - second_level.item :pools, t('pools.index.pools'), pools_path - second_level.item :deployments, t('deployments.deployments'),deployments_path, :highlights_on => /^/$|/deployments/ - second_level.item :instances, t("instances.instances"), instances_path - end - first_level.item :administration, t(:administration), users_path, :highlights_on => //admin/ do |second_level| + first_level.dom_class = 'container' + first_level.item :monitor, t(:monitor), pools_path, :class => 'monitor', :highlights_on => lambda { ["pools" ,"deployments", "instances"].include? controller_name } + first_level.item :administer, t(:administer), users_path, :class => 'administer', :highlights_on => //admin/ do |second_level| second_level.item :users, t('users.users'), users_path, :highlights_on => //users/ second_level.item :roles, t('roles.roles'), roles_path, :highlights_on => //roles/ second_level.item :providers, t('providers.providers'), providers_path, :highlights_on => //providers/ @@ -18,6 +15,5 @@ SimpleNavigation::Configuration.run do |navigation| second_level.item :catalog_entries, t('catalog_entries.index.catalog_entries'), catalog_entries_path, :highlights_on => //catalog_entries/ second_level.item :settings, t('settings.settings'), settings_path, :highlights_on => //settings/ end - first_level.item :dashboard, t(:dashboard), '#' end end