ACK and pushed. There are two details I noticed:
On the Provider Accounts page, add an account with username "mockuser" and password "mockpassword". You'll see a "Remove" button after the account is added. The button is cropped. Also, the text "unlimited" for unlimited quota is truncated. Please expand the text field or suggest a better way to communicate that there's no limit for the quota that fits. I had to fix your patches a bit (they broke some functional stuff), so please pull the newest version and send a new patch on top of it. Thanks, Thomas ----- Original Message ----- From: "Jakub Steiner" <[email protected]> To: [email protected] Sent: Friday, October 1, 2010 3:00:15 PM GMT +01:00 Amsterdam / Berlin / Bern / Rome / Stockholm / Vienna Subject: [deltacloud-devel] [PATCH] Cleanups to the provider account layout. Fixed some of the alignment/overflow issues. File inputs are still fairly unusable. This should go on top of my previous 3112 patch. --- src/app/stylesheets/aggregator.scss | 16 +++++++++++++- src/app/views/provider/accounts.haml | 36 ++++++++++++++++++--------------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/app/stylesheets/aggregator.scss b/src/app/stylesheets/aggregator.scss index 41539bb..d9204f2 100644 --- a/src/app/stylesheets/aggregator.scss +++ b/src/app/stylesheets/aggregator.scss @@ -55,13 +55,13 @@ input,textarea { /* FILE INPUT */ input[type="file"] { - width: 20px; - border: 1px solid red; + /* FIXME */ } /* compensate grid_* for padding+border of the inputboxes and textareas */ input.grid_1 { width: 30px !important; } input.grid_2 { width: 90px !important; } + .grid_2 input[type="file"] { width: 90px; } input.grid_3 { width: 150px !important; } .grid_3 input[type="search"] { width: 118px; } input.grid_4 { width: 210px !important; } @@ -132,6 +132,14 @@ input[type='submit'],button,.button { @include no-box-shadow; } } + &.tiny { + padding: 4px; + margin: 0; + &:active, &:focus { + margin: 0; + padding: 3px; + } + } } h1,h2,h3,h4,h5 { text-transform: uppercase; color: $headercl; font-weight: bold; } @@ -167,6 +175,10 @@ h1,h2,h3,h4,h5 { margin-bottom: 2em; } +.nomargin { + margin: none; +} + .la { text-align: left; } .ra { text-align: right; } diff --git a/src/app/views/provider/accounts.haml b/src/app/views/provider/accounts.haml index 2bbd6f0..92d0ac1 100644 --- a/src/app/views/provider/accounts.haml +++ b/src/app/views/provider/accounts.haml @@ -10,7 +10,7 @@ %h1 = t('.provider_accounts') - form_tag({:controller => 'cloud_accounts', :action => 'update_accounts'}, :multipart => true) do - %fieldset.clearfix + %fieldset.clearfix.nomargin %label.grid_2.la.alpha = t('.account_name') %span.required * @@ -44,39 +44,43 @@ = password_field cloud_account_id, :password, :title => t('.secret_access_key'), :disabled => disabled, :class => "grid_2" = text_field "quota[#{acct.id}]", :maximum_running_instances, :title => t('.quota_instances'), :value => (acct.quota.maximum_running_instances.nil? ? "unlimited" : acct.quota.maximum_running_instances), :disabled => disabled, :id => "quota_instances#{acct.id}", :class => "grid_1" = text_field cloud_account_id, :account_number, :title => t('.account_number'), :value => acct.account_number, :disabled => disabled, :class => "grid_1" - = file_field cloud_account_id, :x509_cert_priv_file, :title => t('.account_private_cert'), :disabled => disabled, :class => "grid_2" - = file_field cloud_account_id, :x509_cert_pub_file, :title => t('.account_public_cert'), :disabled => disabled, :class => "grid_2" + .grid_2 + = file_field cloud_account_id, :x509_cert_priv_file, :title => t('.account_private_cert'), :disabled => disabled + .grid_2 + = file_field cloud_account_id, :x509_cert_pub_file, :title => t('.account_public_cert'), :disabled => disabled - remove_path = url_for :controller => 'cloud_accounts', :action => 'destroy', :id => acct.id if has_account_modify?(@provider) && acct.destroyable? - %a.button{ :href => remove_path, :name => "remove_acc_#{acct.id}", :class => 'grid_1 ' + ('disabled' unless remove_path) } - = t(:remove) - .subtext - %span + .grid_1.omega + %a.button{ :href => remove_path, :name => "remove_acc_#{acct.id}", :class => "tiny " + ('disabled' unless remove_path) } + = t(:remove) + .wrap + .grid_2.alpha ( %a{ :href => '' }<> = t('.test_account') ) - %span - %span - %span + .grid_2.prefix_4 ( - %a{ :href => '#', :onclick => "set_unlimited_quota(\"quota_instances#{acct.id}\");" }<> + %a{ :href => '#', :onclick => 'set_unlimited_quota("new_quota_instances");' }<> = t('.unlimited_quota') ) = submit_tag t(:reset), :name => 'reset_form' unless @provider.cloud_accounts.empty? = submit_tag t(:save), :name => 'update_cloud_accounts' unless @provider.cloud_accounts.empty? - form_tag({:controller => 'cloud_accounts', :action => 'create'}, :multipart => true) do - %fieldset.clearfix + %fieldset.clearfix.nomargin = text_field :cloud_account, :label, :title => t('.account_name'), :class => "grid_2 alpha" = text_field :cloud_account, :username, :title => t('.access_key'), :class => "grid_2" = password_field :cloud_account, :password, :title => t('.secret_access_key'), :class => "grid_2" = text_field :quota, :maximum_running_instances, :title => t('.quota_instances'), :id => "new_quota_instances", :value => "unlimited", :class => "grid_1" = text_field :cloud_account, :account_number, :title => t('.account_number'), :class => "grid_1" - = file_field :cloud_account, :x509_cert_priv_file, :title => t('.account_private_cert'), :class => "grid_2" - = file_field :cloud_account, :x509_cert_pub_file, :title => t('.account_public_cert'), :class => "grid_2" + .grid_2 + = file_field :cloud_account, :x509_cert_priv_file, :title => t('.account_private_cert') + .grid_2 + = file_field :cloud_account, :x509_cert_pub_file, :title => t('.account_public_cert') = hidden_field :cloud_account, :provider_id, :value => @provider.id - = submit_tag t(:add) - .subtext.clearfix + .grid_1.omega + = submit_tag t(:add), :class => "tiny" + .wrap .grid_2.alpha ( %a{ :href => '' }<> -- 1.7.2.3 _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
