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

Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss

This commit is contained in:
Jessica Wang 2010-10-27 19:44:32 -07:00
parent be26dcc252 1736f081e4
commit 63b7b82819
5 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/new/css/main.css
View File

@ -2167,7 +2167,7 @@ a:hover.search_button {
.midmenu_content{
width:220px;
height:auto;
height:35px;
float:left;
color:#333;
text-align:left;
@ -2224,24 +2224,26 @@ a:hover.search_button {
.midmenu_textbox p {
width:165px;
height:auto;
height:13px;
float:left;
text-align:left;
font-weight:normal;
font-size:11px;
margin:3px 0 0 0;
padding:0;
overflow:hidden;
}
.midmenu_textbox span {
width:165px;
height:auto;
height:13px;
float:left;
text-align:left;
font-weight:normal;
font-size:10px;
margin:3px 0 0 0;
padding:0;
overflow:hidden;
}
.midmenu_emptymsgbox {

4
ui/new/index.jsp
View File

@ -737,10 +737,10 @@ long milliseconds = new Date().getTime();
<div class="midmenu_icons" id="icon_container" style="display: none">
<img id="icon" /></div>
<div class="midmenu_textbox">
<p>
<p title="temp">
<strong id="first_row">&nbsp;</strong>
</p>
<span id="second_row_container">
<span title="tmp1" id="second_row_container">
<span id="second_row">&nbsp;</span>
</span>
</div>

36
ui/new/jsp/resource.jsp
View File

@ -637,16 +637,35 @@
<%=t.t("details")%></div>
</div>
<!-- Details tab (start)-->
<div id="tab_content_details" class="grid_container">
<div class="rightpanel_mainloader_panel" style="display:none;">
<div class="rightpanel_mainloaderbox">
<div class="rightpanel_mainloader_animatedicon"></div>
<p>Loading &hellip;</p>
</div>
<div id="tab_content_details" >
<div class="rightpanel_mainloader_panel" style="display:none;">
<div class="rightpanel_mainloaderbox">
<div class="rightpanel_mainloader_animatedicon"></div>
<p>Loading &hellip;</p>
</div>
</div>
<div class="grid_container">
<div class="grid_header">
<div id="grid_header_title" class="grid_header_title">(title)</div>
<div id="action_link" class="grid_actionbox" id="action_link">
<div class="grid_actionsdropdown_box" id="action_menu" style="display: none;">
<ul class="actionsdropdown_boxlist" id="action_list">
<li><%=t.t("no.available.actions")%></li>
</ul>
</div>
</div>
<div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
display: none;">
<div class="gridheader_loader" id="icon">
</div>
<p id="description">
Detaching Disk &hellip;</p>
</div>
</div>
<div class="grid_rows odd">
<div class="vm_statusbox">
<div id="view_console_container">
<div id="view_console_container" style="float:left;">
<div id="view_console_template" style="display: block">
<div class="vm_consolebox" id="box0">
</div>
@ -763,7 +782,8 @@
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Details tab (end)-->
</div>
</div>

71
ui/new/scripts/cloud.core2.init.js
View File

@ -30,11 +30,13 @@ $(document).ready(function() {
// Setup first level navigation
$("#leftmenu_dashboard").bind("click", function(event) {
selectLeftMenu($(this));
hideMiddleMenu();
$("#right_panel").load("jsp/dashboard.jsp", function(){
afterLoadDashboardJSP();
});
if (selectLeftMenu($(this))) {
clearMiddleMenu();
hideMiddleMenu();
$("#right_panel").load("jsp/dashboard.jsp", function(){
afterLoadDashboardJSP();
});
}
return false;
});
$("#leftmenu_storage").bind("click", function(event) {
@ -50,8 +52,9 @@ $(document).ready(function() {
return false;
});
$("#leftmenu_account").bind("click", function(event) {
selectLeftMenu($(this));
listMidMenuItems("listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false);
if (selectLeftMenu($(this))) {
listMidMenuItems("listAccounts", "listaccountsresponse", "account", "jsp/account.jsp", afterLoadAccountJSP, accountToMidmenu, accountToRightPanel, getMidmenuId, false);
}
return false;
});
$("#leftmenu_events").bind("click", function(event) {
@ -59,9 +62,28 @@ $(document).ready(function() {
return false;
});
$("#leftmenu_system").bind("click", function(event) {
selectLeftMenu($(this), true);
if($("#leftmenu_resource").find("#resource_arrow").hasClass("expanded_open") == true)
$("#leftmenu_resource").click(); //if resource menu is open (i.e. zonetree is shown), empty zonetree and close resource menu.
if (selectLeftMenu($(this), true)) {
if($("#leftmenu_resource").find("#resource_arrow").hasClass("expanded_open") == true)
$("#leftmenu_resource").click(); //if resource menu is open (i.e. zonetree is shown), empty zonetree and close resource menu.
}
return false;
});
$("#leftmenu_instances").bind("click", function(event) {
instanceBuildSubMenu();
selectLeftMenu($(this), true);
return false;
});
$("#leftmenu_domain").bind("click", function(event) {
if (selectLeftMenu($(this), true)) {
hideMiddleMenu();
disableMultipleSelectionInMidMenu();
clearMiddleMenu();
bindEventHandlerToDomainTreeNode();
refreshWholeTree(g_domainid, defaultRootLevel);
}
return false;
});
@ -94,24 +116,6 @@ $(document).ready(function() {
bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRightPanel, getMidmenuId, false);
bindAndListMidMenuItems($("#leftmenu_global_setting"), "listConfigurations", "listconfigurationsresponse", "configuration", "jsp/globalsetting.jsp", afterLoadGlobalSettingJSP, globalSettingToMidmenu, globalSettingToRightPanel, globalSettingGetMidmenuId, false);
$("#leftmenu_instances").bind("click", function(event) {
instanceBuildSubMenu();
selectLeftMenu($(this), true);
return false;
});
$("#leftmenu_domain").bind("click", function(event) {
selectLeftMenu($(this), true);
hideMiddleMenu();
disableMultipleSelectionInMidMenu();
clearMiddleMenu();
bindEventHandlerToDomainTreeNode();
refreshWholeTree(g_domainid, defaultRootLevel);
return false;
});
$("#leftmenu_resource").bind("click", function(event) {
showMiddleMenu();
disableMultipleSelectionInMidMenu();
@ -140,10 +144,6 @@ $(document).ready(function() {
return false;
});
// Prevent the UI from being iframed if the iframe isn't from the same domain.
try {
if ( top != self && self.location.hostname != top.location.hostname) {
@ -383,7 +383,12 @@ $(document).ready(function() {
$("#dialog_error").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
$("#dialog_error").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
initDialogWithOK("dialog_session_expired");
$("#dialog_session_expired").dialog({
autoOpen: false,
modal: true,
zIndex: 2000,
buttons: { "OK": function() { logout(true); $(this).dialog("close"); } }
});
$("#dialog_session_expired").siblings(".ui-widget-header").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");
$("#dialog_session_expired").siblings(".ui-dialog-buttonpane").find(".ui-state-default").css("background", "url('/client/css/images/ui-bg_errorglass_30_ffffff_1x400.png') repeat-x scroll 50% 50% #393939");

2
ui/new/scripts/cloud.core2.js
View File

@ -607,7 +607,9 @@ function selectLeftMenu($menuToSelect, expandable) {
// Close the help link if it's opened
$("#help_dropdown_dialog").hide();
$("#help_button").removeClass("selected");
return true;
}
return false;
}
var $selectedSubMenu;