etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 8575: account/alert/event/instance/IpAddress/ISO/SecurityGroup/Snapshot/Template/Volume page - when mouse is over middle menu item, show tooltip related to this middle menu item.

This commit is contained in:
Jessica Wang 2011-02-17 17:41:54 -08:00
parent fdd4146b22
commit 541f216e40
11 changed files with 72 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/scripts/cloud.core.account.js
View File

@ -336,8 +336,13 @@ function accountToMidmenu(jsonObj, $midmenuItem1) {
else if (jsonObj.accounttype == roleTypeDomainAdmin)
$iconContainer.find("#icon").attr("src", "images/midmenuicon_account_domain.png");
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.domain).substring(0,25));
var firstRowText = fromdb(jsonObj.name);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
var secondRowText = fromdb(jsonObj.domain);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function accountToRightPanel($midmenuItem1) {

9
ui/scripts/cloud.core.alert.js
View File

@ -44,9 +44,14 @@ function alertToMidmenu(jsonObj, $midmenuItem1) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_alerts.png");
var firstRowText = fromdb(jsonObj.description);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
setDateField(jsonObj.sent, $midmenuItem1.find("#second_row"));
$midmenuItem1.find("#first_row").text(toAlertType(jsonObj.type));
var secondRowText = toAlertType(jsonObj.type);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function alertToRightPanel($midmenuItem1) {

9
ui/scripts/cloud.core.event.js
View File

@ -74,9 +74,14 @@ function eventToMidmenu(jsonObj, $midmenuItem1) {
$iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png");
else if(jsonObj.level == "WARN")
$iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png");
var firstRowText = fromdb(jsonObj.description);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
$midmenuItem1.find("#first_row").text(getMidmenuItemFirstRow(jsonObj.description));
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.type).substring(0,25));
var secondRowText = fromdb(jsonObj.type);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function eventToRightPanel($midmenuItem1) {

12
ui/scripts/cloud.core.instance.js
View File

@ -1640,13 +1640,13 @@ function vmToMidmenu(jsonObj, $midmenuItem1) {
$midmenuItem1.data("jsonObj", jsonObj);
$midmenuItem1.attr("id", getMidmenuId(jsonObj));
var vmName = getVmName(jsonObj.name, jsonObj.displayname);
$midmenuItem1.find("#first_row").text(vmName);
$midmenuItem1.find("#first_row_container").attr("title", vmName);
var firstRowText = getVmName(jsonObj.name, jsonObj.displayname);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
var templateName = fromdb(jsonObj.templatename);
$midmenuItem1.find("#second_row").text(templateName);
$midmenuItem1.find("#second_row_container").attr("title", templateName);
var secondRowText = fromdb(jsonObj.templatename);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
updateVmStateInMidMenu(jsonObj, $midmenuItem1);

15
ui/scripts/cloud.core.ipaddress.js
View File

@ -407,12 +407,15 @@ function ipToMidmenu(jsonObj, $midmenuItem1) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_network_networkgroup.png");
var firstRow = jsonObj.ipaddress.substring(0,25);
if (jsonObj.issourcenat == true) {
firstRow+="[source nat]";
}
$midmenuItem1.find("#first_row").text(firstRow);
$midmenuItem1.find("#second_row").text("owned by: "+fromdb(jsonObj.account).substring(0,25));
var firstRowText = fromdb(jsonObj.ipaddress);
if (jsonObj.issourcenat == true)
firstRowText += "[source nat]";
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
var secondRowText = "owned by: "+fromdb(jsonObj.account);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function isIpManageable(domainid, account) {

9
ui/scripts/cloud.core.iso.js
View File

@ -285,8 +285,13 @@ function isoToMidmenu(jsonObj, $midmenuItem1) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_iso.png");
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.zonename).substring(0,25));
var firstRowText = fromdb(jsonObj.name);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
var secondRowText = fromdb(jsonObj.zonename);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function isoToRightPanel($midmenuItem1) {

11
ui/scripts/cloud.core.js
View File

@ -1277,17 +1277,6 @@ function drawBarChart($capacity, percentused) { //percentused == "0.01%" (having
$capacity.find("#bar_chart").removeClass().addClass("db_barbox high").css("width", percentused);
}
var midmenuItemFirstRowMaxLength = 30;
function getMidmenuItemFirstRow(text) {
var text2 = fromdb(text);
var text3;
if(text2.length > midmenuItemFirstRowMaxLength)
text3 = fromdb(text2).substring(0, (midmenuItemFirstRowMaxLength-4)) + "....";
else
text3 = fromdb(text2).substring(0, midmenuItemFirstRowMaxLength);
return text3;
}
var $readonlyFields, $editFields;
function cancelEditMode($tab) {
if($editFields != null)

11
ui/scripts/cloud.core.securitygroup.js
View File

@ -363,9 +363,14 @@ function securityGroupToMidmenu(jsonObj, $midmenuItem1) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_securityGroup.png");
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.account).substring(0,25));
var firstRowText = fromdb(jsonObj.name);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
var secondRowText = fromdb(jsonObj.account);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function securityGroupToRightPanel($midmenuItem1) {

9
ui/scripts/cloud.core.snapshot.js
View File

@ -84,9 +84,14 @@ function snapshotToMidmenu(jsonObj, $midmenuItem1) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png");
var firstRowText = fromdb(jsonObj.name);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.volumename).substring(0,25));
var secondRowText = fromdb(jsonObj.volumename);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function snapshotToRightPanel($midmenuItem1) {

9
ui/scripts/cloud.core.template.js
View File

@ -292,9 +292,14 @@ function templateToMidmenu(jsonObj, $midmenuItem1) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
setIconByOsType(jsonObj.ostypename, $iconContainer.find("#icon"));
var firstRowText = fromdb(jsonObj.name);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(fromdb(jsonObj.zonename).substring(0,25));
var secondRowText = fromdb(jsonObj.zonename);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function templateToRightPanel($midmenuItem1) {

9
ui/scripts/cloud.core.volume.js
View File

@ -325,9 +325,14 @@ function volumeToMidmenu(jsonObj, $midmenuItem1) {
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png");
var firstRowText = fromdb(jsonObj.name);
$midmenuItem1.find("#first_row").text(firstRowText);
$midmenuItem1.find("#first_row_container").attr("title", firstRowText);
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));
var secondRowText = fromdb(jsonObj.type);
$midmenuItem1.find("#second_row").text(secondRowText);
$midmenuItem1.find("#second_row_container").attr("title", secondRowText);
}
function volumeToRightPanel($midmenuItem1) {