ACK all and pushed
On 10/07/2010 03:54 PM, Jakub Steiner wrote:
> ---
> src/app/stylesheets/aggregator.scss | 2 +-
> src/config/locales/en.yml | 4 ++++
> src/config/navigation.rb | 6 +++++-
> 3 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/src/app/stylesheets/aggregator.scss
> b/src/app/stylesheets/aggregator.scss
> index 82698e6..087a999 100644
> --- a/src/app/stylesheets/aggregator.scss
> +++ b/src/app/stylesheets/aggregator.scss
> @@ -216,7 +216,7 @@ h5 { font-size: 80%; }
> }
>
> .placeholder { margin-bottom: 2em; }
> -.disabled { opacity: 0.6; }
> +.disabled, a[href="#"] { opacity: 0.6; cursor: default !important; }
> .nomargin { margin: 0; }
> .nowrap { white-space: nowrap; }
> .gap { margin-bottom: 4em; }
> diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
> index bf74243..bb91609 100644
> --- a/src/config/locales/en.yml
> +++ b/src/config/locales/en.yml
> @@ -20,6 +20,10 @@ en:
> provider_accounts: Provider Accounts
> self_service_settings: Self-service Settings
> manage_users: Manage Users
> + define_services: Define Services
> + define_profiles: Define Profiles
> + define_locales: Define Locales
> + permissions: Permissions
> new_user: New User
> edit_user: Edit User
> pools_and_zones: "Pools& Zones"
> diff --git a/src/config/navigation.rb b/src/config/navigation.rb
> index be34bd9..5ef8486 100644
> --- a/src/config/navigation.rb
> +++ b/src/config/navigation.rb
> @@ -11,11 +11,15 @@ SimpleNavigation::Configuration.run do |navigation|
> fourth_level.item :provider_summary, t(:provider_summary), {
> :controller => 'provider', :action => 'show', :id => (@provider.id if
> @provider) }, :highlights_on => /\/provider\/(show|edit|new)/
> fourth_level.item :provider_accounts, t(:provider_accounts), {
> :controller => 'provider', :action => 'accounts', :id => (@provider.id if
> @provider) }, :highlights_on => /\/provider\/accounts/
> end
> - third_level.item :self_service_settings, t(:self_service_settings),
> :controller => 'settings', :action => 'self_service'
> + #third_level.item :self_service_settings, t(:self_service_settings),
> :controller => 'settings', :action => 'self_service'
> + 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'
> fourth_level.item :edit_user, t(:edit_user), :controller =>
> 'users', :action => 'edit'
> end
> + third_level.item :define_services, t(:permissions), '#'
> end
> second_level.item :pools_and_zones, t(:pools_and_zones), :controller
> => 'pools' do |third_level|
> third_level.item :new_pool, t(:new_pool), :controller => 'pools',
> :action => 'new'
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
