\
-'+tr("This table shows the ACLs rules broken down to easier the reading and meaning of each one. You can show the ACL original string by clicking on Show/Hide columns.")+'\
-
\
-
\
';
var create_acl_tmpl =
@@ -155,15 +149,17 @@ var create_acl_tmpl =
\
\
\
- \
+ \
×\
-';
+\
+ ';
var acl_actions = {
"Acl.create" : {
@@ -436,7 +432,7 @@ function setupCreateAclDialog(){
// width: 650,
// height: height
//});
- dialog.addClass("reveal-modal large");
+ dialog.addClass("reveal-modal large max-height");
//Default selected options
$('#res_subgroup_all',dialog).attr('checked','checked');
@@ -617,7 +613,6 @@ function setAclAutorefresh(){
$(document).ready(function(){
//if we are not oneadmin, our tab will not even be in the DOM.
dataTable_acls = $("#datatable_acls",main_tabs_context).dataTable({
- "sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
"oColVis": {
"aiExclude": [ 0 ]
},
@@ -625,11 +620,7 @@ $(document).ready(function(){
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [6]}
- ],
- "oLanguage": (datatable_lang != "") ?
- {
- sUrl: "locale/"+lang+"/"+datatable_lang
- } : ""
+ ]
});
diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js
index f5943fea88..68bdd0864f 100644
--- a/src/sunstone/public/js/plugins/clusters-tab.js
+++ b/src/sunstone/public/js/plugins/clusters-tab.js
@@ -72,15 +72,14 @@ var datastore_datatable_table_tmpl='\
'
-var create_cluster_tmpl ='
\
-'+tr("Datatables are sets of images which share a common transfer driver. i.e. Images in a SSH datastore will be copied to the hosts using SSH when deploying a Virtual Machine.")+'\
-
\
-
\
';
var create_datastore_tmpl =
-'
\
-
\
+'
\
\
'+tr("Create Datastore")+'\
\
@@ -149,7 +142,7 @@ var create_datastore_tmpl =
\
\
\
@@ -201,30 +194,32 @@ var create_datastore_tmpl =
\
\
\
-
\
+
\
\
\
-
\
+
\
\
\
\
+
'+tr("Paths that can not be used to register images. A space separated list of paths. This will prevent users registering important files as VM images and accessing them thourgh their VMs. OpenNebula will automatically add its configuration directories: /var/lib/one, /etc/one and oneadmin's home ($HOME).")+'
\
\
\
\
-
\
+
\
\
\
-
\
+
\
\
\
\
+
'+tr("If you need to un-block a directory under one of the RESTRICTED_DIRS")+'
\
\
\
\
-
\
+
\
\
\
-
\
+
\
\
\
\
@@ -232,52 +227,53 @@ var create_datastore_tmpl =
\
-'+tr("Size and registration time are hidden colums. Note that persistent files can only be used by 1 VM. To change file datastore, please re-register the file.")+'\
-
\
-
\
';
var create_file_tmpl =
@@ -80,8 +74,8 @@ var create_file_tmpl =
\
-'+tr("Size and registration time are hidden colums. Note that persistent images can only be used by 1 VM. To change image datastore, please re-register the image.")+'\
-
\
-'+tr("Clicking `instantiate` will create new Virtual Machines from the selected templates and name one-id. You will be able to assign a specific name to a new VM, or launch several instances at once if the template doesn't reference any persistent image.")+'\
-
\
-
\
-'+tr("You can clone a template to obtain a copy from an existing template. This copy will be owned by you.")+'\
-
\
-
\
';
var create_template_tmpl = '
'+
- '
'+tr("Create VM Template")+''+
+ '
'+tr("Create VM Template")+''+tr("Update VM Template")+'
';
var update_template_tmpl =
@@ -528,13 +518,13 @@ function generate_capacity_tab_content() {
'
'+
''+
' '+
- '
'+
+ '
'+
'
'+
''+
'
'+
'
'+
'
'+
- '
'+
+ '
'+
''+
'
'+
'
'+
@@ -564,16 +554,16 @@ function generate_capacity_tab_content() {
'
'+
'
'+
'
'+
- '
'+tr("Advanced options")+'
'+
+ '
'+tr("Advanced options")+'
'+
'
'+
'
'+
- '
'+
+ '
'+
'
'+
''+
'
'+
'
'+
'
'+
- '
'+
+ '
'+
''+
'
'+
'
'+
@@ -755,10 +745,10 @@ function setup_capacity_tab_content(capacity_section) {
function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
var html = '
'+
''+tr("Please select an image from the list")+''+
- 'You selected the following image: '+
+ ''+tr("You selected the following image: ")+
''+
''+
''+
'
'+
''+
'
'+
- '
'+tr("Advanced options")+'
'+
+ '
'+tr("Advanced options")+'
'+
'
'+
'
'+
'
'+
@@ -866,13 +856,13 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
'
'+
'
'+
''+
- '
'+
+ '
'+
'
'+
''+
'
'+
'
'+
'
'+
- '
'+
+ '
'+
''+
'
'+
'
'+
@@ -886,7 +876,7 @@ function generate_disk_tab_content(str_disk_tab_id, str_datatable_id){
'
'+
''+tr("Please select an network from the list")+''+
- 'You selected the following image: '+
+ ''+tr("You selected the following image:")+
''+
''+
''+
'
'+
''+
'
'+
- '
'+tr("Advanced options")+'
'+
+ '
'+tr("Advanced options")+'
'+
'
'+
'
'+
'
'+
@@ -1179,7 +1169,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
'
'+
''+
'
'+
- '
'+
+ '
'+
''+
'
'+
'
'+
@@ -1192,7 +1182,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
'
'+
''+
'
'+
- '
'+
+ '
'+
''+
'
'+
'
'+
@@ -1222,7 +1212,7 @@ function generate_nic_tab_content(str_nic_tab_id, str_datatable_id){
''+
'
'+
'
'+
- '
'+tr("A list of ports separated by commas or a ranges separated by semilocolons, e.g.: 22,80,5900:6000")+'
'+
+ '
'+tr("A list of ports separated by commas or a ranges separated by semicolons, e.g.: 22,80,5900:6000")+'
").appendTo($("dl#template_create_tabs"));
$(html_tab_content).appendTo($("ul#template_create_tabs_content"));
@@ -1714,7 +1712,7 @@ function setupCreateTemplateDialog(){
$(html_tab_content).appendTo($("ul#template_create_storage_tabs_content"));
var a = $("
").appendTo($("dl#template_create_tabs"));
$(html_tab_content).appendTo($("ul#template_create_tabs_content"));
// close icon: removing the tab on click
@@ -1784,7 +1782,7 @@ function setupCreateTemplateDialog(){
''
// Append the new div containing the tab and add the tab to the list
- var a = $("
'+
@@ -1930,7 +1928,7 @@ function setupCreateTemplateDialog(){
'
'+
'
'+
''+tr("Please select a Kernel from the list")+''+
- 'You selected the following Kernel: '+
+ ''+tr("You selected the following Kernel: ")+
''+
''+
''+
@@ -1951,10 +1949,10 @@ function setupCreateTemplateDialog(){
'
'+
@@ -1990,7 +1988,7 @@ function setupCreateTemplateDialog(){
'
'+
'
'+
''+tr("Please select a Ramdisk from the list")+''+
- 'You selected the following Ramdisk: '+
+ ''+tr("You selected the following Ramdisk: ")+
''+
''+
''+
@@ -2431,43 +2429,51 @@ function setupCreateTemplateDialog(){
'
'+
'
'+
@@ -2767,7 +2773,7 @@ function setupCreateTemplateDialog(){
' '+
'
'+
''+tr("Please select one or more hosts from the list")+' '+
- 'You selected the following hosts: '+
+ ''+tr("You selected the following hosts:")+' '+
'
'+
@@ -2797,7 +2803,7 @@ function setupCreateTemplateDialog(){
' '+
'
'+
''+tr("Please select one or more clusters from the list")+' '+
- 'You selected the following clusters: '+
+ ''+tr("You selected the following clusters:")+' '+
'
Sets the specified VM disk to be saved in a new Image.
\
- Deferred: The Image is created immediately, but the contents are saved only if the VM is shut down gracefully (i.e., using Shutdown or Cancel; not Delete)
\
- Life: The Image will be saved immediately.
\
+
'+tr("Sets the specified VM disk to be saved in a new Image.")+'
\
+ '+tr("Deferred: The Image is created immediately, but the contents are saved only if the VM is shut down gracefully (i.e., using Shutdown or Cancel; not Delete)")+'
\
+ '+tr("Hot: The Image will be saved immediately.")+'
\
\
\
\
@@ -1959,7 +1981,7 @@ function setupSaveAsDialog(){
var snapshot_type = $('#snapshot_type', this).val();
if (!image_name.length){
- notifyError('Please provide a name for the new image');
+ notifyError(tr('Please provide a name for the new image'));
return false;
}
@@ -1996,6 +2018,7 @@ function setupAttachDiskDialog(){
'+tr("Attach new disk")+'\
\
\
+
\
\
\
\
@@ -2009,15 +2032,17 @@ function setupAttachDiskDialog(){