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

Network page, Pod page - apply new function, bindActionLink(), which solves mouseover issue.

This commit is contained in:
Jessica Wang 2011-02-01 17:37:30 -08:00
parent 735388ed79
commit 3b4965da8a
4 changed files with 55 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/jsp/network.jsp
View File

@ -465,8 +465,8 @@ dictionary = {
<div class="grid_header">
<div class="grid_header_title" id="grid_header_title">
</div>
<div class="grid_actionbox" id="firewall_action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="firewall_action_menu" style="display: none;">
<div class="grid_actionbox" id="action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
</ul>
</div>
@ -606,8 +606,8 @@ dictionary = {
<div class="grid_header">
<div class="grid_header_title" id="grid_header_title">
</div>
<div class="grid_actionbox" id="loadbalancer_action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="loadbalancer_action_menu" style="display: none;">
<div class="grid_actionbox" id="action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
</ul>
</div>
@ -696,8 +696,8 @@ dictionary = {
<div class="grid_header">
<div class="grid_header_title" id="grid_header_title">
</div>
<div class="grid_actionbox" id="iprange_action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="iprange_action_menu" style="display: none;">
<div class="grid_actionbox" id="action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
</ul>
</div>
@ -796,8 +796,8 @@ dictionary = {
<div class="grid_header">
<div class="grid_header_title" id="grid_header_title">
</div>
<div class="grid_actionbox" id="iprange_action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="iprange_action_menu" style="display: none;">
<div class="grid_actionbox" id="action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
</ul>
</div>

4
ui/jsp/pod.jsp
View File

@ -194,8 +194,8 @@ dictionary = {
<div class="grid_header">
<div class="grid_header_title" id="grid_header_title">
</div>
<div class="grid_actionbox" id="network_action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="network_action_menu" style="display: none;">
<div class="grid_actionbox" id="action_link"><p><fmt:message key="label.actions"/></p>
<div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
</ul>
</div>

57
ui/scripts/cloud.core.network.js
View File

@ -170,6 +170,8 @@ function publicNetworkJsonToDetailsTab() {
//actions ***
var $actionLink = $thisTab.find("#action_link");
bindActionLink($actionLink);
/*
$actionLink.bind("mouseover", function(event) {
$(this).find("#action_menu").show();
return false;
@ -177,7 +179,9 @@ function publicNetworkJsonToDetailsTab() {
$actionLink.bind("mouseout", function(event) {
$(this).find("#action_menu").hide();
return false;
});
});
*/
var $actionMenu = $thisTab.find("#action_link #action_menu");
$actionMenu.find("#action_list").empty();
$actionMenu.find("#action_list").append($("#no_available_actions").clone().show());
@ -234,17 +238,20 @@ function publicNetworkIprangeJsonToTemplate(jsonObj, $template) {
$template.find("#domain").text(jsonObj.domain);
$template.find("#account").text(jsonObj.account);
var $actionLink = $template.find("#iprange_action_link");
var $actionLink = $template.find("#action_link");
bindActionLink($actionLink);
/*
$actionLink.bind("mouseover", function(event) {
$(this).find("#iprange_action_menu").show();
$(this).find("#action_menu").show();
return false;
});
$actionLink.bind("mouseout", function(event) {
$(this).find("#iprange_action_menu").hide();
$(this).find("#action_menu").hide();
return false;
});
*/
var $actionMenu = $actionLink.find("#iprange_action_menu");
var $actionMenu = $actionLink.find("#action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("label.action.delete.IP.range", publicNetworkIpRangeActionMap, $actionMenu, $template);
@ -337,17 +344,20 @@ function publicNetworkFirewallJsonToTemplate(jsonObj, $template) {
$template.find("#numretries").text(fromdb(jsonObj.numretries));
$template.find("#timeout").text(fromdb(jsonObj.timeout));
var $actionLink = $template.find("#firewall_action_link");
var $actionLink = $template.find("#action_link");
bindActionLink($actionLink);
/*
$actionLink.bind("mouseover", function(event) {
$(this).find("#firewall_action_menu").show();
$(this).find("#action_menu").show();
return false;
});
$actionLink.bind("mouseout", function(event) {
$(this).find("#firewall_action_menu").hide();
$(this).find("#action_menu").hide();
return false;
});
*/
var $actionMenu = $actionLink.find("#firewall_action_menu");
var $actionMenu = $actionLink.find("#action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("label.action.delete.firewall", publicNetworkFirewallActionMap, $actionMenu, $template);
@ -413,19 +423,21 @@ function publicNetworkLoadBalancerJsonToTemplate(jsonObj, $template) {
$template.find("#privateinterface").text(fromdb(jsonObj.privateinterface));
$template.find("#numretries").text(fromdb(jsonObj.numretries));
var $actionLink = $template.find("#loadbalancer_action_link");
var $actionLink = $template.find("#action_link");
bindActionLink($actionLink);
/*
$actionLink.bind("mouseover", function(event) {
$(this).find("#loadbalancer_action_menu").show();
$(this).find("#action_menu").show();
return false;
});
$actionLink.bind("mouseout", function(event) {
$(this).find("#loadbalancer_action_menu").hide();
$(this).find("#action_menu").hide();
return false;
});
*/
var $actionMenu = $actionLink.find("#loadbalancer_action_menu");
$actionMenu.find("#action_list").empty();
var $actionMenu = $actionLink.find("#action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("label.action.delete.load.balancer", publicNetworkLoadBalancerActionMap, $actionMenu, $template);
}
@ -1012,6 +1024,8 @@ function directNetworkJsonToDetailsTab() {
//actions ***
var $actionLink = $thisTab.find("#action_link");
bindActionLink($actionLink);
/*
$actionLink.bind("mouseover", function(event) {
$(this).find("#action_menu").show();
return false;
@ -1020,6 +1034,8 @@ function directNetworkJsonToDetailsTab() {
$(this).find("#action_menu").hide();
return false;
});
*/
var $actionMenu = $actionLink.find("#action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForTab("label.action.delete.network", directNetworkActionMap, $actionMenu, $midmenuItem1, $thisTab);
@ -1096,17 +1112,20 @@ function directNetworkIprangeJsonToTemplate(jsonObj, $template) {
$template.find("#vlan").text(jsonObj.vlan);
$template.find("#iprange").text(ipRange);
var $actionLink = $template.find("#iprange_action_link");
var $actionLink = $template.find("#action_link");
bindActionLink($actionLink);
/*
$actionLink.bind("mouseover", function(event) {
$(this).find("#iprange_action_menu").show();
$(this).find("#action_menu").show();
return false;
});
$actionLink.bind("mouseout", function(event) {
$(this).find("#iprange_action_menu").hide();
$(this).find("#action_menu").hide();
return false;
});
*/
var $actionMenu = $actionLink.find("#iprange_action_menu");
var $actionMenu = $actionLink.find("#action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("label.action.delete.IP.range", directNetworkIpRangeActionMap, $actionMenu, $template);

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

@ -197,7 +197,6 @@ function podClearNetworkTab() {
$thisTab.find("#tab_container").empty();
}
function podNetworkJsonToTemplate(jsonObj, template) {
template.data("jsonObj", jsonObj);
template.attr("id", "pod_VLAN_"+fromdb(jsonObj.id)).data("podVLANId", fromdb(jsonObj.id));
@ -208,17 +207,20 @@ function podNetworkJsonToTemplate(jsonObj, template) {
template.find("#gateway").text(fromdb(jsonObj.gateway));
template.find("#podname").text(fromdb(jsonObj.podname));
var $actionLink = template.find("#network_action_link");
var $actionLink = template.find("#action_link");
bindActionLink($actionLink);
/*
$actionLink.bind("mouseover", function(event) {
$(this).find("#network_action_menu").show();
$(this).find("#action_menu").show();
return false;
});
$actionLink.bind("mouseout", function(event) {
$(this).find("#network_action_menu").hide();
$(this).find("#action_menu").hide();
return false;
});
*/
var $actionMenu = $actionLink.find("#network_action_menu");
var $actionMenu = $actionLink.find("#action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("Delete IP Range", podNetworkActionMap, $actionMenu, template);