Everythink works great except one thing noted inline, ACK after fixed
Jirka
Dne 23.5.2011 11:13, Tomas Hrcka napsal(a):
---
src/app/controllers/pools_controller.rb | 12 ++++++++++
src/app/views/pools/_header.haml | 13 -----------
src/app/views/pools/_header_index.haml | 4 +++
src/app/views/pools/_header_show.haml | 13 +++++++++++
src/app/views/pools/_overview.haml | 31 ----------------------------
src/app/views/pools/_scoreboard.haml | 30 ---------------------------
src/app/views/pools/_scoreboard_index.haml | 30 +++++++++++++++++++++++++++
src/app/views/pools/_scoreboard_show.haml | 30 +++++++++++++++++++++++++++
src/app/views/pools/index.haml | 3 +-
src/app/views/pools/show.haml | 6 ++--
src/config/locales/en.yml | 5 +---
11 files changed, 95 insertions(+), 82 deletions(-)
delete mode 100644 src/app/views/pools/_header.haml
create mode 100644 src/app/views/pools/_header_index.haml
create mode 100644 src/app/views/pools/_header_show.haml
delete mode 100644 src/app/views/pools/_overview.haml
delete mode 100644 src/app/views/pools/_scoreboard.haml
create mode 100644 src/app/views/pools/_scoreboard_index.haml
create mode 100644 src/app/views/pools/_scoreboard_show.haml
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index 33de831..2537dce 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -22,6 +22,7 @@ class PoolsController< ApplicationController
else
@pools = Pool.search() { keywords(params[:q]) }.results
end
+ statistics
respond_to do |format|
format.js { render :partial => 'list' }
format.html
@@ -206,4 +207,15 @@ class PoolsController< ApplicationController
conditions = params[:state].present? ? ['state=?', params[:state]] :
''
@instances = @pool.instances.find(:all, :conditions => conditions)
end
+
+ def statistics
+ instances = Instance.list_for_user(current_user, Privilege::VIEW)
+ @statistics = {
+ :pools_in_use => @pools.collect { |pool|
pool.instances.pending.count> 0 || pool.instances.running.count> 0 }.count,
there is no running scope defined, deployed scope which consists running
and shutting down states should be used instead.
:pools_in_use => @pools.collect { |pool| pool.instances.pending.count> 0 ||
pool.instances.deployed.count> 0 }.count,
+ :deployments =>
Deployment.list_for_user(current_user, Privilege::VIEW).count,
+ :instances => instances.count,
+ :instances_pending => instances.select {|instance| instance.state ==
Instance::STATE_NEW || instance.state == Instance::STATE_PENDING}.count,
+ :instances_failed => instances.select {|instance| instance.state ==
Instance::STATE_CREATE_FAILED || instance.state == Instance::STATE_ERROR}.count
+ }
+ end
end
diff --git a/src/app/views/pools/_header.haml b/src/app/views/pools/_header.haml
deleted file mode 100644
index 2ea3cac..0000000
--- a/src/app/views/pools/_header.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-%header.page-header
- %h1.pools
- = @pool.name
- Pool
- -# Insert appropriate controls here, or ommit %ul.controls
- #obj_actions.button-container
- = link_to 'New Deployment', launch_new_deployments_path, :class =>
'button primary', :id => 'new_deployment_button'
- .button-group
- = link_to 'Edit', edit_pool_path(@pool), :class => 'button
pill', :id => 'edit_pool_button'
- - form_tag do
- = hidden_field(@pool, :id)
- = restful_submit_tag('Delete', 'destroy', pool_url(@pool),
'DELETE', :class => "button pill danger")
- .corner
diff --git a/src/app/views/pools/_header_index.haml
b/src/app/views/pools/_header_index.haml
new file mode 100644
index 0000000..d2a1b1b
--- /dev/null
+++ b/src/app/views/pools/_header_index.haml
@@ -0,0 +1,4 @@
+%header.page-header
+ %h1.pools Overview
+ -# Insert appropriate controls here, or ommit %ul.controls
+ .corner
\ No newline at end of file
diff --git a/src/app/views/pools/_header_show.haml
b/src/app/views/pools/_header_show.haml
new file mode 100644
index 0000000..2ea3cac
--- /dev/null
+++ b/src/app/views/pools/_header_show.haml
@@ -0,0 +1,13 @@
+%header.page-header
+ %h1.pools
+ = @pool.name
+ Pool
+ -# Insert appropriate controls here, or ommit %ul.controls
+ #obj_actions.button-container
+ = link_to 'New Deployment', launch_new_deployments_path, :class =>
'button primary', :id => 'new_deployment_button'
+ .button-group
+ = link_to 'Edit', edit_pool_path(@pool), :class => 'button
pill', :id => 'edit_pool_button'
+ - form_tag do
+ = hidden_field(@pool, :id)
+ = restful_submit_tag('Delete', 'destroy', pool_url(@pool),
'DELETE', :class => "button pill danger")
+ .corner
diff --git a/src/app/views/pools/_overview.haml b/src/app/views/pools/_overview.haml
deleted file mode 100644
index 4bd54f4..0000000
--- a/src/app/views/pools/_overview.haml
+++ /dev/null
@@ -1,31 +0,0 @@
-#overview-bar
- %h3=t("overview")
- %span.btn-seg-toggle
- Buttons here
-#stats-bar
- %ul
- %li.stat
- %h3=t("stats_bar_pools")
- %span.your_pools
- =(a)pools.count
- %span.in_use
- 4
- %li.stat
- %h3=t("stats_bar_deployments")
- %span.deployments
- =current_user.deployments.count
- %li.stat
- %h3=t("stats_bar_instances")
- %span.instances
- =current_user.owned_instances.count
- %li.stat
- %span.alerts
- %h3=t("alerts")
- (TODO)0
- %li.stat
- %span.updates
- %h3=t("updates")
- (TODO)15
- %li.stat
- %h3=t("stats_bar_quota_used")
- (TODO) 86%
\ No newline at end of file
diff --git a/src/app/views/pools/_scoreboard.haml b/src/app/views/pools/_scoreboard.haml
deleted file mode 100644
index dd49389..0000000
--- a/src/app/views/pools/_scoreboard.haml
+++ /dev/null
@@ -1,30 +0,0 @@
-#scoreboard
- %dl.statistics
- %ul.groups
- %li
- %dt Cloud Providers
- %dd.count.provider= @statistics[:cloud_providers]
- %li
- %dt Deployments
- %dd.count.deployment= @statistics[:deployments]
- %li
- %dt Instances
- %dd.count.instance= @statistics[:instances_deployed]
- %dd.count.instance.pending= @statistics[:instances_pending]
- %dd.count.instance.failure= @statistics[:instances_failed]
- %li
- %ul.subgroup
- %li
- %dt Alerts
- %dd.count.alert 0
- %li
- %dt Updates
- %dd.count.update 0
- %li
- %dt Quota Used
- %dd.percentage.quota 0%
- %dd.fraction.instance
- %span.part 0
- %span.divider.label.small.caps of
- %span.total 0
--# TODO: Implement alerts, updates, and quota overview
diff --git a/src/app/views/pools/_scoreboard_index.haml
b/src/app/views/pools/_scoreboard_index.haml
new file mode 100644
index 0000000..45e885c
--- /dev/null
+++ b/src/app/views/pools/_scoreboard_index.haml
@@ -0,0 +1,30 @@
+#scoreboard
+ %dl.statistics
+ %ul.groups
+ %li
+ %dt= t("pools.index.pools")
+ %dd.count.pool= @pools.count
+ %dd.count.pool.partial= @statistics[:pools_in_use]
+ %li
+ %dt= t("deployments.deployments")
+ %dd.count.deployment= @statistics[:deployments]
+ %li
+ %dt= t("instances.instances")
+ %dd.count.instance= @statistics[:instances]
+ %dd.count.instance.pending= @statistics[:instances_pending]
+ %dd.count.instance.failure= @statistics[:instances_failed]
+ %li
+ %ul.subgroup
+ %li
+ %dt= t("alerts")
+ %dd.count.alert 3
+ %li
+ %dt= t("updates")
+ %dd.count.update 0
+ %li
+ %dt= t("pools.index.quota_used")
+ %dd.percentage.quota 86%
+ %dd.fraction.instance
+ %span.part 21
+ %span.divider.label.small.caps of
+ %span.total 25
\ No newline at end of file
diff --git a/src/app/views/pools/_scoreboard_show.haml
b/src/app/views/pools/_scoreboard_show.haml
new file mode 100644
index 0000000..dd49389
--- /dev/null
+++ b/src/app/views/pools/_scoreboard_show.haml
@@ -0,0 +1,30 @@
+#scoreboard
+ %dl.statistics
+ %ul.groups
+ %li
+ %dt Cloud Providers
+ %dd.count.provider= @statistics[:cloud_providers]
+ %li
+ %dt Deployments
+ %dd.count.deployment= @statistics[:deployments]
+ %li
+ %dt Instances
+ %dd.count.instance= @statistics[:instances_deployed]
+ %dd.count.instance.pending= @statistics[:instances_pending]
+ %dd.count.instance.failure= @statistics[:instances_failed]
+ %li
+ %ul.subgroup
+ %li
+ %dt Alerts
+ %dd.count.alert 0
+ %li
+ %dt Updates
+ %dd.count.update 0
+ %li
+ %dt Quota Used
+ %dd.percentage.quota 0%
+ %dd.fraction.instance
+ %span.part 0
+ %span.divider.label.small.caps of
+ %span.total 0
+-# TODO: Implement alerts, updates, and quota overview
diff --git a/src/app/views/pools/index.haml b/src/app/views/pools/index.haml
index 7784a31..9580d1c 100644
--- a/src/app/views/pools/index.haml
+++ b/src/app/views/pools/index.haml
@@ -1,2 +1,3 @@
-= render :partial => 'overview'
+= render :partial => 'header_index'
+= render :partial => 'scoreboard_index'
= render :partial => 'pretty_list'
diff --git a/src/app/views/pools/show.haml b/src/app/views/pools/show.haml
index e32277f..355d33d 100644
--- a/src/app/views/pools/show.haml
+++ b/src/app/views/pools/show.haml
@@ -1,8 +1,8 @@
-= render :partial => 'header'
-= render :partial => 'scoreboard'
+= render :partial => 'header_show'
+= render :partial => 'scoreboard_show'
-# TODO - Alerts aren't implemented just yet
-#= render :partial => 'alerts'
-# TODO: %w(Deployments History Properties Permissions) links/tabs, plus filter
links/icons, go here
-= render :partial => @view, :locals => {:deployments => @pool.deployments}
+= render :partial => @view, :locals => {:deployments => @pool.deployments}
\ No newline at end of file
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 19c10cf..acc5cf2 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -67,10 +67,6 @@ en:
apply: Apply
resource_management: Resource Management
overview: Overview
- stats_bar_pools: Pools
- stats_bar_deployments: Deployments
- stats_bar_instances: Instances
- stats_bar_quota_used: Quota Used
alerts: Alerts
updates: Udates
deployments:
@@ -114,6 +110,7 @@ en:
pools:
index:
pools: Pools
+ quota_used: Quota Used
pool_deleted:
one: "Pool %{list} was deleted."
other: "Pools %{list} were deleted."