apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 20:29:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jessica Wang 2010-10-25 19:35:58 -07:00
commit b4ef2b4386
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2258,7 +2258,7 @@ a:hover.search_button {
height:auto; height:auto;
margin:0 0 0 221px; margin:0 0 0 221px;
padding:0; padding:0;
position:relative;
} }
.main_contentarea_without_midmenu { .main_contentarea_without_midmenu {
@ -2267,7 +2267,7 @@ a:hover.search_button {
height:auto; height:auto;
margin:0 0 0 0; margin:0 0 0 0;
padding:0; padding:0;
position:relative;
} }
.main_title { .main_title {
@ -2821,6 +2821,7 @@ a:hover.search_button {
position:relative; position:relative;
margin:4px 0 0 0; margin:4px 0 0 0;
padding:0 0 0 0; padding:0 0 0 0;
z-index:1009;
} }
.grid_botactionpanel { .grid_botactionpanel {

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

@ -25,7 +25,7 @@ function instanceBuildSubMenu() {
instanceBuildSubMenu2("All Instances", "listVirtualMachines"); instanceBuildSubMenu2("All Instances", "listVirtualMachines");
instanceBuildSubMenu2("Running Instances", "listVirtualMachines&state=Running"); instanceBuildSubMenu2("Running Instances", "listVirtualMachines&state=Running");
instanceBuildSubMenu2("Stopped Instances", "listVirtualMachines&state=Stopped"); instanceBuildSubMenu2("Stopped Instances", "listVirtualMachines&state=Stopped");
instanceBuildSubMenu2("Destoryed Instances", "listVirtualMachines&state=Destroyed"); instanceBuildSubMenu2("Destroyed Instances", "listVirtualMachines&state=Destroyed");
} }
else if(isUser()) { else if(isUser()) {
instanceBuildSubMenu2("All Instances", "listVirtualMachines"); instanceBuildSubMenu2("All Instances", "listVirtualMachines");