* hide getting started dashboard portlet
* remove key indicators graph placeholder
* remove account quota usage history graph placeholder
* remove quota usage by pool section
* change username in header to user's first/last name
---
src/app/controllers/dashboard_controller.rb | 3 ++-
src/app/views/dashboard/summary.haml | 19 ++-----------------
src/app/views/layouts/_header.haml | 2 +-
3 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/src/app/controllers/dashboard_controller.rb
b/src/app/controllers/dashboard_controller.rb
index 6f02c4e..0a3e948 100644
--- a/src/app/controllers/dashboard_controller.rb
+++ b/src/app/controllers/dashboard_controller.rb
@@ -61,7 +61,8 @@ class DashboardController < ApplicationController
@is_admin = @current_user.permissions.collect { |p| p.role }.
find { |r| r.name == "Administrator" }
- @hide_getting_started =
cookies["#...@current_user.login}_hide_getting_started"]
+ @hide_getting_started = true
+ #...@hide_getting_started =
cookies["#...@current_user.login}_hide_getting_started"]
@current_users_pool = Pool.find(:first, :conditions => ['name = ?',
@current_user.login])
@cloud_accounts = CloudAccount.list_for_user(@current_user,
Privilege::ACCOUNT_VIEW)
@stats = Instance.get_user_instances_stats(@current_user)
diff --git a/src/app/views/dashboard/summary.haml
b/src/app/views/dashboard/summary.haml
index a1fd296..d8813a1 100644
--- a/src/app/views/dashboard/summary.haml
+++ b/src/app/views/dashboard/summary.haml
@@ -90,7 +90,7 @@
%li
Total instances
.count= @stats[:total_instances]
- .instance_graph #instance_graph
+ .instance_graph
.dashboard_column
#quota_usage_dashboard_section
@@ -100,25 +100,10 @@
Instance utilization by account
- @cloud_accounts.each do |account|
.account_quota_usage_graph_summary
- = "Account " + account.username
- .account_quota_usage_history_graph
- <!-- FIXME include graph -->
+ = account.provider.name + ": " + account.name
.account_quota_usage_current_graph
%object{ :data => url_for(:action => :account_quota_graph, :id =>
account.id, :width => 100, :height => 50), :type => 'image/svg+xml'}
<div style="clear: both;" />
- .dashboard_section_summary
- <img src="images/dashboard_summary_next.png" /><img
src="images/dashboard_summary_prev.png" />
- %p
- Quota usage by pool
- <div style="clear: both;" />
- - @pools.each do |pool|
- .pool_quota_usage_summary
- = pool.name
- .pool_quota_usage_limit
- <!-- FIXME 'quota limit met'... -->
- .pool_quota_usage_instances
- <!-- FIXME 'running instances'... -->
- <div style="clear: both;" />
:javascript
$("#hide_getting_started").click(function(){
diff --git a/src/app/views/layouts/_header.haml
b/src/app/views/layouts/_header.haml
index 5b38b81..bc76755 100644
--- a/src/app/views/layouts/_header.haml
+++ b/src/app/views/layouts/_header.haml
@@ -11,6 +11,6 @@
.header_info
#hi-username
- = link_to @current_user.login, { :controller => "users", :action =>
"show"} unless @current_user.nil?
+ = link_to @current_user.first_name + " " + @current_user.last_name, {
:controller => "users", :action => "show"} unless @current_user.nil?
= link_to 'Log out', logout_url unless @current_user.nil?
= link_to 'Log in', login_url if @current_user.nil?
--
1.6.2.5
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
