[PATCH conductor] BZ796098 Fix UI inconsistencies
Maros Zatko
mzatko at redhat.com
Wed Feb 22 16:23:50 UTC 2012
On 02/22/2012 12:54 PM, jtomasek at redhat.com wrote:
> From: Jiri Tomasek<jtomasek at redhat.com>
>
> Middle align section-controls content
> Image detail - separate properties section
> Provider Account detail - edit/test_connection buttons in header next to return_to link
> ---
> src/app/stylesheets/layout.scss | 1 +
> src/app/views/images/show.html.haml | 10 +++++++++-
> src/app/views/provider_accounts/show.html.haml | 7 +++----
> src/config/locales/en.yml | 2 +-
> 4 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
> index 6ad0810..1b4b33b 100644
> --- a/src/app/stylesheets/layout.scss
> +++ b/src/app/stylesheets/layout.scss
> @@ -1720,6 +1720,7 @@ section.admin-content-section{
> right: 0px;
> bottom: 4px;
> @include display_inline_block;
> + vertical-align: middle;
> font-size: 11px;
>
> a.collapse{
> diff --git a/src/app/views/images/show.html.haml b/src/app/views/images/show.html.haml
> index 82c00f5..9e941a6 100644
> --- a/src/app/views/images/show.html.haml
> +++ b/src/app/views/images/show.html.haml
> @@ -16,7 +16,15 @@
> %section.admin-content-section
> %header
> %h2=t'properties'
> - %h3= t('images.environment', :environment => @image.environment)
> + .content
> + %table
> + %tbody
> + %tr
> + %td= t('images.environment')
> + %td= @image.environment
> +
> +%section.admin-content-section
> + %header
> %h2= t('.provider_images')
> .section-controls
> - if @builds.any?
> diff --git a/src/app/views/provider_accounts/show.html.haml b/src/app/views/provider_accounts/show.html.haml
> index b9a3597..63dcc72 100644
> --- a/src/app/views/provider_accounts/show.html.haml
> +++ b/src/app/views/provider_accounts/show.html.haml
> @@ -5,14 +5,13 @@
> .return_to
> =t'return_to'
> = link_to t('provider_accounts.new.cloud_providers'), edit_provider_path(@provider, :details_tab => 'accounts')
> + .button-group
> + = link_to t('edit'), edit_provider_provider_account_path(@provider, @provider_account), :class => "button pill", :title => "Edit Provider Account"
> + = link_to t('provider_accounts.show.test_connection'), provider_provider_account_path(@provider, @provider_account, :test_account => true), :class => 'button pill'
>
> %section.admin-content-section
> %header
> %h2=t'properties'
> - .section-controls
> - #obj_actions.button-group
> - = link_to t('edit'), edit_provider_provider_account_path(@provider, @provider_account), :class => "button pill", :title => "Edit Provider Account"
> - = link_to t('provider_accounts.show.test_connection'), provider_provider_account_path(@provider, @provider_account, :test_account => true), :class => 'button pill'
>
> .content
> = render :partial => 'properties'
> diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
> index abf308a..d0aebe1 100644
> --- a/src/config/locales/en.yml
> +++ b/src/config/locales/en.yml
> @@ -724,7 +724,7 @@ en:
> delete_failed: Unable to Delete Target Image
> not_found: Target Image not found
> images:
> - environment: "%{environment} Environment"
> + environment: "Environment:"
> environment_header: Environment
> import:
> import_image: Import Image
ack
More information about the aeolus-devel
mailing list