1
0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00

Several small fixes for UIs:

* Fixed bug affecting only IE that prevented images/vnets from being selected in IE in Self-Service
  * Fixed IE login to sunstone
  * Fixed menu with in Sunstone so that french (and other long translations) translation doesn't push the + icon to a second line
  * Fixed uglyness in datastore create dialog when labels go multiline
  * Fixed opening extended info when changing image type in Images list
(cherry picked from commit 7d6366a6620df82fa3f7f178208deee53783b08a)
This commit is contained in:
Hector Sanjuan 2012-09-27 17:38:01 +02:00 committed by Ruben S. Montero
parent 4b05524487
commit e32c784042
6 changed files with 24 additions and 19 deletions

View File

@ -894,20 +894,18 @@ function popUpCreateVMDialog(){
$('#network_box,#disk_box',dialog).change(function(){
$(this).val("");
return false;
});
$('#network_box option,#disk_box option',dialog).click(function(){
var clicked = $(this).attr('clicked');
var option = $('option:selected', this);
var clicked = option.attr('clicked');
if (clicked){//unbold, unmark
$(this).text($(this).text().replace(/☒/g,'☐'));
$(this).removeAttr('clicked');
option.text(option.text().replace(/☒/g,'☐'));
option.removeAttr('clicked');
}
else {//bold,mark
$(this).text($(this).text().replace(/☐/g,'☒'));
$(this).attr('clicked','clicked');
option.text(option.text().replace(/☐/g,'☒'));
option.attr('clicked','clicked');
}
$(this).val("");
return false;
});

View File

@ -128,7 +128,7 @@ $(document).ready(function () {
applyDefaultStyles: false
, center__paneSelector: ".outer-center"
, west__paneSelector: ".outer-west"
, west__size: 200
, west__size: 210
, north__size: 26
, south__size: 26
, spacing_open: 0 // ALL panes

View File

@ -73,8 +73,8 @@ var create_datastore_tmpl =
<option value="ssh">' + tr("SSH") + '</option>\
<option value="iscsi">' + tr("iSCSI") + '</option>\
<option value="dummy">' + tr("Dummy") + '</option>\
</select><br />\
<label>' + tr("Disk type") + ':</label>\
</select><div class="clear">\
<label for="disk_type">' + tr("Disk type") + ':</label>\
<select id="disk_type" name="disk_type">\
<option value="file">' + tr("File") + '</option>\
<option value="block">' + tr("Block") + '</option>\

View File

@ -813,7 +813,7 @@ function setupCreateImageDialog(){
});
//we pop up an upload progress dialog
var pos_top = $(window).height() - 120;
var pos_left = 190;
var pos_left = 220;
var pb_dialog = $('<div id="pb_dialog" title="'+
tr("Uploading...")+'">'+
'<div id="upload-progress"></div>'+

View File

@ -85,7 +85,7 @@ function humanize_size(value,from_bytes) {
if (typeof(value) === "undefined") {
value = 0;
}
var binarySufix = from_bytes ?
var binarySufix = from_bytes ?
["", "K", "M", "G", "T" ] : ["K", "M", "G", "T" ];
var i=0;
while (value > 1024 && i < 3){
@ -567,8 +567,8 @@ function getSelectedNodes(dataTable){
return selected_nodes;
}
//returns a HTML string with options for
//a select input code generated from a dataTable.
//returns a HTML string with options for
//a select input code generated from a dataTable.
//Allows filtering elements specifing status columns
//and bad status (if the values of the columns match the bad status)
//then this elem is skipped.
@ -590,7 +590,7 @@ function makeSelectOptions(dataTable,
//ASSUMPTION: elem id in column 1
var id = elem[1];
var name = elem[option_name_col];
var status, bad_status;
var ok=true;
@ -826,7 +826,9 @@ function popUpTemplateUpdateDialog(elem_str,select_items,sel_elems){
//Shows run a custom action when clicking on rows.
function infoListener(dataTable, info_action){
$('tbody tr',dataTable).live("click",function(e){
if ($(e.target).is('input')) {return true;}
if ($(e.target).is('input') ||
$(e.target).is('select') ||
$(e.target).is('option')) return true;
var aData = dataTable.fnGetData(this);
var id = $(aData[0]).val();

View File

@ -10,6 +10,11 @@
<script type="text/javascript" src="vendor/jQuery/jquery-1.7.2.min.js"></script>
<!-- End Vendor Libraries -->
<!--[if IE]>
<script type="text/javascript" src="vendor/crypto-js/core-min.js"></script>
<script type="text/javascript" src="vendor/crypto-js/enc-base64-min.js"></script>
<![endif]-->
<script type="text/javascript" src="js/opennebula.js"></script>
<script type="text/javascript" src="js/login.js"></script>