[PATCH conductor] BZ804688 New catalog and new config server styling and layout fixes
Jozef Zigmund
jzigmund at redhat.com
Tue Mar 20 15:22:24 UTC 2012
On Saturday 17 March 2012 01:18:28 jtomasek at redhat.com wrote:
> From: Jiri Tomasek <jtomasek at redhat.com>
>
> ---
> src/app/views/catalogs/new.html.haml | 6 +++---
> src/app/views/config_servers/_section_header.haml | 3 +--
> src/app/views/config_servers/new.haml | 2 +-
> src/config/navigation.rb | 2 +-
> 4 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/src/app/views/catalogs/new.html.haml
> b/src/app/views/catalogs/new.html.haml index f4abb4c..e3a32fb 100644
> --- a/src/app/views/catalogs/new.html.haml
> +++ b/src/app/views/catalogs/new.html.haml
> @@ -1,7 +1,6 @@
> = render :partial => 'layouts/admin_nav'
>
> %header.admin-page-header
> - %header
> %h1= @title
> #obj_actions
> .return_to
> @@ -9,5 +8,6 @@
> = link_to t("catalogs.catalogs"), catalogs_path
>
> %section.admin-content-section
> - = form_for @catalog, :url => catalogs_path, :html => {:class =>
> 'generic'} do |f| - = render :partial => "form", :locals => { :form => f
> }
> + .content
> + = form_for @catalog, :url => catalogs_path, :html => {:class =>
> 'generic'} do |f| + = render :partial => "form", :locals => { :form =>
> f }
> diff --git a/src/app/views/config_servers/_section_header.haml
> b/src/app/views/config_servers/_section_header.haml index bdf4b48..e83062f
> 100644
> --- a/src/app/views/config_servers/_section_header.haml
> +++ b/src/app/views/config_servers/_section_header.haml
> @@ -1,3 +1,2 @@
> -%header.page-header
> +%header.admin-page-header
> %h1{:class => controller.controller_name}= t('.config_server')
> - .corner
> diff --git a/src/app/views/config_servers/new.haml
> b/src/app/views/config_servers/new.haml index 8495f73..171384c 100644
> --- a/src/app/views/config_servers/new.haml
> +++ b/src/app/views/config_servers/new.haml
> @@ -1,7 +1,7 @@
> = render :partial => 'layouts/admin_nav'
> = render :partial => 'section_header'
>
> -%section.content-section.config_server
> +%section.admin-content-section.config_server
> %header
> %h2= t('.new_config_server')
>
> diff --git a/src/config/navigation.rb b/src/config/navigation.rb
> index 4b85d13..4820000 100644
> --- a/src/config/navigation.rb
> +++ b/src/config/navigation.rb
> @@ -23,7 +23,7 @@ SimpleNavigation::Configuration.run do |navigation|
> second_level.item :users, t('navigation.second_level.users'),
> users_path, :link => { :class => 'users' }, :highlights_on =>
> /\/users|\/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 :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/
> + 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/ end
> end
ACK
More information about the aeolus-devel
mailing list