diff --git a/src/cloud/occi/lib/ui/public/customize/custom.js b/src/cloud/occi/lib/ui/public/customize/custom.js
new file mode 100644
index 0000000000..d98ee3c6e0
--- /dev/null
+++ b/src/cloud/occi/lib/ui/public/customize/custom.js
@@ -0,0 +1,101 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) */
+/* */
+/* Licensed under the Apache License, Version 2.0 (the "License"); you may */
+/* not use this file except in compliance with the License. You may obtain */
+/* a copy of the License at */
+/* */
+/* http://www.apache.org/licenses/LICENSE-2.0 */
+/* */
+/* Unless required by applicable law or agreed to in writing, software */
+/* distributed under the License is distributed on an "AS IS" BASIS, */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */
+/* See the License for the specific language governing permissions and */
+/* limitations under the License. */
+/* -------------------------------------------------------------------------- */
+
+//OpenNebula Self-Service customization file.
+//Use tr("String") to enable text translation.
+//You can use HTML and the following variables.
+var $vm_count = '';
+var $storage_count = '';
+var $network_count = '';
+
+
+
+//Login logo 591x43px - not implemented
+var logo_big = "images/opennebula-selfservice-big.png";
+//Top left logo 179x14px - not implemented
+var logo_small = "images/opennebula-selfservice-small.png";
+
+
+////////////////////////////////////////////////////////////////
+// Dashboard tab customization
+////////////////////////////////////////////////////////////////
+
+////
+//Dashboard Welcome box
+////
+var dashboard_welcome_title = tr("Welcome to OpenNebula Self-Service");
+var dashboard_welcome_image = "images/opennebula-selfservice-icon.png"
+var dashboard_welcome_html = ''+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.")+'
\
+'+tr("Have a cloudy experience!")+'
';
+
+////
+//Dashboard useful links box
+//Array of { href: "address", text: "text" },...
+////
+var dashboard_links = [
+ { href: "http://opennebula.org/documentation:documentation",
+ text: tr("Documentation")
+ },
+ { href: "http://opennebula.org/support:support",
+ text: tr("Support")
+ },
+ { href: "http://opennebula.org/community:community",
+ text: tr("Community")
+ }
+];
+
+////
+//Dashboard right-side boxes
+////
+var compute_box_title = tr("Compute");
+var compute_box_image = "images/server_icon.png"; //scaled to 100px width
+var compute_box_html = ''+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.")+'
';
+
+var storage_box_title = tr("Storage");
+var storage_box_image = "images/storage_icon.png"; //scaled to 100px width
+var storage_box_html = ''+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.")+'
';
+
+var network_box_title = tr("Network");
+var network_box_image = "images/network_icon.png";
+var network_box_html = ''+tr("Your compute resources connectivity is performed using pre-defined virtual networks. You can create and manage these networks using OpenNebula Self-Service.")+'
';
+
+
+///////////////////////////////////////////////////////////
+//Compute tab
+///////////////////////////////////////////////////////////
+var compute_dashboard_image = "images/one-compute.png";
+var compute_dashboard_html = '' + 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.")+'
\
+'+tr("There are currently")+' '+$vm_count+' '+tr("virtual machines")+'.
';
+
+///////////////////////////////////////////////////////////
+//Storage tab
+///////////////////////////////////////////////////////////
+var storage_dashboard_image = "images/one-storage.png";
+var storage_dashboard_html = ''+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.")+'
\
+'+tr("There are currently")+' '+$storage_count+' '+tr("images")+'.
';
+
+///////////////////////////////////////////////////////////
+//Network tab
+///////////////////////////////////////////////////////////
+var network_dashboard_image = "image/one-network.png";
+var network_dashboard_html = ''+tr("In this view you can easily manage OpenNebula Network resources. You can add, remove, publish or unpublish virtual networks.")+'
\
+'+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")+' '+$network_count+' '+tr("networks")+'.
';
\ No newline at end of file
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 0011528201..6b4ceef514 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/compute.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
@@ -101,12 +101,9 @@ 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.")+'
\
-
'+tr("There are currently")+' '+tr("virtual machines")+'.
\
-
\
\
\
- ' + tr("Welcome to OpenNebula Self-Service") + '\
+ ' + dashboard_welcome_title + '\
\
-  '+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.")+' \
- '+tr("Have a cloudy experience!")+' \
+  '+
+ dashboard_welcome_html+'\
\
| \
@@ -40,15 +40,15 @@ var dashboard_tab_content =
\
\
| '+tr("Compute")+' | \
- | \
-
\
- \
- | ' + tr("Network") + ' | \
- | \
+ '+$vm_count+' | \
\
\
| ' + tr("Storage") + ' | \
- | \
+ '+$storage_count+' | \
+
\
+ \
+ | ' + tr("Network") + ' | \
+ '+$network_count+' | \
\
\
\
@@ -60,10 +60,8 @@ var dashboard_tab_content =
\
\
' + tr("Useful links") + '\
- \
- \
+ '+
+ generateDashboardLinks() +'\
\
\
| \
@@ -75,10 +73,12 @@ var dashboard_tab_content =
\
\
\
- ' + tr("Compute") + '\
+ ' + compute_box_title + '\
\
-  '+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.")+'
\
- Create new compute resource
\
+ '+
+ compute_box_html +
+ ' Create new compute resource
\
See more \
\
|
\
\
\
- ' + tr("Storage") + '\
+ ' + storage_box_title + '\
\
-  '+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.")+'
\
- Create new storage resource
\
+ ' +
+ storage_box_html +
+ ' Create new storage resource
\
See more \
\
|
\
\
\
- ' + tr("Network") + '\
+ ' + network_box_title + '\
\
";
+ for (var i=0; i'+dashboard_links[i].text+'';
+ };
+ links+=" ";
+ return links;
+};
+
$(document).ready(function(){
//Dashboard link listener
@@ -172,15 +186,15 @@ function updateDashboard(what,json_info){
switch (what){
case "vms":
var total_vms=json_info.length;
- $('#total_vms',db).html(total_vms);
+ $('.vm_count',db).html(total_vms);
break;
case "vnets":
var total_vnets=json_info.length;
- $('#total_vnets',db).html(total_vnets);
+ $('.network_count',db).html(total_vnets);
break;
case "images":
var total_images=json_info.length;
- $('#total_images',db).html(total_images);
+ $('.storage_count',db).html(total_images);
break;
}
}
diff --git a/src/cloud/occi/lib/ui/public/js/plugins/network.js b/src/cloud/occi/lib/ui/public/js/plugins/network.js
index ccd000693e..b4146411ae 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/network.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/network.js
@@ -63,11 +63,9 @@ var create_vn_tmpl =
var vnet_dashboard = '\
-  \
- '+tr("In this view you can easily manage OpenNebula Network resources. You can add, remove, publish or unpublish virtual networks.")+' \
- '+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")+'. \
- \
-  \
- '+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.")+' \
- '+tr("There are currently")+' '+tr("images")+'. \
-  '+
+ storage_dashboard_html +
+ '';
var dataTable_images;
var $create_image_dialog;
@@ -572,7 +569,7 @@ function popUpCreateImageDialog(){
function popUpImageDashboard(){
var count = dataTable_images.fnGetNodes().length;
popDialog(image_dashboard);
- $('#dialog #image_dashboard_count').text(count);
+ $('#dialog .storage_count').text(count);
};
// Set the autorefresh interval for the datatable
diff --git a/src/cloud/occi/lib/ui/views/index.erb b/src/cloud/occi/lib/ui/views/index.erb
index 55f04f8fac..031fa00d36 100644
--- a/src/cloud/occi/lib/ui/views/index.erb
+++ b/src/cloud/occi/lib/ui/views/index.erb
@@ -34,6 +34,7 @@
+
@@ -43,6 +44,7 @@
+
|
'+tr("Your compute resources connectivity is performed using pre-defined virtual networks. You can create and manage these networks using OpenNebula Self-Service.")+'