feature 1664:Columns width

This commit is contained in:
Ruben S. Montero committed 2013-03-23 00:47:06 +01:00
1 parent 79c33051c7
commit 740826d95e
2 files changed
+52 -80

No files matched your search

+12 -37
View File
@@ -317,7 +317,7 @@ var template_actions = {
popUpInstantiateVMTemplateDialog();
}
else
{
{
$.each(nodes,function(){
Sunstone.runAction("Template.instantiate",this,"");
});
@@ -1023,11 +1023,7 @@ function setup_disk_tab_content(disk_section, str_disk_tab_id, str_datatable_id)
"aiExclude": [ 0 ]
},
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0,2,3,9,10] },
{ "sWidth": "35px", "aTargets": [1,6,11,12] },
{ "sWidth": "100px", "aTargets": [5,7] },
{ "sWidth": "150px", "aTargets": [8] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [0,2,3,6,9,8,12]}
],
"oLanguage": (datatable_lang != "") ?
@@ -1263,10 +1259,7 @@ function setup_nic_tab_content(nic_section, str_nic_tab_id, str_datatable_id) {
"aiExclude": [ 0 ]
},
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0,6,7,8] },
{ "sWidth": "35px", "aTargets": [1] },
{ "sWidth": "100px", "aTargets": [2,3,5] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [0, 7]}
],
"oLanguage": (datatable_lang != "") ?
@@ -1676,7 +1669,7 @@ function setupCreateTemplateDialog(){
// Append the new div containing the tab and add the tab to the list
var html_tab_content = '<li id="'+str_disk_tab_id+'Tab" class="disk wizard_internal_tab">'+
generate_disk_tab_content(str_disk_tab_id, str_datatable_id) +
generate_disk_tab_content(str_disk_tab_id, str_datatable_id) +
'</li>'
$(html_tab_content).appendTo($("ul#template_create_storage_tabs_content"));
@@ -1743,7 +1736,7 @@ function setupCreateTemplateDialog(){
var str_datatable_id = 'datatable_template_networks' + number_of_nics;
var html_tab_content = '<li id="'+str_nic_tab_id+'Tab" class="nic wizard_internal_tab">'+
generate_nic_tab_content(str_nic_tab_id, str_datatable_id) +
generate_nic_tab_content(str_nic_tab_id, str_datatable_id) +
'</li>'
// Append the new div containing the tab and add the tab to the list
@@ -2015,11 +2008,7 @@ function setupCreateTemplateDialog(){
"aiExclude": [ 0 ]
},
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0,2,3,9,10] },
{ "sWidth": "35px", "aTargets": [1,6,11,12] },
{ "sWidth": "100px", "aTargets": [5,7] },
{ "sWidth": "150px", "aTargets": [8] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [0,3,2,5,6,7,9,8,11,12,10]}
],
"oLanguage": (datatable_lang != "") ?
@@ -2088,11 +2077,7 @@ function setupCreateTemplateDialog(){
"aiExclude": [ 0 ]
},
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0,2,3,9,10] },
{ "sWidth": "35px", "aTargets": [1,6,11,12] },
{ "sWidth": "100px", "aTargets": [5,7] },
{ "sWidth": "150px", "aTargets": [8] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [0,2,3,5,6,7,9,8,10,11,12]}
],
"oLanguage": (datatable_lang != "") ?
@@ -2487,10 +2472,7 @@ function setupCreateTemplateDialog(){
},
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0,2,3,9,10] },
{ "sWidth": "35px", "aTargets": [1,6,11,12] },
{ "sWidth": "100px", "aTargets": [5,7] },
{ "sWidth": "150px", "aTargets": [8] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [0,2,3,5,6,7,9,8,10,11,12]}
],
"oLanguage": (datatable_lang != "") ?
@@ -2752,11 +2734,7 @@ function setupCreateTemplateDialog(){
},
"bAutoWidth":false,
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0,4] },
{ "sWidth": "35px", "aTargets": [1] },
{ "sWidth": "100px", "aTargets": [9,3,10,11,12] },
{ "sWidth": "150", "aTargets": [5,6,7,8] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [0,3,5,7,10,11,12]}
],
"oLanguage": (datatable_lang != "") ?
@@ -2856,9 +2834,7 @@ function setupCreateTemplateDialog(){
},
"bAutoWidth":false,
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0] },
{ "sWidth": "35px", "aTargets": [1,3,4,5] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [0]}
],
"oLanguage": (datatable_lang != "") ?
@@ -4070,7 +4046,7 @@ function setTemplateAutorefresh() {
},INTERVAL+someTime());
};
// Instantiate dialog
// Instantiate dialog
// Sets up the instiantiate template dialog and all the processing associated to it
function setupInstantiateTemplateDialog(){
@@ -4130,8 +4106,7 @@ $(document).ready(function(){
"sDom" : "<'H'>t<'row'<'six columns'i><'six columns'p>>",
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0] },
{ "sWidth": "35px", "aTargets": [1] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "sWidth": "150px", "aTargets": [5] },
{ "sWidth": "100px", "aTargets": [2,3] }
]
+40 -43
View File
@@ -1387,7 +1387,7 @@ function printActionsTable(vm_info)
<th>'+tr("MESSAGE")+'</th>\
<th colspan="">'+tr("Actions")+'</th>\
</tr>\
</thead>' +
</thead>' +
fromJSONtoActionsTable(
vm_info.USER_TEMPLATE.SCHED_ACTION) +
'</table>\
@@ -1435,12 +1435,12 @@ function printActionsTable(vm_info)
});
return false;
});
});
$("#submit_scheduling_action").live("click", function() {
$("#submit_scheduling_action").live("click", function() {
var date_input_value = $("#date_time_input").val();
if (date_input_value=="")
if (date_input_value=="")
return false;
// Calculate MAX_ID
@@ -1476,7 +1476,7 @@ function printActionsTable(vm_info)
// Let OpenNebula know
var template_str = convert_template_to_string(vm_info.USER_TEMPLATE);
Sunstone.runAction("VM.update_template",vm_info.ID,template_str);
Sunstone.runAction("VM.update_template",vm_info.ID,template_str);
$("#add_scheduling_action").removeAttr("disabled");
return false;
@@ -1527,7 +1527,7 @@ function printActionsTable(vm_info)
// Time
var time_value_str = $(".tr_action_"+index+" .time_row").text();
$(".tr_action_"+index+" .time_row").html('<div><input style="width:90%;" class="input_edit_time" id="input_edit_time_'+
$(".tr_action_"+index+" .time_row").html('<div><input style="width:90%;" class="input_edit_time" id="input_edit_time_'+
index+'" type="text" value="'+time_value_str+'">\
<a class="date_time_picker_link">t</a></div>');
@@ -1599,7 +1599,7 @@ function fromJSONtoActionsTable(actions_array){
var str = ""
if (!actions_array){ return "";}
if (!$.isArray(actions_array))
{
{
var tmp_array = new Array();
tmp_array[0] = actions_array;
actions_array = tmp_array;
@@ -1742,38 +1742,38 @@ function printDisks(vm_info){
var save_as;
// Snapshot deferred
if (
if (
( // ACTIVE
vm_info.STATE == "3") &&
vm_info.STATE == "3") &&
( // HOTPLUG_SAVEAS HOTPLUG_SAVEAS_POWEROFF HOTPLUG_SAVEAS_SUSPENDED
vm_info.LCM_STATE == "26" || vm_info.LCM_STATE == "27" || vm_info.LCM_STATE == "28") &&
( //
vm_info.LCM_STATE == "26" || vm_info.LCM_STATE == "27" || vm_info.LCM_STATE == "28") &&
( //
disk.SAVE_AS_ACTIVE == "YES")
) {
save_as = "in progress";
actions = 'deferred snapshot in progress'
}
}
// Snapshot Hot
else if (
else if (
( // ACTIVE
vm_info.STATE == "3") &&
vm_info.STATE == "3") &&
( // HOTPLUG_SAVEAS HOTPLUG_SAVEAS_POWEROFF HOTPLUG_SAVEAS_SUSPENDED
vm_info.LCM_STATE == "26" || vm_info.LCM_STATE == "27" || vm_info.LCM_STATE == "28") &&
( //
vm_info.LCM_STATE == "26" || vm_info.LCM_STATE == "27" || vm_info.LCM_STATE == "28") &&
( //
disk.HOTPLUG_SAVE_AS_ACTIVE == "YES")
) {
save_as = (disk.SAVE_AS ? disk.SAVE_AS : '-');
actions = 'hot snapshot in progress'
actions = 'hot snapshot in progress'
}
// Attach / Detach
else if (
else if (
( // ACTIVE
vm_info.STATE == "3") &&
vm_info.STATE == "3") &&
( // HOTPLUG_SAVEAS HOTPLUG_SAVEAS_POWEROFF HOTPLUG_SAVEAS_SUSPENDED
vm_info.LCM_STATE == "17") &&
( //
vm_info.LCM_STATE == "17") &&
( //
disk.ATTACH = "YES")
) {
) {
save_as = (disk.SAVE_AS ? disk.SAVE_AS : '-');
actions = 'attach/detach in progress'
}
@@ -1781,7 +1781,7 @@ function printDisks(vm_info){
save_as = (disk.SAVE_AS ? disk.SAVE_AS : '-');
actions = '';
if ((vm_info.STATE == "3" && vm_info.LCM_STATE == "3") || vm_info.STATE == "5" || vm_info.STATE == "8") {
actions += '<a href="VM.saveas" class="saveas" ><i class="icon-save"/>'+tr("Snapshot")+'</a> &emsp;'
}
@@ -2008,7 +2008,7 @@ function hotpluggingOps(){
//b.html(spinner);
return false;
});
});
$('#refresh_disk').live('click', function(){
var b = $(this);
@@ -2016,7 +2016,7 @@ function hotpluggingOps(){
Sunstone.runAction("VM.showdisks", vm_id);
return false;
});
});
}
@@ -2084,12 +2084,12 @@ function printNics(vm_info){
var save_as;
// Attach / Detach
if (
if (
( // ACTIVE
vm_info.STATE == "3") &&
vm_info.STATE == "3") &&
( // HOTPLUG_NIC
vm_info.LCM_STATE == "25") &&
( //
vm_info.LCM_STATE == "25") &&
( //
nic.ATTACH == "YES")
) {
actions = 'attach/detach in progress'
@@ -2258,7 +2258,7 @@ function setup_vm_network_tab(){
//b.html(spinner);
return false;
});
});
$('#refresh_nic').live('click', function(){
var b = $(this);
@@ -2266,7 +2266,7 @@ function setup_vm_network_tab(){
Sunstone.runAction("VM.shownics", vm_id);
return false;
});
});
}
@@ -2446,7 +2446,7 @@ function setup_vm_capacity_tab(){
//b.html(spinner);
return false;
});
});
$('#refresh_capacity').live('click', function(){
var b = $(this);
@@ -2454,7 +2454,7 @@ function setup_vm_capacity_tab(){
Sunstone.runAction("VM.showcapacity", vm_id);
return false;
});
});
}
@@ -2518,16 +2518,16 @@ function printSnapshots(vm_info){
for (var i = 0; i < snapshots.length; i++){
var snapshot = snapshots[i];
if (
if (
( // ACTIVE
vm_info.STATE == "3") &&
vm_info.STATE == "3") &&
( // HOTPLUG_SNAPSHOT
vm_info.LCM_STATE == "24")) {
actions = 'snapshot in progress'
actions = 'snapshot in progress'
}
else {
actions = '';
if ((vm_info.STATE == "3" && vm_info.LCM_STATE == "3")) {
actions += '<a href="VM.snapshot_revert" class="snapshot_revert" ><i class="icon-reply"/>'+tr("Revert")+'</a> &emsp;'
actions += '<a href="VM.snapshot_delete" class="snapshot_delete" ><i class="icon-remove"/>'+tr("Delete")+'</a>'
@@ -2655,7 +2655,7 @@ function setup_vm_snapshot_tab(){
//b.html(spinner);
return false;
});
});
$('#refresh_snapshot').live('click', function(){
var b = $(this);
@@ -2663,7 +2663,7 @@ function setup_vm_snapshot_tab(){
Sunstone.runAction("VM.showsnapshots", vm_id);
return false;
});
});
}
@@ -2884,10 +2884,7 @@ $(document).ready(function(){
},
"aoColumnDefs": [
{ "bSortable": false, "aTargets": ["check"] },
{ "sWidth": "60px", "aTargets": [0,6,7] },
{ "sWidth": "35px", "aTargets": [1,11] },
{ "sWidth": "150px", "aTargets": [5,10] },
{ "sWidth": "100px", "aTargets": [2,3,9] },
{ "sWidth": "35px", "aTargets": [0,1] },
{ "bVisible": false, "aTargets": [6,7,10]}
],
"oLanguage": (datatable_lang != "") ?