From: Tomas Sedovic <[email protected]>
---
src/app/views/layouts/aggregator.haml | 7 ++++---
src/config/locales/en.yml | 24 +++++++++++++++++-------
src/config/navigation.rb | 28 ++++++++++++++++++----------
3 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/src/app/views/layouts/aggregator.haml
b/src/app/views/layouts/aggregator.haml
index c852c35..2264191 100644
--- a/src/app/views/layouts/aggregator.haml
+++ b/src/app/views/layouts/aggregator.haml
@@ -38,9 +38,10 @@
%p
%a{ :href => "" }
= t(:advanced_search)
- = render_navigation(:expand_all => true)
- #subnav
- /todo
+ %nav
+ = render_navigation(:expand_all => true, :level => 1..2)
+ #subnav.content_16
+ = render_navigation(:expand_all => true, :level => 3)
#content.container_16
= render :partial => '/layouts/notification'
= (yield(:content) or yield) # content is set if we're using a sub
template
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index db0cdf1..0c238c7 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -4,11 +4,16 @@ en:
users: Users
templates: Templates
settings: Settings
+ about: About
+ configure: Configure
+ hello: Hello
+ advanced_search: Advanced Search
login: Log in
logout: Log out
- operate: Operate
- monitor: Monitor
- administer: Administer
+ operation: Operation
+ monitor: Monitor System
+ browse_objects: Browse Objecs
+ administration: Administration
system_settings: System Settings
manage_providers: Manage Providers
provider_summary: Provider Summary
@@ -17,14 +22,19 @@ en:
manage_users: Manage Users
new_user: New User
edit_user: Edit User
+ pools_and_zones: "Pools & Zones"
new_pool: New Pool
edit_pool: Edit Pool
+ audit_report: Audit / Report
+ assistance_requests: Assistance Requests
build: Build
- template_management: Template Management
+ templates: Templates
basic_template: Template Builder Basic Workflow
browse_packages: Browse Packages
- grind_management: Grind Management
- run: Run
- manage_instances: Manage Instances
+ grinds: Grinds
+ images: Images
+ runtime: Runtime
+ instance_management: Instance Management
instance_details: Instance Details
launch_instance: Launch Instance
+ help: Help
diff --git a/src/config/navigation.rb b/src/config/navigation.rb
index cfb1189..17e06ed 100644
--- a/src/config/navigation.rb
+++ b/src/config/navigation.rb
@@ -1,36 +1,44 @@
SimpleNavigation::Configuration.run do |navigation|
+ navigation.autogenerate_item_ids = false
navigation.items do |first_level|
- first_level.item :operate, t(:operate), '#' do |second_level|
+ first_level.item :operation, t(:operation), '', :class => 'operation' do
|second_level|
second_level.item :monitor, t(:monitor), '/dashboard'
+ second_level.item :browse_objects, t(:browse_objects),
'/browse_objects', :class => 'disabled'
end
- first_level.item :administer, t(:administer), '#' do |second_level|
+ first_level.item :administration, t(:administration), '', :class =>
'administration' do |second_level|
second_level.item :system_settings, t(:system_settings), "/settings" do
|third_level|
third_level.item :manage_providers, t(:manage_providers), "/provider"
do |fourth_level|
fourth_level.item :provider_summary, t(:provider_summary),
"/provider/show"
fourth_level.item :provider_accounts, t(:provider_accounts),
"/provider/accounts"
end
third_level.item :self_service_settings, t(:self_service_settings),
"/settings/self-service"
- third_level.item :manage_users, t(:manage_users), "/users" , :if =>
lambda { @current_user &&
has_view_perms?(BasePermissionObject.general_permission_scope) } do
|fourth_level|
+ third_level.item :manage_users, t(:manage_users), "/users" do
|fourth_level|
fourth_level.item :new_user, t(:new_user), '/account/edit'
fourth_level.item :edit_user, t(:edit_user), '/account/edit'
end
end
- second_level.item :new_pool, t(:new_pool), '/pool/new', :if => lambda {
true }
- second_level.item :edit_pool, t(:edit_pool), '/pool/edit', :if => lambda
{ true }
+ second_level.item :pools_and_zones, t(:pools_and_zones), '/pool' do
|third_level|
+ third_level.item :new_pool, t(:new_pool), '/pool/new'
+ third_level.item :edit_pool, t(:edit_pool), '/pool/edit'
+ end
+ second_level.item :audit_report, t(:audit_report), '/audit_report',
:class => 'disabled'
+ second_level.item :assistance_requests, t(:assistance_requests),
'/assistance_requests', :class => 'disabled'
end
- first_level.item :build, t(:build), '#' do |second_level|
- second_level.item :template_management, t(:template_management),
'/templates' do |third_level|
+ first_level.item :build, t(:build), '', :class => 'build' do |second_level|
+ second_level.item :templates, t(:templates), '/templates' do
|third_level|
third_level.item :basic_template, t(:basic_template), '/templates/new'
do |fourth_level|
fourth_level.item :browse_packages, t(:browse_packages),
'/templates/packages'
end
end
- second_level.item :grind_management, t(:grind_management),
'/templates/builds'
+ second_level.item :grinds, t(:grinds), '/templates/builds'
+ second_level.item :images, t(:images), '/image/show'
end
- first_level.item :run, t(:run), '#' do |second_level|
- second_level.item :manage_instances, t(:manage_instances), '/instance'
do |third_level|
+ first_level.item :runtime, t(:runtime), '', :class => 'runtime' do
|second_level|
+ second_level.item :instance_management, t(:instance_management),
'/instance' do |third_level|
third_level.item :instance_details, t(:instance_details),
'/instance/show'
third_level.item :launch_instance, t(:launch_instance), '/instance/new'
end
end
+ first_level.item :help, t(:help), '/help', :id => 'help'
end
end
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
