From 4d33ea553cafb4dae168979d9b800747eed9e89c Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Wed, 27 Jun 2012 13:21:19 +0200 Subject: [PATCH] Related #1314: Decrease font size in dashboard numbers and replace refresh icons with buttons + fontawesome icon (cherry picked from commit 64b3ab2e45683e8917d5d2b08618734e709edc98) --- src/sunstone/public/css/application.css | 10 +++++++++- src/sunstone/public/js/plugins/acls-tab.js | 6 +++--- src/sunstone/public/js/plugins/clusters-tab.js | 8 ++++---- src/sunstone/public/js/plugins/datastores-tab.js | 6 +++--- src/sunstone/public/js/plugins/groups-tab.js | 6 +++--- src/sunstone/public/js/plugins/hosts-tab.js | 8 ++++---- src/sunstone/public/js/plugins/images-tab.js | 6 +++--- src/sunstone/public/js/plugins/marketplace-tab.js | 6 +++--- src/sunstone/public/js/plugins/templates-tab.js | 6 +++--- src/sunstone/public/js/plugins/users-tab.js | 6 +++--- src/sunstone/public/js/plugins/vms-tab.js | 10 +++++----- src/sunstone/public/js/plugins/vnets-tab.js | 6 +++--- 12 files changed, 46 insertions(+), 38 deletions(-) diff --git a/src/sunstone/public/css/application.css b/src/sunstone/public/css/application.css index 1126e30647..914980f256 100644 --- a/src/sunstone/public/css/application.css +++ b/src/sunstone/public/css/application.css @@ -663,7 +663,15 @@ ul.action_list li a:hover{ .big_text { color: #333333; - font-size: 5em; + font-size: 3.5em; + font-family: serif; + text-align:center; + vertical-align:middle; +} + +.medium_text { + color: #333333; + font-size: 2.0em; font-family: serif; text-align:center; vertical-align:middle; diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 9a9b8109b0..9fdebd324c 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -155,9 +155,9 @@ var acl_actions = { var acl_buttons = { "Acl.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" + type: "action", + text: '', + alwaysActive: true }, "Acl.create_dialog" : { type: "create_dialog", diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js index 68db501e7c..a8c2087cde 100644 --- a/src/sunstone/public/js/plugins/clusters-tab.js +++ b/src/sunstone/public/js/plugins/clusters-tab.js @@ -177,10 +177,10 @@ var cluster_actions = { var cluster_buttons = { "Cluster.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" - }, + type: "action", + text: '', + alwaysActive: true + }, "Cluster.create_dialog" : { type: "create_dialog", text: tr("+ New") diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js index c341b189f8..364e2aeb30 100644 --- a/src/sunstone/public/js/plugins/datastores-tab.js +++ b/src/sunstone/public/js/plugins/datastores-tab.js @@ -283,9 +283,9 @@ var datastore_actions = { var datastore_buttons = { "Datastore.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" + type: "action", + text: '', + alwaysActive: true }, "Datastore.create_dialog" : { type: "create_dialog", diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js index aeafedeff9..7078915440 100644 --- a/src/sunstone/public/js/plugins/groups-tab.js +++ b/src/sunstone/public/js/plugins/groups-tab.js @@ -222,9 +222,9 @@ var group_actions = { var group_buttons = { "Group.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" + type: "action", + text: '', + alwaysActive: true }, "Group.create_dialog" : { type: "create_dialog", diff --git a/src/sunstone/public/js/plugins/hosts-tab.js b/src/sunstone/public/js/plugins/hosts-tab.js index 04b815e62e..0fdcc0fe44 100644 --- a/src/sunstone/public/js/plugins/hosts-tab.js +++ b/src/sunstone/public/js/plugins/hosts-tab.js @@ -293,10 +293,10 @@ var host_actions = { var host_buttons = { "Host.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" - }, + type: "action", + text: '', + alwaysActive: true + }, "Host.create_dialog" : { type: "create_dialog", text: tr("+ New"), diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index be93b0abee..1fea3e7433 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -449,9 +449,9 @@ var image_actions = { var image_buttons = { "Image.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" + type: "action", + text: '', + alwaysActive: true }, "Image.create_dialog" : { type: "create_dialog", diff --git a/src/sunstone/public/js/plugins/marketplace-tab.js b/src/sunstone/public/js/plugins/marketplace-tab.js index add46dddf4..eb71e0614d 100644 --- a/src/sunstone/public/js/plugins/marketplace-tab.js +++ b/src/sunstone/public/js/plugins/marketplace-tab.js @@ -78,9 +78,9 @@ var market_actions = { var market_buttons = { "Marketplace.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" + type: "action", + text: '', + alwaysActive: true }, "Marketplace.import" : { type: "action", diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 359ea14e42..3ae1c8d460 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -796,9 +796,9 @@ var template_actions = { var template_buttons = { "Template.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" + type: "action", + text: '', + alwaysActive: true }, "Template.create_dialog" : { type: "create_dialog", diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index 07602a9c8b..1884ed5b46 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -358,9 +358,9 @@ var user_actions = { var user_buttons = { "User.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" + type: "action", + text: '', + alwaysActive: true }, "User.create_dialog" : { type: "create_dialog", diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 997fe4500e..61a6a7bd44 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -503,9 +503,9 @@ var vm_actions = { var vm_buttons = { "VM.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" + type: "action", + text: '', + alwaysActive: true }, "VM.create_dialog" : { @@ -675,10 +675,10 @@ SunstoneMonitoringConfig['VM'] = { var t = ((new Date().getTime()) - netUsage.time) / 1000 //in secs var bandwidth_up = monitoring['netUsageBar'][1].data[0][0] - netUsage.up bandwidth_up /= t - var bandwidth_up_str = humanize_size(bandwidth_up) + "/s" //bytes /sec + var bandwidth_up_str = humanize_size(bandwidth_up) + "b/s" //bytes /sec var bandwidth_down = monitoring['netUsageBar'][0].data[0][0] - netUsage.down bandwidth_down /= t - var bandwidth_down_str = humanize_size(bandwidth_down) + "/s" //bytes /sec + var bandwidth_down_str = humanize_size(bandwidth_down) + "b/s" //bytes /sec if (bandwidth_up >= 0) $('#bandwidth_up', $dashboard).text(bandwidth_up_str) diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index 27cbb7fd31..5854d780bf 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -414,9 +414,9 @@ var vnet_actions = { var vnet_buttons = { "Network.refresh" : { - type: "image", - text: tr("Refresh list"), - img: "images/Refresh-icon.png" + type: "action", + text: '', + alwaysActive: true }, "Network.create_dialog" : {