diff --git a/cosmic-client/src/main/resources/commands.properties b/cosmic-client/src/main/resources/commands.properties index 2b50648af9..06308cf575 100644 --- a/cosmic-client/src/main/resources/commands.properties +++ b/cosmic-client/src/main/resources/commands.properties @@ -148,27 +148,6 @@ deleteSslCert=15 listSslCerts=15 assignCertToLoadBalancer=15 removeCertFromLoadBalancer=15 -#### autoscale commands -createCounter=1 -createCondition=15 -createAutoScalePolicy=15 -createAutoScaleVmProfile=15 -createAutoScaleVmGroup=15 -deleteCounter=1 -deleteCondition=15 -deleteAutoScalePolicy=15 -deleteAutoScaleVmProfile=15 -deleteAutoScaleVmGroup=15 -listCounters=15 -listConditions=15 -listAutoScalePolicies=15 -listAutoScaleVmProfiles=15 -listAutoScaleVmGroups=15 -enableAutoScaleVmGroup=15 -disableAutoScaleVmGroup=15 -updateAutoScalePolicy=15 -updateAutoScaleVmProfile=15 -updateAutoScaleVmGroup=15 #### router commands startRouter=7 rebootRouter=7 diff --git a/cosmic-client/src/main/webapp/css/cloudstack3.css b/cosmic-client/src/main/webapp/css/cloudstack3.css index a93264739f..074e67d167 100644 --- a/cosmic-client/src/main/webapp/css/cloudstack3.css +++ b/cosmic-client/src/main/webapp/css/cloudstack3.css @@ -1420,20 +1420,20 @@ div.list-view td.state.notsuitable-storage-migration-required span { .multi-edit-add-list .ui-button.migrateok, .multi-edit-add-list .ui-button.migratecancel { - top: -5px !important; + top: -5px !important; } .migrate-vm-available-host-list div.text-search { - right: 30px; + right: 30px; } .migrate-vm-available-host-list div.ui-widget-content { - display: block !important; + display: block !important; } .list-view-select table th.availableHostSuitability, .list-view-select table td.availableHostSuitability { - max-width: 250px; + max-width: 250px; } .horizontal-overflow th.quick-view { @@ -11240,249 +11240,6 @@ div.ui-dialog div.health-check div.health-check-advanced-title { margin-top: -70px; } -/*Autoscaler*/ -.ui-dialog div.autoscaler { - overflow: auto; - max-height: 600px; -} - -div.container div.panel div#details-tab-network.detail-group div div.multi-edit table.multi-edit tbody tr td, -div.container div.panel div#details-tab-network.detail-group div div.multi-edit table.multi-edit thead tr th { - min-width: 80px; - max-width: 80px; - font-size: 10px; -} - -.ui-dialog div.autoscaler .detail-actions { -} - -.ui-dialog div.autoscaler .detail-actions .buttons { - float: right; - margin-right: 6px; -} - -.ui-dialog div.autoscaler .detail-actions .buttons .action { - width: 32px; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=securityGroups] { - display: block; - width: 370px; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=diskOfferingId] { - display: inline-block; - width: 370px; - float: left; - position: relative; - margin-top: 1px; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=minInstance] { - display: block; - width: 50%; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=maxInstance] { - display: inline-block; - width: 50%; - float: left; - left: -30px; - position: relative; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=interval] { - display: block; - width: 50%; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=quietTime] { - display: inline-block; - width: 50%; - float: left; - left: -15px; - position: relative; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=snmpCommunity] { - display: block; - width: 50%; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=snmpPort] { - display: inline-block; - width: 50%; - float: left; - left: -15px; - position: relative; -} - -.ui-dialog div.autoscaler div.form-container div.value select { - width: 88%; - float: left; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title div.form-container { - height: 55px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title div.form-container { - height: 55px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.multi-edit { - margin-top: 0px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.multi-edit { - margin-top: 0px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title { - color: #0055BB; - margin-left: -650px; - margin-top: 40px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title label { - font-size: 13px; - margin-left: 200px; - margin-right: 10px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title hr.policy-divider { - border-left: 1px none #38546D; - border-right: 1px none #16222C; - border-top: 1px none #38546D; - margin-bottom: 12px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title hr.policy-divider { - border-left: 1px none #38546D; - border-right: 1px none #16222C; - border-top: 1px none #38546D; - margin-bottom: 12px; -} - -div.ui-dialog div.autoscaler div.field-group.bottom-fields hr.policy-divider { - border-left: 1px none #38546D; - border-right: 1px none #16222C; - border-top: 1px none #38546D; - margin-top: 15px; - margin-bottom: -1px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title label { - font-size: 13px; - margin-left: 170px; - margin-right: 10px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title { - color: #0055BB; - margin-left: -620px; - margin-top: 10px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title div.form-container div.form-item div.value input[type=text] { - margin-left: 729px; - width: 30%; - margin-top: -17px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title div.form-container div.form-item div.name { - margin-left: 420px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title div.form-container div.form-item div.value input[type=text] { - margin-left: 698px; - width: 30%; - margin-top: -16px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title div.form-container div.form-item div.name { - margin-left: 420px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.multi-edit div.data div.data-body div.data-item { - margin-bottom: 0px; - margin-right: 22px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.multi-edit div.data div.data-body div.data-item { - margin-bottom: 0px; - margin-right: 22px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.slide-label { - color: #A5A3A7; - font-size: 14px; - margin-bottom: 3px; - margin-left: 755px; - width: 12px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.slide-label { - color: #A5A3A7; - font-size: 14px; - margin-bottom: 3px; - margin-left: 755px; - width: 12px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.hide { - background: #FFFFFF url("../images/minus.png") no-repeat 38% 59%; - border: 1px solid #D0D0D0; - border-radius: 9px 9px 9px 9px; - cursor: pointer; - float: right; - height: 15px; - margin: -20px 45px 0 11px; - width: 14px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.hide { - background: #FFFFFF url("../images/minus.png") no-repeat 31% 54%; - border: 1px solid #D0D0D0; - border-radius: 9px 9px 9px 9px; - cursor: pointer; - float: right; - height: 15px; - margin: -20px 45px 0 11px; - width: 14px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.expand { - background: #FFFFFF url("../images/sprites.png") repeat -541px -499px; - border: 1px solid #D0D0D0; - border-radius: 9px 9px 9px 9px; - cursor: pointer; - float: right; - height: 15px; - margin: -20px 45px 0 11px; - width: 14px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.expand { - background: #FFFFFF url("../images/sprites.png") repeat -541px -499px; - border: 1px solid #D0D0D0; - border-radius: 9px 9px 9px 9px; - cursor: pointer; - float: right; - height: 15px; - margin: -20px 45px 0 11px; - width: 14px; -} - -div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-item div.name label { - font-size: 11px; -} - /*List state BG colors*/ .list-view .body td.item-state-on { background: #C0FFC0; @@ -11500,248 +11257,6 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it border-color: inherit; } -/*Autoscaler*/ -.ui-dialog div.autoscaler { - overflow: auto; - max-height: 600px; -} - -div.container div.panel div#details-tab-network.detail-group div div.multi-edit table.multi-edit tbody tr td, -div.container div.panel div#details-tab-network.detail-group div div.multi-edit table.multi-edit thead tr th { - min-width: 72px; - font-size: 10px; -} - -.ui-dialog div.autoscaler .detail-actions { -} - -.ui-dialog div.autoscaler .detail-actions .buttons { - float: right; - margin-right: 6px; -} - -.ui-dialog div.autoscaler .detail-actions .buttons .action { - width: 32px; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=securityGroups] { - display: block; - width: 370px; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=diskOfferingId] { - display: inline-block; - width: 370px; - float: left; - position: relative; - margin-top: 1px; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=minInstance] { - display: block; - width: 50%; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=maxInstance] { - display: inline-block; - width: 50%; - float: left; - left: -30px; - position: relative; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=interval] { - display: block; - width: 50%; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=quietTime] { - display: inline-block; - width: 50%; - float: left; - left: -15px; - position: relative; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=snmpCommunity] { - display: block; - width: 50%; - float: left; -} - -.ui-dialog div.autoscaler div.form-container div.form-item[rel=snmpPort] { - display: inline-block; - width: 50%; - float: left; - left: -15px; - position: relative; -} - -.ui-dialog div.autoscaler div.form-container div.value select { - width: 88%; - float: left; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title div.form-container { - height: 55px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title div.form-container { - height: 55px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.multi-edit { - margin-top: 0px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.multi-edit { - margin-top: 0px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title { - color: #0055BB; - margin-left: -650px; - margin-top: 40px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title label { - font-size: 13px; - margin-left: 200px; - margin-right: 10px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title hr.policy-divider { - border-left: 1px none #38546D; - border-right: 1px none #16222C; - border-top: 1px none #38546D; - margin-bottom: 12px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title hr.policy-divider { - border-left: 1px none #38546D; - border-right: 1px none #16222C; - border-top: 1px none #38546D; - margin-bottom: 12px; -} - -div.ui-dialog div.autoscaler div.field-group.bottom-fields hr.policy-divider { - border-left: 1px none #38546D; - border-right: 1px none #16222C; - border-top: 1px none #38546D; - margin-top: 15px; - margin-bottom: -1px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title label { - font-size: 13px; - margin-left: 170px; - margin-right: 10px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title { - color: #0055BB; - margin-left: -620px; - margin-top: 10px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title div.form-container div.form-item div.value input[type=text] { - margin-left: 195px; - width: 30%; - margin-top: 1px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy-title div.form-container div.form-item div.name { - margin-left: 390px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title div.form-container div.form-item div.value input[type=text] { - margin-left: 670px; - width: 30%; - margin-top: -16px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy-title div.form-container div.form-item div.name { - margin-left: 390px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.multi-edit div.data div.data-body div.data-item { - margin-bottom: 0px; - margin-right: 22px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.multi-edit div.data div.data-body div.data-item { - margin-bottom: 0px; - margin-right: 22px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.slide-label { - color: #A5A3A7; - font-size: 14px; - margin-bottom: 3px; - margin-left: 755px; - width: 12px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.slide-label { - color: #A5A3A7; - font-size: 14px; - margin-bottom: 3px; - margin-left: 755px; - width: 12px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.hide { - background: #FFFFFF url("../images/minus.png") no-repeat 38% 59%; - border: 1px solid #D0D0D0; - border-radius: 9px 9px 9px 9px; - cursor: pointer; - float: right; - height: 15px; - margin: -20px 45px 0 11px; - width: 14px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.hide { - background: #FFFFFF url("../images/minus.png") no-repeat 31% 54%; - border: 1px solid #D0D0D0; - border-radius: 9px 9px 9px 9px; - cursor: pointer; - float: right; - height: 15px; - margin: -20px 45px 0 11px; - width: 14px; -} - -div.ui-dialog div.autoscaler div.scale-up-policy div.expand { - background: #FFFFFF url("../images/sprites.png") repeat -541px -499px; - border: 1px solid #D0D0D0; - border-radius: 9px 9px 9px 9px; - cursor: pointer; - float: right; - height: 15px; - margin: -20px 45px 0 11px; - width: 14px; -} - -div.ui-dialog div.autoscaler div.scale-down-policy div.expand { - background: #FFFFFF url("../images/sprites.png") repeat -541px -499px; - border: 1px solid #D0D0D0; - border-radius: 9px 9px 9px 9px; - cursor: pointer; - float: right; - height: 15px; - margin: -20px 45px 0 11px; - width: 14px; -} - -div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-item div.name label { - font-size: 11px; -} - /*UI datepicker*/ .ui-datepicker { background: #FFFFFF 0px -2470px; diff --git a/cosmic-client/src/main/webapp/index.html b/cosmic-client/src/main/webapp/index.html index bf1f52edaa..22cfb97927 100644 --- a/cosmic-client/src/main/webapp/index.html +++ b/cosmic-client/src/main/webapp/index.html @@ -1,1613 +1,1851 @@ + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - - - - - - - - - - - -
- -
- -
-
- -
-
- -
+ + + + + + + + + + + +
+ +
+ +