- Please select a template for your new virtual instance. You can also choose to select
- a blank template from which an ISO image can be installed onto.
-
- Please select the CPU, Memory and Storage requirement you need for your new Virtual
- Instance
-
-
-
- Service Offering
-
-
-
-
-
-
- Back
-
- Go to Step 3
-
-
-
-
-
-
-
-
-
- Step 1
-
- Step 2
-
- Step 3
-
- Step 4
-
- Step 5
-
-
-
-
-
-
-
- Step 3: Additional Data Disk Offering
-
- Please select the CPU, Memory and Storage requirement you need for your new Virtual
- Instance
-
-
-
- Data Disk Offering
-
-
-
-
-
-
-
- Back
-
- Go to Step 4
-
-
-
-
-
-
-
-
-
- Step 1
-
- Step 2
-
- Step 3
-
- Step 4
-
- Step 5
-
-
-
-
-
-
-
- Step 4: Choose your Network
-
- Please select the CPU, Memory and Storage requirement you need for your new Virtual
- Instance
-
-
-
- Network Offering
-
-
-
-
-
-
-
-
-
- Some info about virtual network will appear here..Some info about virtual network
- will appear here..Some info about virtual network will appear here..Some info about
- virtual network will appear here..Some info about virtual network will appear here..Some
- info about virtual network will appear here..
-
-
-
-
-
-
-
-
-
-
-
-
-
- Some info about virtual network will appear here..Some info about virtual network
- will appear here..Some info about virtual network will appear here..Some info about
- virtual network will appear here..Some info about virtual network will appear here..Some
- info about virtual network will appear here.. Some info about virtual network will
- appear here..Some info about virtual network will appear here..
-
-
-
-
-
-
-
- Back
-
- Go to Step 5
-
-
-
-
-
-
-
-
-
- Step 1
-
- Step 2
-
- Step 3
-
- Step 4
-
- Step 5
-
-
-
-
-
-
-
- Step 5: Last Step
-
- Please select the CPU, Memory and Storage requirement you need for your new Virtual
- Instance
-
-
-
- Network Offering
-
-
-
-
-
-
- Zone:
- US West
-
-
-
-
-
-
-
- Template:
-
- CentOS 5.4 64-bit Web Server (Apache)
-
-
-
-
-
-
-
- Zone:
- US West
-
-
-
-
-
-
-
- Template:
-
- CentOS 5.4 64-bit Web Server (Apache)
-
-
-
-
-
-
- Back
-
- Submit
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- GB
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ui/new/index.html b/ui/new/index.html
index 244d8e85441..3b085f9c385 100755
--- a/ui/new/index.html
+++ b/ui/new/index.html
@@ -4,12 +4,8 @@
-
-<<<<<<< HEAD
-
-=======
-
->>>>>>> 10bc0b5... new UI - left menu, middle menu, instance
+
+
diff --git a/ui/new/jsp/tab_instance.jsp b/ui/new/jsp/tab_instance.jsp
index 10e63a491b8..599222ccad1 100755
--- a/ui/new/jsp/tab_instance.jsp
+++ b/ui/new/jsp/tab_instance.jsp
@@ -24,7 +24,7 @@
- <%=t.getString("computer")%> Details
+ Details <%=t.t("computer")%>
Volume
diff --git a/ui/new/scripts/cloud.core.init.js b/ui/new/scripts/cloud.core.init.js
index 79d4488c6f0..99814507f88 100755
--- a/ui/new/scripts/cloud.core.init.js
+++ b/ui/new/scripts/cloud.core.init.js
@@ -98,7 +98,9 @@ $(document).ready(function() {
return;
}
+ /*
initializeTestTool();
+ */
// We will be dropping all the main tab content into this container
mainContainer = $("#maincontentarea");
diff --git a/ui/new/scripts/cloud.core.js b/ui/new/scripts/cloud.core.js
index 2ff90c72b3e..a45db5820be 100755
--- a/ui/new/scripts/cloud.core.js
+++ b/ui/new/scripts/cloud.core.js
@@ -17,12 +17,15 @@
*/
-var g_mySession = null;
-var g_sessionKey = null;
-var g_role = null; // roles - root, domain-admin, ro-admin, user
-var g_username = null;
-var g_account = null;
-var g_domainid = null;
+
+// Version: @VERSION@
+
+var g_mySession = null;
+var g_sessionKey = null;
+var g_role = null; // roles - root, domain-admin, ro-admin, user
+var g_username = null;
+var g_account = null;
+var g_domainid = null;
var g_enableLogging = false;
var g_timezoneoffset = null;
var g_timezone = null;
