[PATCH aeolus] New navigation with second level

Thursday, 9 December 2010

From: Jozef Zigmund <jzigmund(a)redhat.com&gt;

It adds new navigation to new UI.
---
 src/app/views/layouts/aggregator.haml |    4 +-
 src/app/views/layouts/newui.haml      |    3 ++
 src/config/locales/en.yml             |   17 +++++++++++++
 src/config/navigation.rb              |   42 ---------------------------------
 src/config/new_navigation.rb          |   28 ++++++++++++++++++++++
 src/config/old_navigation.rb          |   42 +++++++++++++++++++++++++++++++++
 6 files changed, 92 insertions(+), 44 deletions(-)
 delete mode 100644 src/config/navigation.rb
 create mode 100644 src/config/new_navigation.rb
 create mode 100644 src/config/old_navigation.rb

diff --git a/src/app/views/layouts/aggregator.haml
b/src/app/views/layouts/aggregator.haml
index 711f87e..4336e70 100644
--- a/src/app/views/layouts/aggregator.haml
+++ b/src/app/views/layouts/aggregator.haml
@@ -42,10 +42,10 @@
             %a.disabled
               = t(:advanced_search)
         %nav.container_16
-          = render_navigation(:expand_all => true, :level => 1..2)
+          = render_navigation({:context => 'old', :expand_all => true,
:level => 1..2})
         %hr
       %nav.subnav
-        = render_navigation(:expand_all => true, :level => 3)
+        = render_navigation({:context => 'old', :expand_all => true, :level
=> 3})
       #content.container_16
         = render :partial => '/layouts/notification'
         = yield
diff --git a/src/app/views/layouts/newui.haml b/src/app/views/layouts/newui.haml
index c50d9a8..1d8c5fc 100644
--- a/src/app/views/layouts/newui.haml
+++ b/src/app/views/layouts/newui.haml
@@ -24,5 +24,8 @@
   %body{:id => controller.section_id}
     %a{ :href => '', :onClick => "document.cookie =
'layout=aggregator'"}
       Switch to the old UI
+    %div#head
+      #subheader
+        = render_navigation({:context => 'new', :expand_all => true})
     %h1 New UI
     = yield
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 1be36b6..6201769 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -67,6 +67,23 @@ en:
   apply_treatment: Apply User Treatment
   choose_treatment: Choose Treatment
   apply: Apply
+  resource_management_view: Resource Management View
+  pools: Pools
+  deployments: Deployments
+  instances: Instances
+  searches: Searches
+  image_factory_view: Image Factory View
+  templates: Templates
+  assemblies: Assemblies
+  template_collections: Template Collections
+  admin: Administration
+  roles: Roles
+  cloud_providers: Cloud Providers
+  provider_account: Provider Account
+  cloud_engine_hardware_profiles: HW Profiles
+  cloud_engine_realms: Realms
+  pool_families: Pool Families
+  setting: Settings
   settings:
     index:
       general_settings: General Settings
diff --git a/src/config/navigation.rb b/src/config/navigation.rb
deleted file mode 100644
index 27b44cf..0000000
--- a/src/config/navigation.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-SimpleNavigation::Configuration.run do |navigation|
-  navigation.autogenerate_item_ids = false
-  navigation.items do |first_level|
-    first_level.item :operation, t(:operation), '#', :class =>
'operation' do |second_level|
-      second_level.item :monitor, t(:monitor), :controller => 'dashboard'
-      second_level.item :browse_objects, t(:browse_objects), '#', :class =>
'disabled'
-    end
-    first_level.item :administration, t(:administration), '#', :class =>
'administration' do |second_level|
-      second_level.item :system_settings, t(:system_settings), :controller =>
'settings' do |third_level|
-        third_level.item :manage_providers, t(:manage_providers), providers_path do
|fourth_level|
-          fourth_level.item :provider_summary, t(:provider_summary), { :controller =>
'providers', :action => 'show', :id => (@provider.id if @provider)
}, :highlights_on => /\/providers\/\d+(\/edit)?$/
-          fourth_level.item :provider_accounts, t(:provider_accounts), { :controller
=> 'cloud_accounts', :action => 'index', :provider_id =>
(@provider.id if @provider) }, :highlights_on =>
/\/providers\/\d+\/accounts(\/(\d+|new))?/
-          fourth_level.item :scheduling_policies, t(:scheduling_policies), '#'
-          fourth_level.item :services_provided, t(:services_provided), '#'
-          fourth_level.item :map_profiles, t(:map_profiles), '#'
-          fourth_level.item :map_locales, t(:map_locales), '#'
-        end
-        third_level.item :define_services, t(:define_services), '#'
-        third_level.item :define_services, t(:define_profiles), '#'
-        third_level.item :define_services, t(:define_locales), '#'
-        third_level.item :manage_users, t(:manage_users), :controller =>
'users' do |fourth_level|
-          fourth_level.item :new_user, t(:new_user), {:controller => 'users',
:action => 'new'}, :highlights_on => /\/users\/new/
-          fourth_level.item :edit_user, t(:edit_user), {:controller =>
'users', :action => 'edit'},  :highlights_on => /\/users\/edit/
-        end
-        third_level.item :general_settings, t(:general_settings), {:controller =>
'settings', :action => "general_settings"}
-        third_level.item :permissions, t(:permissions), { :controller =>
'settings', :action => 'self_service'}
-      end
-      second_level.item :pools_and_zones, t(:pools_and_zones), {:controller =>
'pools'}, :highlights_on => /\/pools/
-      second_level.item :audit_report, t(:audit_report), '#', :class =>
'disabled'
-      second_level.item :assistance_requests, t(:assistance_requests), '#',
:class => 'disabled'
-    end
-    first_level.item :define, t(:define), '#', :class => 'build' do
|second_level|
-      second_level.item :deployables, t(:deployables), {:controller =>
'templates'}, :highlights_on => /\/templates/
-      second_level.item :builds, t(:builds), :controller => 'builds', :action
=> 'index'
-      second_level.item :images, t(:images), '#', :class =>
'disabled'
-    end
-    first_level.item :runtime, t(:runtime), '#', :class => 'runtime'
do |second_level|
-      second_level.item :instance_management, t(:instance_management), :controller =>
'instances'
-    end
-    first_level.item :help, t(:help), '#', :id => 'help', :class =>
"disabled"
-  end
-end
diff --git a/src/config/new_navigation.rb b/src/config/new_navigation.rb
new file mode 100644
index 0000000..41a1a8b
--- /dev/null
+++ b/src/config/new_navigation.rb
@@ -0,0 +1,28 @@
+SimpleNavigation::Configuration.run do |navigation|
+  navigation.autogenerate_item_ids = false
+  navigation.items do |first_level|
+    first_level.item :resource_management_view, t(:resource_management_view), '#'
do |second_level|
+      second_level.item :pools, t(:pools), '#'
+      second_level.item :deployments, t(:deployments),'#'
+      second_level.item :instances, t(:instances), '#'
+      second_level.item :searches, t(:searches), '#'
+    end
+    first_level.item :image_factory_view, t(:image_factory_view), '#' do
|second_level|
+      second_level.item :templates, t(:templates), '#'
+      second_level.item :assemblies, t(:assemblies),'#'
+      second_level.item :deployables, t(:deployables), '#'
+      second_level.item :template_collections, t(:template_collections), '#'
+    end
+    first_level.item :administration, t(:admin), '#' do |second_level|
+      second_level.item :users, t(:users), '#'
+      second_level.item :roles, t(:roles), '#'
+      second_level.item :cloud_providers, t(:cloud_providers), '#'
+      second_level.item :provider_account, t(:provider_account), '#'
+      second_level.item :cloud_engine_hardware_profiles,
t(:cloud_engine_hardware_profiles), '#'
+      second_level.item :cloud_engine_realms, t(:cloud_engine_realms), '#'
+      second_level.item :pool_families, t(:pool_families), '#'
+      second_level.item :settings, t(:setting), '#'
+    end
+    first_level.item :dashboard, t(:dashboard), '#'
+  end
+end
diff --git a/src/config/old_navigation.rb b/src/config/old_navigation.rb
new file mode 100644
index 0000000..27b44cf
--- /dev/null
+++ b/src/config/old_navigation.rb
@@ -0,0 +1,42 @@
+SimpleNavigation::Configuration.run do |navigation|
+  navigation.autogenerate_item_ids = false
+  navigation.items do |first_level|
+    first_level.item :operation, t(:operation), '#', :class =>
'operation' do |second_level|
+      second_level.item :monitor, t(:monitor), :controller => 'dashboard'
+      second_level.item :browse_objects, t(:browse_objects), '#', :class =>
'disabled'
+    end
+    first_level.item :administration, t(:administration), '#', :class =>
'administration' do |second_level|
+      second_level.item :system_settings, t(:system_settings), :controller =>
'settings' do |third_level|
+        third_level.item :manage_providers, t(:manage_providers), providers_path do
|fourth_level|
+          fourth_level.item :provider_summary, t(:provider_summary), { :controller =>
'providers', :action => 'show', :id => (@provider.id if @provider)
}, :highlights_on => /\/providers\/\d+(\/edit)?$/
+          fourth_level.item :provider_accounts, t(:provider_accounts), { :controller
=> 'cloud_accounts', :action => 'index', :provider_id =>
(@provider.id if @provider) }, :highlights_on =>
/\/providers\/\d+\/accounts(\/(\d+|new))?/
+          fourth_level.item :scheduling_policies, t(:scheduling_policies), '#'
+          fourth_level.item :services_provided, t(:services_provided), '#'
+          fourth_level.item :map_profiles, t(:map_profiles), '#'
+          fourth_level.item :map_locales, t(:map_locales), '#'
+        end
+        third_level.item :define_services, t(:define_services), '#'
+        third_level.item :define_services, t(:define_profiles), '#'
+        third_level.item :define_services, t(:define_locales), '#'
+        third_level.item :manage_users, t(:manage_users), :controller =>
'users' do |fourth_level|
+          fourth_level.item :new_user, t(:new_user), {:controller => 'users',
:action => 'new'}, :highlights_on => /\/users\/new/
+          fourth_level.item :edit_user, t(:edit_user), {:controller =>
'users', :action => 'edit'},  :highlights_on => /\/users\/edit/
+        end
+        third_level.item :general_settings, t(:general_settings), {:controller =>
'settings', :action => "general_settings"}
+        third_level.item :permissions, t(:permissions), { :controller =>
'settings', :action => 'self_service'}
+      end
+      second_level.item :pools_and_zones, t(:pools_and_zones), {:controller =>
'pools'}, :highlights_on => /\/pools/
+      second_level.item :audit_report, t(:audit_report), '#', :class =>
'disabled'
+      second_level.item :assistance_requests, t(:assistance_requests), '#',
:class => 'disabled'
+    end
+    first_level.item :define, t(:define), '#', :class => 'build' do
|second_level|
+      second_level.item :deployables, t(:deployables), {:controller =>
'templates'}, :highlights_on => /\/templates/
+      second_level.item :builds, t(:builds), :controller => 'builds', :action
=> 'index'
+      second_level.item :images, t(:images), '#', :class =>
'disabled'
+    end
+    first_level.item :runtime, t(:runtime), '#', :class => 'runtime'
do |second_level|
+      second_level.item :instance_management, t(:instance_management), :controller =>
'instances'
+    end
+    first_level.item :help, t(:help), '#', :id => 'help', :class =>
"disabled"
+  end
+end
-- 
1.7.2.3


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009