[email protected] wrote: > From: Jakub Steiner <[email protected]> > > This bring the Instance Management page closer to the latest mockups. > > We show the per-user quota (as opposed to per-pool quota) and put it in a > separate place. > --- > src/app/stylesheets/aggregator.scss | 4 ++-- > src/app/views/instance/index.haml | 35 > +++++++++++++++++++++++++---------- > 2 files changed, 27 insertions(+), 12 deletions(-) > > diff --git a/src/app/stylesheets/aggregator.scss > b/src/app/stylesheets/aggregator.scss > index 1b43b88..1cd30d5 100644 > --- a/src/app/stylesheets/aggregator.scss > +++ b/src/app/stylesheets/aggregator.scss > @@ -269,7 +269,7 @@ table { > } > } > td { > - padding: 2px; > + padding: 4px; > vertical-align: top; > min-height: 16px; > } > @@ -1035,7 +1035,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 3a94c5e..258f512 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,39 @@ > %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 > + - quota = current_user.quota.maximum_running_instances > + %td > + - if quota.respond_to? '>' and quota > 0 > + = "%.2f" % ((current_user.quota.running_instances / > quota.to_f) * 100) > + - else > + = 0 > + %td > + = quota or "unlimited" > + .grid_8 > %h2 Pool Status > %table > =sortable_table_header pool_columns > - %tbody > - @pools.each do |pool| > %tr > %td > = pool.name > %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 > ACK and pushed. We still need to make further updates to show quota usage as a bar graph here, though.
Scott _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
