From: Imre Farkas <ifarkas(a)redhat.com>
---
src/config/navigation.rb | 4 ++--
src/config/routes.rb | 12 ++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/config/navigation.rb b/src/config/navigation.rb
index 4c37e23..14396a3 100644
--- a/src/config/navigation.rb
+++ b/src/config/navigation.rb
@@ -18,10 +18,10 @@ SimpleNavigation::Configuration.run do |navigation|
navigation.autogenerate_item_ids = false
navigation.items do |first_level|
first_level.dom_class = 'container'
- first_level.item :monitor, t('navigation.first_level.monitor'), pools_path,
:class => 'monitor', :link => { :id => 'monitor' },
:highlights_on => /\/deployments|\/pools|\/instances|\/logs|\/\z/
+ first_level.item :monitor, t('navigation.first_level.monitor'), pools_path,
:class => 'monitor', :link => { :id => 'monitor' },
:highlights_on => /\/deployments|\/pools$|\/pools\/\d$|\/instances|\/logs|\/\z/
first_level.item :administer, t('navigation.first_level.administer'),
users_path, :class => 'administer' do |second_level|
second_level.item :users, t('navigation.second_level.users'), users_path,
:link => { :class => 'users' }, :highlights_on =>
/\/users|\/user_groups|\/roles|\/permissions|\/account/
- second_level.item :environments, t('navigation.second_level.environments'),
pool_families_path, :link => { :class => 'environments' }, :highlights_on
=> /\/pool_families|\/images/
+ second_level.item :environments, t('navigation.second_level.environments'),
pool_families_path, :link => { :class => 'environments' }, :highlights_on
=> /\/pool_families|\/images|\/pools\/\d\/provider_selection/
second_level.item :content, t('navigation.second_level.content'),
catalogs_path, :link => { :class => 'content' }, :highlights_on =>
/\/catalogs|\/catalog_entries|\/realms|\/hardware_profiles|\/realm_mappings|\/deployables/
second_level.item :cloud_providers,
t('navigation.second_level.cloud_providers'), providers_path, :link => { :class
=> 'providers' }, :highlights_on =>
/\/providers|\/provider_realms|\/config_servers/
second_level.item :settings, t('navigation.second_level.settings'),
settings_path, :link => { :class => 'settings'}, :highlights_on =>
/\/settings/
diff --git a/src/config/routes.rb b/src/config/routes.rb
index c13d827..8ff4f31 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
@@ -88,6 +88,7 @@ Conductor::Application.routes.draw do
end
end
+
resources :settings do
collection do
get :self_service
@@ -96,6 +97,17 @@ Conductor::Application.routes.draw do
resources :pools do
delete :multi_destroy, :on => :collection
post :filter, :on => :collection
+
+ resource :provider_selection, :only => [:show] do
+ resources :provider_priority_groups, :except => [:show]
+
+ collection do
+ get :edit_strategy
+ #post :update_strategy
+ end
+
+ #match ':id', :to => 'provider_selections#show', :as =>
'provider_selection_strategy'
+ end
end
resources :deployments do
--
1.7.11.2