diff --git a/client/WEB-INF/ui-library.txt b/client/WEB-INF/ui-library.txt new file mode 100644 index 00000000000..e74fd4f9330 --- /dev/null +++ b/client/WEB-INF/ui-library.txt @@ -0,0 +1,2 @@ +jquery : 1.4.2 +jquery-ui : 1.8.2 \ No newline at end of file diff --git a/ui/css/jquery-ui-1.8.2.custom.css b/ui/css/jquery-ui.custom.css similarity index 100% rename from ui/css/jquery-ui-1.8.2.custom.css rename to ui/css/jquery-ui.custom.css diff --git a/ui/index.jsp b/ui/index.jsp index 8be1f714663..2dcee41903d 100755 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -11,13 +11,12 @@ long milliseconds = new Date().getTime(); - cloud.com - User Console - + - - + + diff --git a/ui/scripts/cloud.core.domains.js b/ui/scripts/cloud.core.domains.js index 1a1f875daee..d57b74fdcb3 100644 --- a/ui/scripts/cloud.core.domains.js +++ b/ui/scripts/cloud.core.domains.js @@ -16,8 +16,6 @@ * */ -// Version: @VERSION@ - function showDomainsTab() { var defaultRootDomainId = g_domainid; var defaultRootLevel = 0; diff --git a/ui/scripts/cloud.core.events.js b/ui/scripts/cloud.core.events.js index 82229ac0c8a..a6180e20d05 100644 --- a/ui/scripts/cloud.core.events.js +++ b/ui/scripts/cloud.core.events.js @@ -16,8 +16,6 @@ * */ -// Version: @VERSION@ - function showEventsTab(showEvents) { var currentSubMenu = $("#submenu_events"); diff --git a/ui/scripts/cloud.core.hosts.js b/ui/scripts/cloud.core.hosts.js index 10adc943c3c..7db3d74c0c0 100644 --- a/ui/scripts/cloud.core.hosts.js +++ b/ui/scripts/cloud.core.hosts.js @@ -16,8 +16,6 @@ * */ -// Version: @VERSION@ - function showHostsTab() { var rIndex = 0; var sIndex = 0; diff --git a/ui/scripts/cloud.core.instances.js b/ui/scripts/cloud.core.instances.js index 42da5c3c9cf..62d1e2288f4 100644 --- a/ui/scripts/cloud.core.instances.js +++ b/ui/scripts/cloud.core.instances.js @@ -16,8 +16,6 @@ * */ -// Version: @VERSION@ - var rowZIndexGlobal = 300; var rowZIndex = 299; var currentVMAction = null; diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index 41c6b6d9ed3..4ebc9df53c2 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -16,8 +16,6 @@ * */ -// Version: 1.9.1.4 - // global variables var g_mySession = null; var g_role = null; // roles - root, domain-admin, ro-admin, user diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index 36fdceb2248..e8c33f91057 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -16,8 +16,6 @@ * */ -// Version: @VERSION@ - function showNetworkingTab(p_domainId, p_account) { //*** Network (begin) **************************************************************************** activateDialog($("#dialog_acquire_public_ip").dialog({ diff --git a/ui/scripts/cloud.core.storage.js b/ui/scripts/cloud.core.storage.js index eeb89e23850..0ad5923f39a 100644 --- a/ui/scripts/cloud.core.storage.js +++ b/ui/scripts/cloud.core.storage.js @@ -16,8 +16,6 @@ * */ -// Version: @VERSION@ - function showStorageTab(domainId, targetTab) { var currentSubMenu; diff --git a/ui/scripts/cloud.core.templates.js b/ui/scripts/cloud.core.templates.js index 89b2123e393..e415e625114 100644 --- a/ui/scripts/cloud.core.templates.js +++ b/ui/scripts/cloud.core.templates.js @@ -16,8 +16,6 @@ * */ -// Version: @VERSION@ - var DomRTemplateId = 1; function showTemplatesTab() { diff --git a/ui/scripts/cloud.logger.js b/ui/scripts/cloud.logger.js index 895e421ce91..f6371f41a5b 100644 --- a/ui/scripts/cloud.logger.js +++ b/ui/scripts/cloud.logger.js @@ -16,8 +16,6 @@ * */ -// Version: 1.9.1.152 - // // Javascript logger utility // Author diff --git a/ui/scripts/jquery-ui-1.8.2.custom.min.js b/ui/scripts/jquery-ui.custom.min.js similarity index 100% rename from ui/scripts/jquery-ui-1.8.2.custom.min.js rename to ui/scripts/jquery-ui.custom.min.js diff --git a/ui/scripts/jquery-1.4.2.min.js b/ui/scripts/jquery.min.js similarity index 100% rename from ui/scripts/jquery-1.4.2.min.js rename to ui/scripts/jquery.min.js diff --git a/ui/test/index.html b/ui/test/index.html index e699108a35b..0f65ba90b81 100644 --- a/ui/test/index.html +++ b/ui/test/index.html @@ -4,7 +4,7 @@ - + @@ -16,8 +16,8 @@ - - + +