Applies to 8fd5cb2db47c93b3b196648f1d7fb0e5b012725b
[PATCH 1/3] Make the cancel button on the user page behave it should. [PATCH 2/3] Drop modalbox for the new user page if a user is logged in. Only show .modalbox when user is self-servicing. [PATCH 3/3] Bring the Instance Management page closer to the latest mockup.
--- src/app/views/users/new.haml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml index b6ed86b..b0c158a 100644 --- a/src/app/views/users/new.haml +++ b/src/app/views/users/new.haml @@ -5,4 +5,4 @@ = f.error_messages = render :partial => "form", :object => f = f.submit t(:create_account), :class => "submit dialogbutton" - = link_to t(:cancel), :class => 'actionlink button dialogbutton' + = link_to t(:cancel), {:controller => 'users'}, :class => 'actionlink button dialogbutton'
See comments below:
----- "Jakub Steiner" jsteiner@redhat.com wrote:
src/app/views/users/new.haml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml index b6ed86b..b0c158a 100644 --- a/src/app/views/users/new.haml +++ b/src/app/views/users/new.haml @@ -5,4 +5,4 @@ = f.error_messages = render :partial => "form", :object => f = f.submit t(:create_account), :class => "submit dialogbutton"
= link_to t(:cancel), :class => 'actionlink buttondialogbutton'
= link_to t(:cancel), {:controller => 'users'}, :class =>'actionlink button dialogbutton'
1.7.2.3
Hi Jakub,
could you please use 'users_path' instead of '{:controller => 'users'}'? Like this: = link_to t(:cancel), users_path, :class => 'actionlink button dialogbutton'
It will be better for future changes. Less duplication.
-- Ladislav :-)
--- src/app/stylesheets/aggregator.scss | 3 ++- src/app/views/users/_form.haml | 7 ++++--- src/app/views/users/new.haml | 16 +++++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/app/stylesheets/aggregator.scss b/src/app/stylesheets/aggregator.scss index 6711ee6..81f3aea 100644 --- a/src/app/stylesheets/aggregator.scss +++ b/src/app/stylesheets/aggregator.scss @@ -121,6 +121,7 @@ input[type='submit'],button,.button { display: inline-block; margin-left: 3px; margin: 40px 4px 4px; + float: left; } &.actionlink { margin: 40px 0 0; @@ -862,7 +863,7 @@ fieldset.gap { padding: 4px 10px 0 0; max-width: 10em; } - input { + input[type='text'], input[type='password'], textarea { display: inline-block; width: 20em; } diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml index 1017858..7ff42b3 100644 --- a/src/app/views/users/_form.haml +++ b/src/app/views/users/_form.haml @@ -26,9 +26,10 @@ = form.text_field :email, :class => "grid_5" -if has_user_modify? %h3.grid_16 User Treatment - = label_tag 'apply_treatment', t(:apply_treatment), :class => "alpha grid_3" - = select_tag 'user_treatment', options_for_select([t(:choose_treatment)]), :class => "grid_5" - = submit_tag t(:apply), :disabled => true + %fieldset.clearfix + = label_tag 'apply_treatment', t(:apply_treatment), :class => "alpha grid_3" + = select_tag 'user_treatment', options_for_select([t(:choose_treatment)]), :class => "grid_5" + = submit_tag t(:apply), :disabled => true, :class => "grid_2"
- form.fields_for :quota do |quota_form| %fieldset.clear diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml index b0c158a..fa5784b 100644 --- a/src/app/views/users/new.haml +++ b/src/app/views/users/new.haml @@ -1,8 +1,18 @@ -.modalbox +-if (current_user) %h2 New Account .dcloud_form - form_for @user, :url => account_path do |f| = f.error_messages = render :partial => "form", :object => f - = f.submit t(:create_account), :class => "submit dialogbutton" - = link_to t(:cancel), {:controller => 'users'}, :class => 'actionlink button dialogbutton' + %fieldset.clearfix + = f.submit t(:create_account), :class => "submit formbutton" + = link_to t(:cancel), {:controller => 'users'}, :class => 'button formbutton' +-else + .modalbox + %h2 New Account + .dcloud_form + - form_for @user, :url => account_path do |f| + = f.error_messages + = render :partial => "form", :object => f + = f.submit t(:create_account), :class => "submit dialogbutton" + = link_to t(:cancel), {:controller => 'users'}, :class => 'button dialogbutton'
NACK (see at the bottom)
On 10/18/2010 02:37 PM, Jakub Steiner wrote:
src/app/stylesheets/aggregator.scss | 3 ++- src/app/views/users/_form.haml | 7 ++++--- src/app/views/users/new.haml | 16 +++++++++++++--- 3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/app/stylesheets/aggregator.scss b/src/app/stylesheets/aggregator.scss index 6711ee6..81f3aea 100644 --- a/src/app/stylesheets/aggregator.scss +++ b/src/app/stylesheets/aggregator.scss @@ -121,6 +121,7 @@ input[type='submit'],button,.button { display: inline-block; margin-left: 3px; margin: 40px 4px 4px;
- float: left; } &.actionlink { margin: 40px 0 0;
@@ -862,7 +863,7 @@ fieldset.gap { padding: 4px 10px 0 0; max-width: 10em; }
- input {
- input[type='text'], input[type='password'], textarea { display: inline-block; width: 20em; }
diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml index 1017858..7ff42b3 100644 --- a/src/app/views/users/_form.haml +++ b/src/app/views/users/_form.haml @@ -26,9 +26,10 @@ = form.text_field :email, :class => "grid_5" -if has_user_modify? %h3.grid_16 User Treatment
- = label_tag 'apply_treatment', t(:apply_treatment), :class => "alpha grid_3"
- = select_tag 'user_treatment', options_for_select([t(:choose_treatment)]), :class => "grid_5"
- = submit_tag t(:apply), :disabled => true
%fieldset.clearfix
= label_tag 'apply_treatment', t(:apply_treatment), :class => "alpha grid_3"
= select_tag 'user_treatment', options_for_select([t(:choose_treatment)]), :class => "grid_5"
= submit_tag t(:apply), :disabled => true, :class => "grid_2"
- form.fields_for :quota do |quota_form|
%fieldset.clear
diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml index b0c158a..fa5784b 100644 --- a/src/app/views/users/new.haml +++ b/src/app/views/users/new.haml @@ -1,8 +1,18 @@ -.modalbox +-if (current_user) %h2 New Account .dcloud_form - form_for @user, :url => account_path do |f| = f.error_messages = render :partial => "form", :object => f
= f.submit t(:create_account), :class => "submit dialogbutton"= link_to t(:cancel), {:controller => 'users'}, :class => 'actionlink button dialogbutton'
%fieldset.clearfix= f.submit t(:create_account), :class => "submit formbutton"= link_to t(:cancel), {:controller => 'users'}, :class => 'button formbutton'+-else
- .modalbox
- %h2 New Account
- .dcloud_form
- form_for @user, :url => account_path do |f|= f.error_messages= render :partial => "form", :object => f= f.submit t(:create_account), :class => "submit dialogbutton"= link_to t(:cancel), {:controller => 'users'}, :class => 'button dialogbutton'
This code duplication is unnecessary and makes any future changes more complicatied. Please move the code in the if/else blocks to a partial instead.
--- src/app/stylesheets/aggregator.scss | 4 ++-- src/app/views/instance/index.haml | 29 +++++++++++++++++++---------- 2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/app/stylesheets/aggregator.scss b/src/app/stylesheets/aggregator.scss index 81f3aea..1553fb4 100644 --- a/src/app/stylesheets/aggregator.scss +++ b/src/app/stylesheets/aggregator.scss @@ -270,7 +270,7 @@ table { } } td { - padding: 2px; + padding: 4px; vertical-align: top; min-height: 16px; } @@ -1036,7 +1036,7 @@ footer { }
/* GRINDS */ -.status { +.status,.capacity { span { display: inline-block; width: 10px; diff --git a/src/app/views/instance/index.haml b/src/app/views/instance/index.haml index 1d6db4a..83e8f41 100644 --- a/src/app/views/instance/index.haml +++ b/src/app/views/instance/index.haml @@ -12,11 +12,11 @@ - pool_columns = [ | { :name => "Pool name", :sort_attr => :name }, | { :name => "Alerts", :sortable => false }, | - { :name => "% Quota used", :sortable => false }, | - { :name => "Quota (Instances)", :sort_attr => "quotas.total_instances"}, | + { :name => "Capacity", :sortable => false }, | { :name => "Zone", :sort_attr => "zones.name" } | ] |
+ - form_tag(:action => 'instance_action') do .actionsidebar.grid_3 %dl @@ -61,24 +61,33 @@ %span = submit_tag "Request Help", :name => "request_help", :class => "icon", :disabled => true
- .grid_13 + .grid_5 + %h2 My Quota + %table + %thead + %tr + %th % Quota Used + %th + Quota + %span.small (Instances) + %tbody + %tr + %td 32 + %td 2351 + .grid_8 %h2 Pool Status %table =sortable_table_header pool_columns - %tbody - @pools.each do |pool| %tr %td =link_to pool.name, pool_url(pool.id) %td N/A - %td - =((pool.quota.maximum_running_instances || 0)/100)*pool.quota.total_instances - ='%' - %td - =pool.quota.total_instances + %td.capacity + %span.good %td =pool.zone.name - + .grid_13 %h2 Instances by Pool - @pools.each do |pool| .grid_6.alpha.poolname
deltacloud-devel@lists.fedorahosted.org
-
Jakub Steiner -
lmartinc＠redhat.com -
Tomas Sedovic