apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge issue

Browse Source
This commit is contained in:
NIKITA 2010-08-24 18:07:36 -07:00 committed by unknown
parent fc295b0fdd
commit c356c2070e
2 changed files with 754 additions and 886 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
ui/new/jsp/tab_instances.html
View File

@ -1,128 +0,0 @@
<div class="main_title">
<div class="main_titleicon">
<img src="images/instancetitle_icons.gif" alt="Instance" /></div>
<h1>
Name of the Instance Selected..
</h1>
</div>
<div class="contentbox">
<div class="tabbox">
<div class="content_tabs on">
Details</div>
<div class="content_tabs off">
Volume</div>
<div class="content_tabs off">
Statistics</div>
</div>
<div class="grid_container">
<div class="grid_rows odd">
<div class="vm_statusbox">
<div class="vm_consolebox">
</div>
<div class="vm_status_textbox">
<div class="vm_status_textline running">
Running</div>
<br />
<p>
10.1.1.200</p>
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Zone:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
JW</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Template:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
Centos 5.3(x36.4) no GUI</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Service:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
Small Instance</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
HA:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
<div class="tick_icon">
</div>
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Created:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
07/20/2010 11:29:04
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Account:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
Admin</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Domain:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
ROOT</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Host:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
Xenserver-test5
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
ISO:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles">
<div class="cross_icon">
</div>
</div>
</div>
</div>
</div>
</div>

6
ui/new/scripts/cloud.core.js
View File

@ -16,11 +16,7 @@
* *
*/ */
<<<<<<< HEAD
// Version: @VERSION@
=======
// Version: 1.9.1.6
>>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
var g_mySession = null; var g_mySession = null;
var g_sessionKey = null; var g_sessionKey = null;
var g_role = null; // roles - root, domain-admin, ro-admin, user var g_role = null; // roles - root, domain-admin, ro-admin, user