diff --git a/src/cloud/occi/lib/ui/public/css/application.css b/src/cloud/occi/lib/ui/public/css/application.css
index e4934e76e9..a122bbdf1a 100644
--- a/src/cloud/occi/lib/ui/public/css/application.css
+++ b/src/cloud/occi/lib/ui/public/css/application.css
@@ -572,12 +572,6 @@ ul.action_list li a:hover{
background: #EEE;
}
-.dashboard_img {
- padding-left:10px;
- border:0;
- height:40px;
-}
-
.dashboard_p {
color: #353735;
text-align:justify;
@@ -585,4 +579,11 @@ ul.action_list li a:hover{
.dashboard_p p{
padding-top:5px;
-}
\ No newline at end of file
+}
+
+.dashboard_p img {
+ padding-left:10px;
+ padding-right: 10px;
+ border:0;
+}
+
diff --git a/src/cloud/occi/lib/ui/public/images/network_icon.png b/src/cloud/occi/lib/ui/public/images/network_icon.png
new file mode 100644
index 0000000000..3f234ac4b9
Binary files /dev/null and b/src/cloud/occi/lib/ui/public/images/network_icon.png differ
diff --git a/src/cloud/occi/lib/ui/public/images/one-compute.png b/src/cloud/occi/lib/ui/public/images/one-compute.png
index 93cfa43614..f635680693 100644
Binary files a/src/cloud/occi/lib/ui/public/images/one-compute.png and b/src/cloud/occi/lib/ui/public/images/one-compute.png differ
diff --git a/src/cloud/occi/lib/ui/public/images/one-network.png b/src/cloud/occi/lib/ui/public/images/one-network.png
index a59f6334cd..9d8be0d340 100644
Binary files a/src/cloud/occi/lib/ui/public/images/one-network.png and b/src/cloud/occi/lib/ui/public/images/one-network.png differ
diff --git a/src/cloud/occi/lib/ui/public/images/one-storage.png b/src/cloud/occi/lib/ui/public/images/one-storage.png
index 5ec80f21c8..1a1c4975bc 100644
Binary files a/src/cloud/occi/lib/ui/public/images/one-storage.png and b/src/cloud/occi/lib/ui/public/images/one-storage.png differ
diff --git a/src/cloud/occi/lib/ui/public/images/opennebula-selfservice-icon.png b/src/cloud/occi/lib/ui/public/images/opennebula-selfservice-icon.png
new file mode 100644
index 0000000000..798da03b07
Binary files /dev/null and b/src/cloud/occi/lib/ui/public/images/opennebula-selfservice-icon.png differ
diff --git a/src/cloud/occi/lib/ui/public/images/server_icon.png b/src/cloud/occi/lib/ui/public/images/server_icon.png
new file mode 100644
index 0000000000..265b10e594
Binary files /dev/null and b/src/cloud/occi/lib/ui/public/images/server_icon.png differ
diff --git a/src/cloud/occi/lib/ui/public/images/storage_icon.png b/src/cloud/occi/lib/ui/public/images/storage_icon.png
new file mode 100644
index 0000000000..fac14fd912
Binary files /dev/null and b/src/cloud/occi/lib/ui/public/images/storage_icon.png differ
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/compute.js b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
index 44f5066e10..0011528201 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/compute.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
@@ -101,7 +101,7 @@ var create_vm_tmpl ='';
var vm_dashboard = '
\
-\
+\
'+tr("This is a list of your current compute resources. Virtual Machines use previously defined images and networks. You can easily create a new compute element by cliking \"new\" and filling-in an easy wizard.")+'
\
'+tr("You can also manage compute resources and perform actions such as stop, resume, shutdown or cancel.")+'
\
'+tr("Additionally, you can take a \"snapshot\" of the storage attached to these resources. They will be saved as new resources, visible from the Storage view and re-usable.")+'
\
@@ -460,7 +460,7 @@ function updateVMachinesView(request, vmachine_list){
});
updateView(vmachine_list_array,dataTable_vMachines);
- //updateDashboard("vms",vmachine_list);
+ updateDashboard("vms",vmachine_list);
}
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/dashboard.js b/src/cloud/occi/lib/ui/public/js/plugins/dashboard.js
index 20061c8232..ee95440ff7 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/dashboard.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/dashboard.js
@@ -14,81 +14,41 @@
/* limitations under the License. */
/* -------------------------------------------------------------------------- */
-/** HISTORY_LENGTH currently ignored on server, but it doesn't harm to have it**/
-var HISTORY_LENGTH=40;
-var GRAPH_AUTOREFRESH_INTERVAL=60000; //60 secs
-
-var graph1 = {
- title : "graph1",
- monitor_resources : "cpu_usage,used_cpu,max_cpu",
- history_length : HISTORY_LENGTH
-};
-
-var graph2 = {
- title : "graph2",
- monitor_resources : "mem_usage,used_mem,max_mem",
- history_length : HISTORY_LENGTH
-};
-
-var graph3 = {
- title : "graph3",
- monitor_resources : "total,active,error",
- history_length : HISTORY_LENGTH
-};
-
-var graph4 = {
- title : "graph4",
- monitor_resources : "net_tx,net_rx",
- history_length : HISTORY_LENGTH
-};
-
var dashboard_tab_content =
'
\
\
-
\
+
\
\
\
\
\
-
' + tr("Summary of resources") + '
\
+
' + tr("Welcome to OpenNebula Self-Service") + '
\
+
\
+
'+tr("OpenNebula Self-Service is a simplified user interface to manage OpenNebula compute, storage and network resources. It is focused on easiness and usability and features a limited set of operations directed towards end-users.")+'
\
+
'+tr("Additionally, OpenNebula Self-Service allows easy customization of the interface (e.g. this text) and brings multi-language support.")+'
\
\
@@ -99,45 +59,51 @@ var dashboard_tab_content =
\
\
\
-
' + tr("Quickstart") + '
\
-
\
\
\
\
\
-
\
-
\
+
\
+
\
\
\
\
-
' + tr("Historical monitoring information") + '
\
-
\
-
\
-
' + tr("Hosts CPU") + '
\
-
\
-
'+spinner+'
\
-
' + tr("Hosts memory") + '
\
-
\
-
'+spinner+'
\
-
' + tr("Total VM count") + '
\
-
\
-
'+spinner+'
\
-
' + tr("VM Network stats") + '
\
-
\
-
'+spinner+'
\
-
\
+
' + tr("Compute") + '
\
+
\
+
'+tr("Compute resources are Virtual Machines attached to storage and network resources. OpenNebula Self-Service allows you to easily create, remove and manage them, including the possibility of pausing a Virtual Machine or taking a snapshot of one of their disks.")+'
'+tr("Storage pool is formed by several images. These images can contain from full operating systems to be used as base for compute resources, to simple data. OpenNebula Self-Service offers you the possibility to create or upload your own images.")+'
'+tr("Your compute resources connectivity is performed using pre-defined virtual networks. You can create and manage these networks using OpenNebula Self-Service.")+'
\
@@ -153,52 +119,6 @@ var dashboard_tab = {
Sunstone.addMainTab('dashboard_tab',dashboard_tab);
-function plot_global_graph(data,info){
- var context = $('#historical_table',main_tabs_context);
- var id = info.title;
- var monitoring = data.monitoring;
- var serie;
- var series = [];
- var width = ($(window).width()-129)*48/100;
- var mon_count = 0;
- var labels_array = info.monitor_resources.split(',');
-
- $('#'+id,context).html('
');
-
- for (var i=0; i\
'+tr("Compute resources can be attached to these networks at creation time. Virtual machines will be provided with an IP and the correct parameters to ensure connectivity.")+'
\
'+tr("There are currently")+' '+tr("networks")+'.
\
@@ -276,7 +276,7 @@ function updateVNetworksView(request, network_list){
updateView(network_list_array,dataTable_vNetworks);
//dependency with dashboard
- //updateDashboard("vnets",network_list);
+ updateDashboard("vnets",network_list);
}
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/storage.js b/src/cloud/occi/lib/ui/public/js/plugins/storage.js
index f50b63ad37..2ef039305f 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/storage.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/storage.js
@@ -102,7 +102,7 @@ var create_image_tmpl =
';
var image_dashboard = '
\
-\
+\
'+tr("The Storage view offers you an overview of your current images. Storage elements are attached to compute resources at creation time. They can also be extracted from running virtual machines by taking an snapshot.")+'
\
'+tr("You can add new storages by clicking \"new\". Image files will be uploaded to OpenNebula and set ready to be used.")+'
\
'+tr("Additionally, you can run several operations on defined storages, such as defining their persistance. Persistent images can only be used by 1 virtual machine, and the changes made by it have effect on the base image. Non-persistent images are cloned before being used in a Virtual Machine, therefore changes are lost unless a snapshot is taken prior to Virtual Machine shutdown.")+'
\
@@ -347,7 +347,7 @@ function updateImagesView(request, images_list){
});
updateView(image_list_array,dataTable_images);
- //updateDashboard("images",images_list);
+ updateDashboard("images",images_list);
}
// Callback to update the information panel tabs and pop it up
diff --git a/src/cloud/occi/lib/ui/views/index.erb b/src/cloud/occi/lib/ui/views/index.erb
index f398492285..55f04f8fac 100644
--- a/src/cloud/occi/lib/ui/views/index.erb
+++ b/src/cloud/occi/lib/ui/views/index.erb
@@ -3,7 +3,7 @@
OpenNebula Self-Service
-
+
@@ -37,6 +37,7 @@
+
\
+
'+tr("OpenNebula Self-Service is a simplified user interface to manage OpenNebula compute, storage and network resources. It is focused on easiness and usability and features a limited set of operations directed towards end-users.")+'
'+tr("Compute resources are Virtual Machines attached to storage and network resources. OpenNebula Self-Service allows you to easily create, remove and manage them, including the possibility of pausing a Virtual Machine or taking a snapshot of one of their disks.")+'
'+tr("Storage pool is formed by several images. These images can contain from full operating systems to be used as base for compute resources, to simple data. OpenNebula Self-Service offers you the possibility to create or upload your own images.")+'
'+tr("Your compute resources connectivity is performed using pre-defined virtual networks. You can create and manage these networks using OpenNebula Self-Service.")+'
\
+