This is an automated email from the ASF dual-hosted git repository. rafael pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push: new 89d5480 Improvements after jquery update (#3183) 89d5480 is described below commit 89d548052b821ba1255c3c575f0c193894446371 Author: Nico Wohlfarth <niw...@gmx.de> AuthorDate: Thu Apr 25 21:09:43 2019 +0200 Improvements after jquery update (#3183) * Add jQuery ui stylings to the project * Adapt stylings to jquery ui stylings - remove unnecessary (empty) style definitions * Check if jquery autocomplete is initialized before destroying it * Use dialog modal option instead of setting z-index styling - set minimum heigth of dialog * Swap removeAttr() for prop() since it's not longer recommended as of jQuery 3.0 * Fix reccuring snapshots modal view * Further style improvements * More improvements on the instance-wizard (and multi-wizard in general) * Raise input hints over modal z-index * Adapt/fix stylings - center buttons of create form modals - fix width of select menu in service offerings - fix width of modal in Network -> VPC -> configure -> static NAT -> aquire new Ip -> enable static nat * Adapt width of dynamic-input container --- ui/css/cloudstack3.css | 557 +++++----------- ui/index.html | 1 + ui/lib/jquery-ui/css/jquery-ui.css | 1151 ++++++++++++++++++++++++++++++++ ui/scripts/configuration.js | 2 +- ui/scripts/roles.js | 5 +- ui/scripts/system.js | 8 +- ui/scripts/ui-custom/instanceWizard.js | 11 +- ui/scripts/ui/widgets/toolTip.js | 2 +- ui/scripts/vpc.js | 2 +- ui/scripts/zoneWizard.js | 16 +- 10 files changed, 1339 insertions(+), 416 deletions(-) diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index ab0fd5a..cfad99d 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -17,9 +17,7 @@ * specific language governing permissions and limitations * under the License. */ -/*+clearfix {*/ div.toolbar:after, -.multi-wizard .progress ul li:after, .multi-wizard.zone-wizard .select-container .field .select-array-item:after { content: "."; display: block; @@ -30,21 +28,16 @@ div.toolbar:after, } div.toolbar, -.multi-wizard .progress ul li, .multi-wizard.zone-wizard .select-container .field .select-array-item { display: inline-block; } div.toolbar, -.multi-wizard .progress ul li, .multi-wizard.zone-wizard .select-container .field .select-array-item { - /*\*/ display: block; - /**/ - -height: 1px; + height: 1px; } -/*+}*/ body { min-width: 1224px; font-family: sans-serif; @@ -938,9 +931,6 @@ div.list-view div.toolbar div.section-switcher div.section-select label { margin: auto; } -.install-wizard .step.intro { -} - .install-wizard .step.intro iframe { width: 99%; height: 99%; @@ -1111,9 +1101,6 @@ div.notification-box .container ul li.first { border-top: none; } -div.notification-box .container ul li.last { -} - div.notification-box .button { float: left; background: url(../images/buttons.png) no-repeat; @@ -1243,9 +1230,6 @@ div.notification.corner-alert div.message span { } /*Tooltips*/ -.tooltip { -} - .tooltip-info { width: 239px; min-height: 83px; @@ -1528,9 +1512,6 @@ span.compact { opacity: 0.35; } -.quick-view-tooltip > div.title span.title { -} - .quick-view-tooltip .container { border: 1px solid #9EA2A5; background: #FFFFFF; @@ -1547,9 +1528,6 @@ span.compact { } /*** Quick view detail view*/ -.quick-view-tooltip .detail-view { -} - .quick-view-tooltip .detail-view .main-groups { width: 456px; height: 170px; @@ -1567,9 +1545,6 @@ span.compact { box-shadow: 0px 1px #E6E6E6; } -.quick-view-tooltip .detail-view .actions { -} - .quick-view-tooltip .detail-view .tagger { display: none; } @@ -1725,21 +1700,6 @@ span.compact { padding: 0 0 0 14px; } -.ui-tabs ul.ui-tabs-nav { - margin-top: 42px; - display: block; - width: 100%; - height: 41px; - float: left; - border: none; - overflow: hidden; - z-index: 2; - /*+placement:shift 0px 2px;*/ - position: relative; - left: 0px; - top: 2px; -} - .ui-tabs .info { background: #EFEFEF; width: 91%; @@ -1767,41 +1727,6 @@ span.compact { color: #506273; } -.ui-tabs ul.ui-tabs-subnav li { - display: block; - float: left; -} - -.ui-tabs li a { - float: left; - padding: 15px 10px; - min-width: 91px; - text-align: center; - font-size: 11px; - margin-right: 5px; - color: #4E6070; - text-decoration: none; - /*+placement:shift 0px 2px;*/ - position: relative; - left: 0px; - top: 2px; -} - -.ui-tabs li { - float: left; -} - -.ui-tabs ul li.ui-state-default a { - padding-bottom: 10px; - border: 1px solid #D9D9D9; - /*+border-radius:4px 4px 0 0;*/ - -moz-border-radius: 4px 4px 0 0; - -webkit-border-radius: 4px 4px 0 0; - -khtml-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; - background: #F0F0F0; -} - .project-view .ui-tabs ul li.ui-state-default a { background: #6D747D; /*+box-shadow:inset -1px -2px 12px #596066;*/ @@ -1818,20 +1743,6 @@ span.compact { text-shadow: 0px -1px 1px #3A3E42; } -.ui-tabs ul li.ui-state-hover a { - text-decoration: underline; - color: #000000; -} - -.ui-tabs ul li.ui-state-active { - display: block; -} - -.ui-tabs ul li.ui-state-active a { - background: #FFFFFF; - padding-bottom: 12px; -} - .project-view .ui-tabs ul li.ui-state-hover a { background: #878E97 0px 8px; } @@ -1855,21 +1766,6 @@ span.compact { -o-box-shadow: 0px 0px none; } -.ui-tabs li.ui-state-active.first a, -.ui-tabs li.ui-state-default.first a { - /*+border-radius:4px 4px 0 0;*/ - -moz-border-radius: 4px 4px 0 0; - -webkit-border-radius: 4px 4px 0 0; - -khtml-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; - border: 1px solid #E2DDDD; - border: 1px solid #E2DDDD; -} - -.ui-tabs li.ui-state-active.last a, -.ui-tabs li.ui-state-default.last a { -} - .ui-tabs li.ui-state-active.first.last a, .ui-tabs li.ui-state-default.first.last a { /*+border-radius:4px 4px 0 0;*/ @@ -1883,16 +1779,14 @@ span.compact { display: none !important; } -.ui-tabs div.ui-tabs-panel { +.ui-tabs .ui-tabs-panel { border: 1px solid #D9D9D9; clear: both; - height: 78%; + padding: 7px 0 0 0; width: 97%; - padding-top: 7px; overflow: auto; overflow-x: hidden; height: 591px; - margin: -5px 0 0; } .detail-view .main-groups { @@ -2209,9 +2103,6 @@ div.ui-tabs-panel table span.none { color: #9D9D9D; } -#user div.options .arrow { -} - div.detail-group td.view-all div.view-all { width: auto; float: right; @@ -2386,9 +2277,6 @@ div.detail-group.actions td { box-shadow: inset 0px 1px 3px #171717; } -.detail-group table td.detail-actions div.buttons { -} - .detail-group table td.detail-actions a { display: block; float: left; @@ -2613,9 +2501,6 @@ div.detail-group.actions td { cursor: pointer; } -#user div.options:hover { -} - #user div.options .arrow { width: 11px; height: 8px; @@ -2655,10 +2540,6 @@ div.detail-group.actions td { } /*Navigation*/ -#navigation, -#browser { -} - #navigation { width: 230px; position: relative; @@ -2990,9 +2871,6 @@ div.detail-group.actions td { overflow: visible; } -#browser.panel-highlight .panel { -} - #browser div.panel { height: 100%; border-right: 1px solid #A5A5A5; @@ -3559,7 +3437,6 @@ div.toolbar div.section-switcher div.section-select { } div.toolbar div.section-switcher div.section-select select { - width: 100px; height: 21px; margin-right: 13px; font-size: 12px; @@ -3592,9 +3469,6 @@ div.toolbar div.filters { float: left; } -div.toolbar label { -} - div.toolbar div.filters select { width: 104px; height: 21px; @@ -3694,9 +3568,6 @@ div.toolbar div.filters select { } /*NOTE: End divs are not displayed per UI changes*/ -#breadcrumbs div.end { -} - #breadcrumbs ul div.end { /*+placement:shift -37px -1px;*/ position: relative; @@ -3853,12 +3724,6 @@ table td.actions .action span.icon { float: left; } -table td.actions .action.disabled { -} - -table td.actions .action.disabled:hover .icon { -} - table td.actions .action.disabled .icon { cursor: not-allowed; /*+opacity:20%;*/ @@ -3922,8 +3787,12 @@ Dialogs*/ padding: 15px; } +.ui-dialog.ui-corner-all { + border-radius: 0; +} + .ui-dialog .ui-widget-content { - padding: 8px; + padding: 8px 0 8px 8px; text-align: center; display: inline-block; } @@ -4072,6 +3941,11 @@ Dialogs*/ margin: auto; } +.ui-dialog-titlebar.ui-widget-header { + border: none; + font-weight: inherit; +} + .ui-dialog-titlebar .ui-icon-closethick { display: none; } @@ -4285,6 +4159,10 @@ textarea { padding: 0; } +.ui-dialog.create-form .ui-dialog-buttonpane { + margin-left: 25px; +} + .ui-dialog.create-form .ui-button.ok { margin-left: 0; float: right; @@ -4311,7 +4189,7 @@ textarea { /**** Dynamic input*/ .ui-dialog div.form-container div.value .dynamic-input { background: #FFFFFF; - width: 98%; + width: calc(100% + 4px); min-height: 50px; clear: both; max-height: 211px; @@ -4324,11 +4202,6 @@ textarea { -khtml-border-radius: 4px; border-radius: 4px; border-radius: 4px 4px 4px 4px; - /*+box-shadow:inset -1px 1px 1px #636363;*/ - -moz-box-shadow: inset -1px 1px 1px #636363; - -webkit-box-shadow: inset -1px 1px 1px #636363; - -o-box-shadow: inset -1px 1px 1px #636363; - box-shadow: inset -1px 1px 1px #636363; } .ui-dialog div.form-container div.value .dynamic-input .form-item { @@ -4343,6 +4216,7 @@ textarea { .ui-dialog div.form-container div.value .dynamic-input .name label { width: inherit; font-size: 12px; + margin-left: 0; } .ui-dialog div.form-container div.value .dynamic-input .value { @@ -4375,9 +4249,6 @@ textarea { padding: 10px 0; } -#user-options a:hover { -} - /*Dashboard ** Admin*/ .dashboard.admin { @@ -4730,9 +4601,8 @@ textarea { .dashboard.admin .dashboard-container.sub.alerts ul { width: 468px; - height: 234px; - overflow: auto; - overflow-x: hidden; + height: 100%; + overflow-y: scroll; position: relative; margin: 0px 0 0 8px; } @@ -4750,9 +4620,6 @@ textarea { padding: 8px; } -.dashboard.admin .dashboard-container.sub.alerts ul li .content { -} - .dashboard.admin .dashboard-container.sub.alerts ul li { border: 1px solid #FF7070; background: #FFEFEF; @@ -4784,9 +4651,6 @@ textarea { } /*** User*/ -.dashboard.user { -} - #browser div.panel .dashboard.user .toolbar { height: 60px; position: relative; @@ -4823,9 +4687,6 @@ textarea { } /**** Actions*/ -.dashboard.user .dashboard-actions { -} - .dashboard.user .dashboard-actions ul { padding: 11px; } @@ -5064,9 +4925,6 @@ textarea { cursor: default; } -.dashboard.user .status-lists .my-account table tbody tr { -} - .dashboard.user .status-lists .my-account table tbody tr td { padding-top: 19px; padding-bottom: 19px; @@ -5086,9 +4944,6 @@ textarea { } /****** IP addresses*/ -.dashboard.user .status-lists li.ip-addresses { -} - .dashboard.user .status-lists li.ip-addresses td { width: 250px; padding: 28px 0 51px; @@ -5269,9 +5124,6 @@ textarea { } /** Network*/ -.system-chart.network { -} - .system-chart.network .network-switch-icon { color: #506980; font-weight: bold; @@ -5622,18 +5474,20 @@ label.error { } .multi-wizard .progress ul { - width: 900px; height: 40px; float: left; clear: both; } -/*[clearfix]*/.multi-wizard .progress ul li { +/*[clearfix]*/ +.multi-wizard .progress ul li { float: left; width: 128px; height: 40px; - padding: 0 0px; position: relative; + display: flex; + align-items: center; + justify-content: center; } .multi-wizard.instance-wizard .progress ul li { @@ -5641,21 +5495,8 @@ label.error { margin-left: 8px; } -.multi-wizard .progress ul li.first { - /*+border-radius:5px;*/ - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - -khtml-border-radius: 5px; - border-radius: 5px; -} - -.multi-wizard .progress ul li.last { -} - .multi-wizard .progress ul li.active { background: url(../images/bg-gradients.png) 0px -221px; - height: 40px; - /*+border-radius:5px;*/ -moz-border-radius: 5px; -webkit-border-radius: 5px; -khtml-border-radius: 5px; @@ -5663,34 +5504,16 @@ label.error { } .multi-wizard .progress ul li span { - display: block; - /*+placement:shift 46px 17px;*/ position: relative; - left: 46px; - top: 17px; - text-align: left; color: #000000; - /*+text-shadow:0px 1px 1px #FFFFFF;*/ -moz-text-shadow: 0px 1px 1px #FFFFFF; -webkit-text-shadow: 0px 1px 1px #FFFFFF; -o-text-shadow: 0px 1px 1px #FFFFFF; text-shadow: 0px 1px 1px #FFFFFF; - float: right; - position: absolute; width: 62px; text-align: center; } -.multi-wizard.instance-wizard .progress ul li span { - left: 26px; - top: 16px; -} - -.multi-wizard .progress ul li span.multiline { - width: 71px; - top: 12px; -} - .multi-wizard .progress ul li span.arrow { width: 17px; height: 15px; @@ -5713,24 +5536,12 @@ label.error { .multi-wizard .progress ul li span.number { width: auto; - position: absolute; - top: 7px; - left: 26px; font-size: 27px; font-weight: bold; color: #BBBBBB; background: transparent; } -.multi-wizard.instance-wizard .progress ul li span.number { - left: 8px; -} - -.multi-wizard.instance-wizard .progress ul li span.multiline { - width: 79px; - left: 26px; -} - .multi-wizard .progress ul li.active span { /*+text-shadow:0px -1px 1px #004AFF;*/ -moz-text-shadow: 0px -1px 1px #004AFF; @@ -5740,9 +5551,6 @@ label.error { color: #FFFFFF; } -.multi-wizard .progress ul li.active span.number { -} - /*** Content*/ .multi-wizard .main-desc { font-size: 11px; @@ -5755,6 +5563,12 @@ label.error { line-height: 17px; } +.multi-wizard .review .main-desc, +.multi-wizard .select-template .main-desc { + margin-left: 10px; + left: 0; +} + .multi-wizard .content { background: #FFFFFF; width: 440px; @@ -5828,7 +5642,8 @@ label.error { float: left; } -.multi-wizard .content .section .select-area input[type=radio] { +.multi-wizard .content .section .select-area input[type=radio], +.multi-wizard.instance-wizard .content .section.select-template input[type=radio] { margin: 14px 16px 0; } @@ -5889,8 +5704,7 @@ label.error { border: 1px solid #E2DDDD; clear: both; height: 72% !important; - width: 95%; - margin: auto; + width: 98%; overflow: auto; overflow-x: hidden; height: 591px; @@ -5938,7 +5752,6 @@ label.error { /*** UI widgets*/ .multi-wizard .ui-tabs ul.ui-tabs-nav { - margin-left: 2px; margin-top: 7px; display: block; height: 41px; @@ -5959,38 +5772,28 @@ label.error { top: 1px; } -.multi-wizard .ui-tabs ul li.first a { - border-left: 1px solid #E2DDDD; -} - -.multi-wizard .ui-tabs ul li.last a { - border-right: 1px solid #E2DDDD; +.multi-wizard .ui-tabs li.ui-state-active { + background: #FFFFFF; } .multi-wizard .ui-tabs li.ui-state-default a { - float: left; - text-align: center; - font-size: 11px; - margin-right: 1px; - color: #4E6070; - text-decoration: none; - background: #DEE3E5; padding-left: 0; padding-right: 0; } -.multi-wizard .ui-tabs li.ui-state-active a { - background: #FFFFFF; -} - .multi-wizard .ui-slider { width: 136px; padding: 0; margin: 8px -2px 3px; - background: url(../images/bg-gradients.png) 0px -307px; + background: url(../images/bg-gradients.png) 0px -307px !important; float: left; } +.multi-wizard.instance-wizard .ui-slider { + padding: 7px 0 0 8px; + margin: 8px 0px 0px 2px; +} + .multi-wizard .ui-slider .ui-slider-handle { display: block; background: url(../images/buttons.png) -622px -274px; @@ -5998,6 +5801,9 @@ label.error { height: 18px; position: relative; outline: none; + border: none; + top: -0.5rem; + margin-left: -0.9rem; } /*** Select container*/ @@ -6040,7 +5846,7 @@ label.error { .multi-wizard .select-container .select input { float: left; - margin: 24px 24px 0; + margin: 21px 24px 0; } .multi-wizard .select-container .select .select-desc { @@ -6199,7 +6005,13 @@ label.error { margin: 12px 0 15px 8px; } -.multi-wizard.instance-wizard .data-disk-offering .select-container { +.multi-wizard.instance-wizard .content .section.no-thanks { + box-sizing: border-box; + width: 426px; +} + +.multi-wizard.instance-wizard .data-disk-offering .select-container, +.multi-wizard.instance-wizard .sshkeyPairs .select-container { height: 300px; margin: -7px 6px 0 8px; /*+border-radius:6px;*/ @@ -6333,6 +6145,10 @@ label.error { margin: 10px 7px 7px; } +.multi-wizard.instance-wizard .content .section .select-area label { + margin: 12px 0px 0px; +} + .multi-wizard.instance-wizard .content .section label.size { color: #647A8E; font-weight: bold; @@ -6348,6 +6164,14 @@ label.error { background: #F4F4F4; padding: 7px; border-radius: 4px; + width: 100%; + box-sizing: border-box; + margin: 12px 0; +} + +.multi-wizard.instance-wizard .section.custom-size.custom-disk-size { + width: 426px; + margin-left: 8px; } .multi-wizard.instance-wizard .section.custom-iops { @@ -6362,6 +6186,8 @@ label.error { background: #F4F4F4; padding: 7px; border-radius: 4px; + box-sizing: border-box; + width: 426px; } .multi-wizard.instance-wizard .section.custom-size input[type=radio] { @@ -6441,9 +6267,6 @@ label.error { } /*** Compute offering*/ -.instance-wizard .step.service-offering { -} - .instance-wizard .step.service-offering.custom-size .select-container { height: 235px; } @@ -6693,9 +6516,6 @@ label.error { } /**** New networ*/ -.multi-wizard.instance-wizard .select-network .select.new-network { -} - .multi-wizard.instance-wizard .select-network .select.new-network .advanced-options { /*+placement:shift 379px 15px;*/ position: relative; @@ -6802,16 +6622,7 @@ label.error { color: #808080; } -.multi-wizard.instance-wizard .select-network .select.new-network .select-desc .desc { -} - /*** Confirmation*/ -.multi-wizard .review { -} - -.multi-wizard .review .select-container { -} - .multi-wizard .review .select-container .select { height: 35px; padding: 0; @@ -7086,14 +6897,6 @@ label.error { font-weight: bold; } -.multi-wizard.zone-wizard .buttons { - top: 609px; -} - -.multi-wizard.zone-wizard .progress ul { - width: 776px; -} - .multi-wizard.zone-wizard .progress ul li { width: 107px; margin-left: 7px; @@ -7102,11 +6905,6 @@ label.error { .multi-wizard.zone-wizard .progress ul li span { width: 102px; - left: 28px; -} - -.multi-wizard.zone-wizard .progress ul li span.number { - left: -28px; } .multi-wizard.zone-wizard .progress ul li span.arrow { @@ -7162,9 +6960,6 @@ label.error { opacity: 0.5; } -.multi-wizard.zone-wizard .select-network-model .select-area.disabled .isolation-mode input { -} - .multi-wizard.zone-wizard .select-network-model .select-area .isolation-mode .title { font-size: 15px; color: #5D7387; @@ -7992,9 +7787,6 @@ label.error { overflow: scroll; } -#browser .tree-view div.toolbar { -} - .tree-view ul { display: block; width: 85px; @@ -8061,16 +7853,10 @@ label.error { float: left; } -#navigation ul li.last.active { -} - .detail-group table tbody { border: none; } -div.detail-group td.view-all div.view-all div.end { -} - /*Dialog-based list view*/ .ui-dialog .list-view { height: 515px !important; @@ -8315,6 +8101,24 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal text-shadow: 0px 1px 1px #000000; } +.ui-dialog.multi-edit-add-list { + width: initial !important; +} + +.ui-dialog.multi-edit-add-list .ui-dialog-buttonpane { + display: block; +} + +.ui-dialog.multi-edit-add-list .ui-dialog-buttonpane .ui-dialog-buttonset { + width: initial; + padding-right: 15px; +} + +.ui-dialog.multi-edit-add-list .ui-dialog-buttonpane .ui-dialog-buttonset button { + top: 0; + left: 0; +} + .multi-edit-add-list .ui-button.ok, .multi-edit-add-list .ui-button.cancel { float: right; @@ -8322,14 +8126,12 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal position: relative; left: 506px; top: -18px; - height: 23px; } .multi-edit-add-list .ui-button.cancel { /*+placement:shift 492px -18px;*/ position: relative; left: 492px; - top: -18px; border: none; background: transparent; color: #808B95; @@ -8410,9 +8212,6 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal white-space: nowrap; } -.multi-edit .data .data-body .data-item table tbody tr td.blank { -} - .multi-edit .data .data-body .data-item table tbody tr td.name { padding-top: 9px; } @@ -8674,9 +8473,6 @@ div#details-tab-aclRules td.cidrlist span { color: #55687A; } -.multi-edit .header-fields input[type=submit] { -} - /*Sortable*/ .multi-edit table tbody tr td.reorder, .multi-edit table thead tr th.reorder { @@ -8701,9 +8497,6 @@ div#details-tab-aclRules td.cidrlist span { display: inline-block; } -.recurring-snapshots .schedule { -} - .recurring-snapshots .schedule .add-snapshot-actions { width: 581px; clear: both; @@ -8738,22 +8531,8 @@ div#details-tab-aclRules td.cidrlist span { } .recurring-snapshots .schedule p { - float: left; font-size: 13px; - padding: 0; - margin: 5px 0 0 14px; -} - -.recurring-snapshots .schedule .forms { - width: 436px; - float: left; - /*+placement:shift 24px 2px;*/ - position: relative; - left: 24px; - top: 2px; -} - -.recurring-snapshots .schedule .forms > div { + margin: 0; } .recurring-snapshots .schedule .forms form { @@ -8821,10 +8600,7 @@ div#details-tab-aclRules td.cidrlist span { .recurring-snapshots .scheduled-snapshots { clear: both; - display: inline-block; - /*+placement:shift 0px -26px;*/ position: relative; - left: 0px; top: -26px; } @@ -8836,17 +8612,15 @@ div#details-tab-aclRules td.cidrlist span { -webkit-text-shadow: 0px 2px 2px #FFFFFF; -o-text-shadow: 0px 2px 2px #FFFFFF; text-shadow: 0px 2px 2px #FFFFFF; - text-indent: 12px; - padding-bottom: 8px; } .recurring-snapshots .scheduled-snapshots table { border: none; /*+placement:shift 0px -14px;*/ position: relative; - left: 0px; top: -14px; - width: 564px; + width: 100%; + margin: 0; } .recurring-snapshots .scheduled-snapshots table td.actions div.action span.icon { @@ -8868,7 +8642,6 @@ div#details-tab-aclRules td.cidrlist span { .recurring-snapshots .scheduled-snapshots tr td { border: none; - min-width: 102px; padding: 5px 0px 0 14px; font-size: 12px; word-break: keep-all; @@ -8891,7 +8664,7 @@ div#details-tab-aclRules td.cidrlist span { .recurring-snapshots .scheduled-snapshots table tbody tr td.actions { max-width: 22px !important; - min-width: 22px; + min-width: 22px !important; } .recurring-snapshots .scheduled-snapshots tr td.time { @@ -8939,11 +8712,7 @@ div#details-tab-aclRules td.cidrlist span { .recurring-snapshots .ui-tabs ul li a { width: 76px; - text-indent: 28px; - margin: 0 14px 0 0; - padding: 8px 0 5px; - background: url(../images/sprites.png) no-repeat -521px -540px; - border: none; + background: url(../images/sprites.png) no-repeat -521px -533px; } .recurring-snapshots .ui-tabs ul li.disabled a { @@ -8972,46 +8741,23 @@ div#details-tab-aclRules td.cidrlist span { cursor: default; } -.recurring-snapshots .ui-tabs ul li.ui-state-active a, -.recurring-snapshots .ui-tabs ul li:hover a { - background-color: #DFDFDF; - /*+border-radius:8px;*/ - -moz-border-radius: 8px; - -webkit-border-radius: 8px; - -khtml-border-radius: 8px; - border-radius: 8px; - border-radius: 8px 8px 8px 8px; - /*+box-shadow:inset 0px 1px 2px #4E4E4E;*/ - -moz-box-shadow: inset 0px 1px 2px #4E4E4E; - -webkit-box-shadow: inset 0px 1px 2px #4E4E4E; - -o-box-shadow: inset 0px 1px 2px #4E4E4E; - box-shadow: inset 0px 1px 2px #4E4E4E; -} - .recurring-snapshots .ui-tabs ul li.daily a { - background-position: -522px -577px; + background-position: -522px -570px; } .recurring-snapshots .ui-tabs ul li.weekly a { - background-position: -526px -612px; + background-position: -526px -605px; } .recurring-snapshots .ui-tabs ul li.monthly a { - background-position: -528px -656px; + background-position: -528px -649px; } .recurring-snapshots .ui-tabs div.ui-tabs-panel { height: 144px; - width: 576px; + width: 100%; border: none; - border-bottom: 1px solid #C3C3C3; background: #E9E9E9; - margin: 0; - padding: 0; - /*+placement:shift -89px 0px;*/ - position: relative; - left: -89px; - top: 0px; } .recurring-snapshots .ui-tabs div.ui-tabs-panel.ui-tabs-hide { @@ -9019,9 +8765,6 @@ div#details-tab-aclRules td.cidrlist span { } /*Upload volume*/ -.upload-volume { -} - .upload-volume .list-view { margin-top: 5px !important; } @@ -9431,9 +9174,6 @@ div#details-tab-aclRules td.cidrlist span { opacity: 0.56; } -.system-dashboard .status_box li span { -} - .system-dashboard .status_box li span.label { color: #CCCFD4; font-size: 12px; @@ -9621,9 +9361,6 @@ div#details-tab-aclRules td.cidrlist span { font-size: 13px; } -.system-dashboard-view .socket-info ul { -} - .system-dashboard-view .socket-info li { width: 139px; padding: 13px; @@ -9673,9 +9410,6 @@ div#details-tab-aclRules td.cidrlist span { height: auto; } -.add-zone-resource { -} - .add-zone-resource .head { width: 100%; margin-bottom: 7px; @@ -10005,9 +9739,6 @@ div#details-tab-aclRules td.cidrlist span { } /*** Resource management*/ -.project-dashboard .resources { -} - .project-dashboard .resources form { background: #FFFFFF; width: 87%; @@ -10483,9 +10214,6 @@ div#details-tab-aclRules td.cidrlist span { padding: 0; } -.new-project .resources .field input { -} - .new-project .field span.value { color: #475765; /*+placement:shift 21px 20px;*/ @@ -10645,9 +10373,6 @@ div#details-tab-aclRules td.cidrlist span { display: none; } -.new-project .review .ui-tabs li { -} - .new-project .review .ui-tabs ul { text-align: left; /*+placement:shift 0px -2px;*/ @@ -10706,9 +10431,6 @@ div#details-tab-aclRules td.cidrlist span { display: none; } -.new-project .review .ui-tabs .list-view .toolbar { -} - .new-project .review .project-data { padding: 16px; background: #F4F4F4; @@ -10936,9 +10658,6 @@ div#details-tab-aclRules td.cidrlist span { box-shadow: inset 0px 0px 10px #DCDCDC; } -.tagger.readonly ul { -} - .tagger ul li { background: #DFDFDF 0px 4px; height: 15px; @@ -11588,9 +11307,6 @@ div.ui-dialog div.acl div.multi-edit div.data div.data-body div.data-item table min-width: 77px; } -.detail-view .acl .multi-edit { -} - .detail-view .acl .multi-edit th, .detail-view .acl .multi-edit td { padding-right: 0px !important; @@ -11660,9 +11376,6 @@ div.container div.panel div#details-tab-network.detail-group div div.multi-edit font-size: 10px; } -.ui-dialog div.autoscaler .detail-actions { -} - .ui-dialog div.autoscaler .detail-actions .buttons { float: right; margin-right: 6px; @@ -11919,9 +11632,6 @@ div.container div.panel div#details-tab-network.detail-group div div.multi-edit font-size: 10px; } -.ui-dialog div.autoscaler .detail-actions { -} - .ui-dialog div.autoscaler .detail-actions .buttons { float: right; margin-right: 6px; @@ -12223,9 +11933,6 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it color: #2C363F; } -.ui-datepicker .ui-datepicker-title .ui-datepicker-year { -} - .ui-datepicker .ui-datepicker-title { text-align: center; width: 188px; @@ -12288,9 +11995,6 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it } /*Plugins listing*/ -.plugins-listing { -} - .plugins-listing ul { width: 100%; } @@ -12441,9 +12145,6 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it text-shadow: 0px 1px 2px #000000; } -.region-selector .buttons .button.close:hover span { -} - .region-selector ul { background: #FFFFFF; width: 94%; @@ -13395,6 +13096,9 @@ ul.ui-autocomplete.ui-menu { background: #ddd; font-size: 13px; padding: 5px; + max-height: 400px; + overflow-x: hidden; + overflow-y: auto; } .multi-edit-add-list .ui-button.migrateok, @@ -13469,4 +13173,67 @@ div.button.export a { background-size: 15.5px; text-decoration: none; color: black; -} \ No newline at end of file +} + +/*jQuery UI specific stylings*/ +.ui-widget { + font-family: inherit; +} + +.ui-widget-content, +.ui-widget.ui-widget-content { + border: none; + background: inherit; +} + +.ui-dialog.ui-widget-content { + background: #FFFFFF; +} + +.ui-tabs .ui-tabs-nav { + margin-top: 42px; + display: block; + width: 100%; + height: 41px; + float: left; + border: none; + overflow: hidden; + z-index: 2; + position: relative; + background-color: inherit; + padding: 0; +} + +.ui-tabs .ui-tabs-nav.ui-corner-all { + border-bottom-left-radius: 0; +} + +.ui-tabs .ui-tabs-nav .ui-tab { + margin-right: 1px; +} + +.ui-tabs .ui-tab .ui-tabs-anchor { + float: left; + padding: 15px 10px; + min-width: 91px; + text-align: center; + font-size: 11px; + color: #4E6070; + text-decoration: none; + position: relative; +} + +.ui-tabs .ui-tab.ui-state-default { + border: 1px solid #D9D9D9; + background: #F0F0F0; +} + +.ui-tabs .ui-tab.ui-state-active { + background: #FFFFFF; +} + +.ui-tabs .ui-tab.ui-state-hover a { + text-decoration: underline; + /*color: #000000;*/ + cursor: pointer; +} diff --git a/ui/index.html b/ui/index.html index b2e5030..9e49b36 100644 --- a/ui/index.html +++ b/ui/index.html @@ -23,6 +23,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title></title> <link rel="shortcut icon" href="images/cloud.ico" /> + <link type="text/css" rel="stylesheet" href="lib/jquery-ui/css/jquery-ui.css" /> <link type="text/css" rel="stylesheet" href="lib/reset.css"/> <link type="text/css" rel="stylesheet" href="css/cloudstack3.css" /> <link type="text/css" rel="stylesheet" href="css/token-input-facebook.css" /> diff --git a/ui/lib/jquery-ui/css/jquery-ui.css b/ui/lib/jquery-ui/css/jquery-ui.css new file mode 100644 index 0000000..c6c63b0 --- /dev/null +++ b/ui/lib/jquery-ui/css/jquery-ui.css @@ -0,0 +1,1151 @@ +/*! jQuery UI - v1.12.1 - 2019-02-01 +* http://jqueryui.com +* Includes: draggable.css, selectable.css, sortable.css, core.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=base&cornerRadiusShadow=8px&offsetLeftShadow=0px&offsetTopShadow=0px&thicknessShadow=5px&opacityShadow=30&bgImgOpacityShadow=0&bgTextureShadow=flat&bgColorShadow=666666&opacityOverlay=30&bgImgOpacityOverlay=0&bgTextureOverlay=flat&bgColorOverlay=aaaaaa&iconColorError=cc0000&fcError=5f3f3f&borderColorError=f1a899&bgTextureError=flat&bgColorError=fddfdf&iconColorHighlight=777620&fcHighlight=777620&bor [...] +* Copyright jQuery Foundation and other contributors; Licensed MIT */ + +.ui-draggable-handle { + -ms-touch-action: none; + touch-action: none; +} +.ui-selectable { + -ms-touch-action: none; + touch-action: none; +} +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} +.ui-sortable-handle { + -ms-touch-action: none; + touch-action: none; +} +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { + display: none; +} +.ui-helper-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} +.ui-helper-reset { + margin: 0; + padding: 0; + border: 0; + outline: 0; + line-height: 1.3; + text-decoration: none; + font-size: 100%; + list-style: none; +} +.ui-helper-clearfix:before, +.ui-helper-clearfix:after { + content: ""; + display: table; + border-collapse: collapse; +} +.ui-helper-clearfix:after { + clear: both; +} +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; + filter:Alpha(Opacity=0); /* support: IE8 */ +} + +.ui-front { + z-index: 100; +} + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { + cursor: default !important; + pointer-events: none; +} + + +/* Icons +----------------------------------*/ +.ui-icon { + display: inline-block; + vertical-align: middle; + margin-top: -.25em; + position: relative; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; +} + +.ui-widget-icon-block { + left: 50%; + margin-left: -8px; + display: block; +} + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +.ui-accordion .ui-accordion-header { + display: block; + cursor: pointer; + position: relative; + margin: 2px 0 0 0; + padding: .5em .5em .5em .7em; + font-size: 100%; +} +.ui-accordion .ui-accordion-content { + padding: 1em 2.2em; + border-top: 0; + overflow: auto; +} +.ui-autocomplete { + position: absolute; + top: 0; + left: 0; + cursor: default; +} +.ui-menu { + list-style: none; + padding: 0; + margin: 0; + display: block; + outline: 0; +} +.ui-menu .ui-menu { + position: absolute; +} +.ui-menu .ui-menu-item { + margin: 0; + cursor: pointer; + /* support: IE10, see #8844 */ + list-style-image: url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"); +} +.ui-menu .ui-menu-item-wrapper { + position: relative; + padding: 3px 1em 3px .4em; +} +.ui-menu .ui-menu-divider { + margin: 5px 0; + height: 0; + font-size: 0; + line-height: 0; + border-width: 1px 0 0 0; +} +.ui-menu .ui-state-focus, +.ui-menu .ui-state-active { + margin: -1px; +} + +/* icon support */ +.ui-menu-icons { + position: relative; +} +.ui-menu-icons .ui-menu-item-wrapper { + padding-left: 2em; +} + +/* left-aligned */ +.ui-menu .ui-icon { + position: absolute; + top: 0; + bottom: 0; + left: .2em; + margin: auto 0; +} + +/* right-aligned */ +.ui-menu .ui-menu-icon { + left: auto; + right: 0; +} +.ui-button { + padding: .4em 1em; + display: inline-block; + position: relative; + line-height: normal; + margin-right: .1em; + cursor: pointer; + vertical-align: middle; + text-align: center; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + + /* Support: IE <= 11 */ + overflow: visible; +} + +.ui-button, +.ui-button:link, +.ui-button:visited, +.ui-button:hover, +.ui-button:active { + text-decoration: none; +} + +/* to make room for the icon, a width needs to be set here */ +.ui-button-icon-only { + width: 2em; + box-sizing: border-box; + text-indent: -9999px; + white-space: nowrap; +} + +/* no icon support for input elements */ +input.ui-button.ui-button-icon-only { + text-indent: 0; +} + +/* button icon element(s) */ +.ui-button-icon-only .ui-icon { + position: absolute; + top: 50%; + left: 50%; + margin-top: -8px; + margin-left: -8px; +} + +.ui-button.ui-icon-notext .ui-icon { + padding: 0; + width: 2.1em; + height: 2.1em; + text-indent: -9999px; + white-space: nowrap; + +} + +input.ui-button.ui-icon-notext .ui-icon { + width: auto; + height: auto; + text-indent: 0; + white-space: normal; + padding: .4em 1em; +} + +/* workarounds */ +/* Support: Firefox 5 - 40 */ +input.ui-button::-moz-focus-inner, +button.ui-button::-moz-focus-inner { + border: 0; + padding: 0; +} +.ui-controlgroup { + vertical-align: middle; + display: inline-block; +} +.ui-controlgroup > .ui-controlgroup-item { + float: left; + margin-left: 0; + margin-right: 0; +} +.ui-controlgroup > .ui-controlgroup-item:focus, +.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus { + z-index: 9999; +} +.ui-controlgroup-vertical > .ui-controlgroup-item { + display: block; + float: none; + width: 100%; + margin-top: 0; + margin-bottom: 0; + text-align: left; +} +.ui-controlgroup-vertical .ui-controlgroup-item { + box-sizing: border-box; +} +.ui-controlgroup .ui-controlgroup-label { + padding: .4em 1em; +} +.ui-controlgroup .ui-controlgroup-label span { + font-size: 80%; +} +.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item { + border-left: none; +} +.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item { + border-top: none; +} +.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content { + border-right: none; +} +.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content { + border-bottom: none; +} + +/* Spinner specific style fixes */ +.ui-controlgroup-vertical .ui-spinner-input { + + /* Support: IE8 only, Android < 4.4 only */ + width: 75%; + width: calc( 100% - 2.4em ); +} +.ui-controlgroup-vertical .ui-spinner .ui-spinner-up { + border-top-style: solid; +} + +.ui-checkboxradio-label .ui-icon-background { + box-shadow: inset 1px 1px 1px #ccc; + border-radius: .12em; + border: none; +} +.ui-checkboxradio-radio-label .ui-icon-background { + width: 16px; + height: 16px; + border-radius: 1em; + overflow: visible; + border: none; +} +.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon, +.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon { + background-image: none; + width: 8px; + height: 8px; + border-width: 4px; + border-style: solid; +} +.ui-checkboxradio-disabled { + pointer-events: none; +} +.ui-datepicker { + width: 17em; + padding: .2em .2em 0; + display: none; +} +.ui-datepicker .ui-datepicker-header { + position: relative; + padding: .2em 0; +} +.ui-datepicker .ui-datepicker-prev, +.ui-datepicker .ui-datepicker-next { + position: absolute; + top: 2px; + width: 1.8em; + height: 1.8em; +} +.ui-datepicker .ui-datepicker-prev-hover, +.ui-datepicker .ui-datepicker-next-hover { + top: 1px; +} +.ui-datepicker .ui-datepicker-prev { + left: 2px; +} +.ui-datepicker .ui-datepicker-next { + right: 2px; +} +.ui-datepicker .ui-datepicker-prev-hover { + left: 1px; +} +.ui-datepicker .ui-datepicker-next-hover { + right: 1px; +} +.ui-datepicker .ui-datepicker-prev span, +.ui-datepicker .ui-datepicker-next span { + display: block; + position: absolute; + left: 50%; + margin-left: -8px; + top: 50%; + margin-top: -8px; +} +.ui-datepicker .ui-datepicker-title { + margin: 0 2.3em; + line-height: 1.8em; + text-align: center; +} +.ui-datepicker .ui-datepicker-title select { + font-size: 1em; + margin: 1px 0; +} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { + width: 45%; +} +.ui-datepicker table { + width: 100%; + font-size: .9em; + border-collapse: collapse; + margin: 0 0 .4em; +} +.ui-datepicker th { + padding: .7em .3em; + text-align: center; + font-weight: bold; + border: 0; +} +.ui-datepicker td { + border: 0; + padding: 1px; +} +.ui-datepicker td span, +.ui-datepicker td a { + display: block; + padding: .2em; + text-align: right; + text-decoration: none; +} +.ui-datepicker .ui-datepicker-buttonpane { + background-image: none; + margin: .7em 0 0 0; + padding: 0 .2em; + border-left: 0; + border-right: 0; + border-bottom: 0; +} +.ui-datepicker .ui-datepicker-buttonpane button { + float: right; + margin: .5em .2em .4em; + cursor: pointer; + padding: .2em .6em .3em .6em; + width: auto; + overflow: visible; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { + float: left; +} + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { + width: auto; +} +.ui-datepicker-multi .ui-datepicker-group { + float: left; +} +.ui-datepicker-multi .ui-datepicker-group table { + width: 95%; + margin: 0 auto .4em; +} +.ui-datepicker-multi-2 .ui-datepicker-group { + width: 50%; +} +.ui-datepicker-multi-3 .ui-datepicker-group { + width: 33.3%; +} +.ui-datepicker-multi-4 .ui-datepicker-group { + width: 25%; +} +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { + border-left-width: 0; +} +.ui-datepicker-multi .ui-datepicker-buttonpane { + clear: left; +} +.ui-datepicker-row-break { + clear: both; + width: 100%; + font-size: 0; +} + +/* RTL support */ +.ui-datepicker-rtl { + direction: rtl; +} +.ui-datepicker-rtl .ui-datepicker-prev { + right: 2px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next { + left: 2px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-prev:hover { + right: 1px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next:hover { + left: 1px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane { + clear: right; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button { + float: left; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, +.ui-datepicker-rtl .ui-datepicker-group { + float: right; +} +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { + border-right-width: 0; + border-left-width: 1px; +} + +/* Icons */ +.ui-datepicker .ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; + left: .5em; + top: .3em; +} +.ui-progressbar { + height: 2em; + text-align: left; + overflow: hidden; +} +.ui-progressbar .ui-progressbar-value { + margin: -1px; + height: 100%; +} +.ui-progressbar .ui-progressbar-overlay { + background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmo [...] + height: 100%; + filter: alpha(opacity=25); /* support: IE8 */ + opacity: 0.25; +} +.ui-progressbar-indeterminate .ui-progressbar-value { + background-image: none; +} +.ui-selectmenu-menu { + padding: 0; + margin: 0; + position: absolute; + top: 0; + left: 0; + display: none; +} +.ui-selectmenu-menu .ui-menu { + overflow: auto; + overflow-x: hidden; + padding-bottom: 1px; +} +.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup { + font-size: 1em; + font-weight: bold; + line-height: 1.5; + padding: 2px 0.4em; + margin: 0.5em 0 0 0; + height: auto; + border: 0; +} +.ui-selectmenu-open { + display: block; +} +.ui-selectmenu-text { + display: block; + margin-right: 20px; + overflow: hidden; + text-overflow: ellipsis; +} +.ui-selectmenu-button.ui-button { + text-align: left; + white-space: nowrap; + width: 14em; +} +.ui-selectmenu-icon.ui-icon { + float: right; + margin-top: 0; +} +.ui-slider { + position: relative; + text-align: left; +} +.ui-slider .ui-slider-handle { + position: absolute; + z-index: 2; + width: 1.2em; + height: 1.2em; + cursor: default; + -ms-touch-action: none; + touch-action: none; +} +.ui-slider .ui-slider-range { + position: absolute; + z-index: 1; + font-size: .7em; + display: block; + border: 0; + background-position: 0 0; +} + +/* support: IE8 - See #6727 */ +.ui-slider.ui-state-disabled .ui-slider-handle, +.ui-slider.ui-state-disabled .ui-slider-range { + filter: inherit; +} + +.ui-slider-horizontal { + height: .8em; +} +.ui-slider-horizontal .ui-slider-handle { + top: -.3em; + margin-left: -.6em; +} +.ui-slider-horizontal .ui-slider-range { + top: 0; + height: 100%; +} +.ui-slider-horizontal .ui-slider-range-min { + left: 0; +} +.ui-slider-horizontal .ui-slider-range-max { + right: 0; +} + +.ui-slider-vertical { + width: .8em; + height: 100px; +} +.ui-slider-vertical .ui-slider-handle { + left: -.3em; + margin-left: 0; + margin-bottom: -.6em; +} +.ui-slider-vertical .ui-slider-range { + left: 0; + width: 100%; +} +.ui-slider-vertical .ui-slider-range-min { + bottom: 0; +} +.ui-slider-vertical .ui-slider-range-max { + top: 0; +} +.ui-spinner { + position: relative; + display: inline-block; + overflow: hidden; + padding: 0; + vertical-align: middle; +} +.ui-spinner-input { + border: none; + background: none; + color: inherit; + padding: .222em 0; + margin: .2em 0; + vertical-align: middle; + margin-left: .4em; + margin-right: 2em; +} +.ui-spinner-button { + width: 1.6em; + height: 50%; + font-size: .5em; + padding: 0; + margin: 0; + text-align: center; + position: absolute; + cursor: default; + display: block; + overflow: hidden; + right: 0; +} +/* more specificity required here to override default borders */ +.ui-spinner a.ui-spinner-button { + border-top-style: none; + border-bottom-style: none; + border-right-style: none; +} +.ui-spinner-up { + top: 0; +} +.ui-spinner-down { + bottom: 0; +} +.ui-tabs { + position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ + padding: .2em; +} +.ui-tabs .ui-tabs-nav { + margin: 0; + padding: .2em .2em 0; +} +.ui-tabs .ui-tabs-nav li { + list-style: none; + float: left; + position: relative; + top: 0; + margin: 1px .2em 0 0; + border-bottom-width: 0; + padding: 0; + white-space: nowrap; +} +.ui-tabs .ui-tabs-nav .ui-tabs-anchor { + float: left; + padding: .5em 1em; + text-decoration: none; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active { + margin-bottom: -1px; + padding-bottom: 1px; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor, +.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor, +.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor { + cursor: text; +} +.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor { + cursor: pointer; +} +.ui-tabs .ui-tabs-panel { + display: block; + border-width: 0; + padding: 1em 1.4em; + background: none; +} +.ui-tooltip { + padding: 8px; + position: absolute; + z-index: 9999; + max-width: 300px; +} +body .ui-tooltip { + border-width: 2px; +} + +/* Component containers +----------------------------------*/ +.ui-widget { + font-family: Arial,Helvetica,sans-serif; + font-size: 1em; +} +.ui-widget .ui-widget { + font-size: 1em; +} +.ui-widget input, +.ui-widget select, +.ui-widget textarea, +.ui-widget button { + font-family: Arial,Helvetica,sans-serif; + font-size: 1em; +} +.ui-widget.ui-widget-content { + border: 1px solid #c5c5c5; +} +.ui-widget-content { + border: 1px solid #dddddd; + background: #ffffff; + color: #333333; +} +.ui-widget-content a { + color: #333333; +} +.ui-widget-header { + border: 1px solid #dddddd; + background: #e9e9e9; + color: #333333; + font-weight: bold; +} +.ui-widget-header a { + color: #333333; +} + +/* Interaction states +----------------------------------*/ +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default, +.ui-button, + +/* We use html here because we need a greater specificity to make sure disabled +works properly when clicked or hovered */ +html .ui-button.ui-state-disabled:hover, +html .ui-button.ui-state-disabled:active { + border: 1px solid #c5c5c5; + background: #f6f6f6; + font-weight: normal; + color: #454545; +} +.ui-state-default a, +.ui-state-default a:link, +.ui-state-default a:visited, +a.ui-button, +a:link.ui-button, +a:visited.ui-button, +.ui-button { + color: #454545; + text-decoration: none; +} +.ui-state-hover, +.ui-widget-content .ui-state-hover, +.ui-widget-header .ui-state-hover, +.ui-state-focus, +.ui-widget-content .ui-state-focus, +.ui-widget-header .ui-state-focus, +.ui-button:hover, +.ui-button:focus { + border: 1px solid #cccccc; + background: #ededed; + font-weight: normal; + color: #2b2b2b; +} +.ui-state-hover a, +.ui-state-hover a:hover, +.ui-state-hover a:link, +.ui-state-hover a:visited, +.ui-state-focus a, +.ui-state-focus a:hover, +.ui-state-focus a:link, +.ui-state-focus a:visited, +a.ui-button:hover, +a.ui-button:focus { + color: #2b2b2b; + text-decoration: none; +} + +.ui-visual-focus { + box-shadow: 0 0 3px 1px rgb(94, 158, 214); +} +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active, +a.ui-button:active, +.ui-button:active, +.ui-button.ui-state-active:hover { + border: 1px solid #003eff; + background: #007fff; + font-weight: normal; + color: #ffffff; +} +.ui-icon-background, +.ui-state-active .ui-icon-background { + border: #003eff; + background-color: #ffffff; +} +.ui-state-active a, +.ui-state-active a:link, +.ui-state-active a:visited { + color: #ffffff; + text-decoration: none; +} + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + border: 1px solid #dad55e; + background: #fffa90; + color: #777620; +} +.ui-state-checked { + border: 1px solid #dad55e; + background: #fffa90; +} +.ui-state-highlight a, +.ui-widget-content .ui-state-highlight a, +.ui-widget-header .ui-state-highlight a { + color: #777620; +} +.ui-state-error, +.ui-widget-content .ui-state-error, +.ui-widget-header .ui-state-error { + border: 1px solid #f1a899; + background: #fddfdf; + color: #5f3f3f; +} +.ui-state-error a, +.ui-widget-content .ui-state-error a, +.ui-widget-header .ui-state-error a { + color: #5f3f3f; +} +.ui-state-error-text, +.ui-widget-content .ui-state-error-text, +.ui-widget-header .ui-state-error-text { + color: #5f3f3f; +} +.ui-priority-primary, +.ui-widget-content .ui-priority-primary, +.ui-widget-header .ui-priority-primary { + font-weight: bold; +} +.ui-priority-secondary, +.ui-widget-content .ui-priority-secondary, +.ui-widget-header .ui-priority-secondary { + opacity: .7; + filter:Alpha(Opacity=70); /* support: IE8 */ + font-weight: normal; +} +.ui-state-disabled, +.ui-widget-content .ui-state-disabled, +.ui-widget-header .ui-state-disabled { + opacity: .35; + filter:Alpha(Opacity=35); /* support: IE8 */ + background-image: none; +} +.ui-state-disabled .ui-icon { + filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */ +} + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + width: 16px; + height: 16px; +} +.ui-icon, +.ui-widget-content .ui-icon { + background-image: url("images/ui-icons_444444_256x240.png"); +} +.ui-widget-header .ui-icon { + background-image: url("images/ui-icons_444444_256x240.png"); +} +.ui-state-hover .ui-icon, +.ui-state-focus .ui-icon, +.ui-button:hover .ui-icon, +.ui-button:focus .ui-icon { + background-image: url("images/ui-icons_555555_256x240.png"); +} +.ui-state-active .ui-icon, +.ui-button:active .ui-icon { + background-image: url("images/ui-icons_ffffff_256x240.png"); +} +.ui-state-highlight .ui-icon, +.ui-button .ui-state-highlight.ui-icon { + background-image: url("images/ui-icons_777620_256x240.png"); +} +.ui-state-error .ui-icon, +.ui-state-error-text .ui-icon { + background-image: url("images/ui-icons_cc0000_256x240.png"); +} +.ui-button .ui-icon { + background-image: url("images/ui-icons_777777_256x240.png"); +} + +/* positioning */ +.ui-icon-blank { background-position: 16px 16px; } +.ui-icon-caret-1-n { background-position: 0 0; } +.ui-icon-caret-1-ne { background-position: -16px 0; } +.ui-icon-caret-1-e { background-position: -32px 0; } +.ui-icon-caret-1-se { background-position: -48px 0; } +.ui-icon-caret-1-s { background-position: -65px 0; } +.ui-icon-caret-1-sw { background-position: -80px 0; } +.ui-icon-caret-1-w { background-position: -96px 0; } +.ui-icon-caret-1-nw { background-position: -112px 0; } +.ui-icon-caret-2-n-s { background-position: -128px 0; } +.ui-icon-caret-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -65px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -65px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 1px -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-on { background-position: -96px -144px; } +.ui-icon-radio-off { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, +.ui-corner-top, +.ui-corner-left, +.ui-corner-tl { + border-top-left-radius: 3px; +} +.ui-corner-all, +.ui-corner-top, +.ui-corner-right, +.ui-corner-tr { + border-top-right-radius: 3px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-left, +.ui-corner-bl { + border-bottom-left-radius: 3px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-right, +.ui-corner-br { + border-bottom-right-radius: 3px; +} + +/* Overlays */ +.ui-widget-overlay { + background: #aaaaaa; + opacity: .3; + filter: Alpha(Opacity=30); /* support: IE8 */ +} +.ui-widget-shadow { + -webkit-box-shadow: 0px 0px 5px #666666; + box-shadow: 0px 0px 5px #666666; +} diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index de8f472..bc128d5 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -2405,7 +2405,7 @@ $userDataL2.hide(); $supportedServices.css('display', 'inline-block'); if ($useVpcCb.is(':checked')) { //if useVpc is checked, - $useVpcCb.removeAttr("checked"); //remove "checked" attribute in useVpc + $useVpcCb.prop("checked", false); //remove "checked" attribute in useVpc } $conservemode.css('display', 'inline-block'); } else if ($guestTypeField.val() == 'Isolated') { //Isolated network offering diff --git a/ui/scripts/roles.js b/ui/scripts/roles.js index 01700df..59072bd 100644 --- a/ui/scripts/roles.js +++ b/ui/scripts/roles.js @@ -328,7 +328,10 @@ } }); var setupAutocompletion = function() { - $($.find('input[name="rule"]')).autocomplete("destroy"); + var $target = $($.find('input[name="rule"]')); + if ($target.hasClass('ui-autocomplete')) { + $target.autocomplete('destroy'); + } $($.find('input[name="rule"]')).autocomplete({ source: apiList, autoFocus:true diff --git a/ui/scripts/system.js b/ui/scripts/system.js index e721581..9720e48 100755 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1655,7 +1655,7 @@ desc: 'message.restart.network', preFilter: function (args) { if (selectedZoneObj.networktype == "Basic") { - args.$form.find('.form-item[rel=cleanup]').find('input').removeAttr('checked'); + args.$form.find('.form-item[rel=cleanup]').find('input').prop('checked', false); //unchecked args.$form.find('.form-item[rel=cleanup]').hide(); //hidden @@ -20312,7 +20312,7 @@ $form.find('.form-item[rel=maxerrorretry]').hide(); $form.find('.form-item[rel=sockettimeout]').hide(); - $form.find('.form-item[rel=createNfsCache]').find('input').removeAttr('checked'); + $form.find('.form-item[rel=createNfsCache]').find('input').prop('checked', false); $form.find('.form-item[rel=createNfsCache]').hide(); $form.find('.form-item[rel=nfsCacheZoneid]').hide(); $form.find('.form-item[rel=nfsCacheNfsServer]').hide(); @@ -20345,7 +20345,7 @@ $form.find('.form-item[rel=maxerrorretry]').hide(); $form.find('.form-item[rel=sockettimeout]').hide(); - $form.find('.form-item[rel=createNfsCache]').find('input').removeAttr('checked'); + $form.find('.form-item[rel=createNfsCache]').find('input').prop('checked', false); $form.find('.form-item[rel=createNfsCache]').hide(); $form.find('.form-item[rel=nfsCacheZoneid]').hide(); $form.find('.form-item[rel=nfsCacheNfsServer]').hide(); @@ -20413,7 +20413,7 @@ $form.find('.form-item[rel=maxerrorretry]').hide(); $form.find('.form-item[rel=sockettimeout]').hide(); - $form.find('.form-item[rel=createNfsCache]').find('input').removeAttr('checked'); + $form.find('.form-item[rel=createNfsCache]').find('input').prop('checked', false); $form.find('.form-item[rel=createNfsCache]').hide(); $form.find('.form-item[rel=nfsCacheZoneid]').hide(); $form.find('.form-item[rel=nfsCacheNfsServer]').hide(); diff --git a/ui/scripts/ui-custom/instanceWizard.js b/ui/scripts/ui-custom/instanceWizard.js index 9b41e35..a219c69 100644 --- a/ui/scripts/ui-custom/instanceWizard.js +++ b/ui/scripts/ui-custom/instanceWizard.js @@ -1366,13 +1366,14 @@ var wizardDialog = $wizard.dialog({ title: _l('label.vm.add'), width: 896, - height: 570, - closeOnEscape: false + minHeight: 600, + height: 'auto', + closeOnEscape: false, + modal: true }); var wizardDialogDiv = wizardDialog.closest('.ui-dialog'); - wizardDialogDiv.css('z-index', 5001); - - $('button.ui-dialog-titlebar-close').remove() + + $('button.ui-dialog-titlebar-close').remove(); return wizardDialogDiv.overlay(); }; diff --git a/ui/scripts/ui/widgets/toolTip.js b/ui/scripts/ui/widgets/toolTip.js index 6e11e32..65a0550 100644 --- a/ui/scripts/ui/widgets/toolTip.js +++ b/ui/scripts/ui/widgets/toolTip.js @@ -165,7 +165,7 @@ // Fix overlay setTimeout(function() { - $('.tooltip-box').css( "zIndex", $(':ui-dialog').css("zIndex") + 10); + $('.tooltip-box').css( "zIndex", 10000); }); }; diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 856b909..a0a22ee 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -3339,7 +3339,7 @@ } }); if (zoneObj.networktype == "Basic") { - args.$form.find('.form-item[rel=cleanup]').find('input').removeAttr('checked'); //unchecked + args.$form.find('.form-item[rel=cleanup]').find('input').prop('checked', false); //unchecked args.$form.find('.form-item[rel=cleanup]').hide(); //hidden } else { args.$form.find('.form-item[rel=cleanup]').find('input').attr('checked', 'checked'); //checked diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js index 7373ea6..5b7c25f 100755 --- a/ui/scripts/zoneWizard.js +++ b/ui/scripts/zoneWizard.js @@ -963,10 +963,10 @@ if ($(this).val() == "VMware") { if (dvSwitchEnabled) { $form.find('.form-item[rel=overridepublictraffic]').css('display', 'inline-block'); - $form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').removeAttr('checked'); + $form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').prop('checked', false); $form.find('.form-item[rel=overrideguesttraffic]').css('display', 'inline-block'); - $form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').removeAttr('checked'); + $form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').prop('checked', false); } else { $form.find('.form-item[rel=overridepublictraffic]').css('display', 'none'); $form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none'); @@ -984,10 +984,10 @@ } } else if ($(this).val() == "Ovm3") { $form.find('.form-item[rel=ovm3pool]').css('display', 'inline-block'); - $form.find('.form-item[rel=ovm3pool]').find('input[type=checkbox]').removeAttr('checked'); + $form.find('.form-item[rel=ovm3pool]').find('input[type=checkbox]').prop('checked', false); $form.find('.form-item[rel=ovm3cluster]').css('display', 'inline-block'); - $form.find('.form-item[rel=ovm3cluster]').find('input[type=checkbox]').removeAttr('checked'); + $form.find('.form-item[rel=ovm3cluster]').find('input[type=checkbox]').prop('checked', false); $form.find('[rel=ovm3vip]').css('display', 'block'); } else { $form.find('.form-item[rel=overridepublictraffic]').css('display', 'none'); @@ -1948,7 +1948,7 @@ $fields.filter('[rel=sockettimeout]').hide(); $fields.filter('[rel=createNfsCache]').hide(); - $fields.filter('[rel=createNfsCache]').find('input').removeAttr('checked'); + $fields.filter('[rel=createNfsCache]').find('input').prop('checked', false); $fields.filter('[rel=nfsCacheNfsServer]').hide(); $fields.filter('[rel=nfsCachePath]').hide(); @@ -1981,7 +1981,7 @@ $fields.filter('[rel=sockettimeout]').hide(); $fields.filter('[rel=createNfsCache]').hide(); - $fields.filter('[rel=createNfsCache]').find('input').removeAttr('checked'); + $fields.filter('[rel=createNfsCache]').find('input').prop('checked', false); $fields.filter('[rel=nfsCacheNfsServer]').hide(); $fields.filter('[rel=nfsCachePath]').hide(); @@ -2014,7 +2014,7 @@ $fields.filter('[rel=sockettimeout]').hide(); $fields.filter('[rel=createNfsCache]').hide(); - $fields.filter('[rel=createNfsCache]').find('input').removeAttr('checked'); + $fields.filter('[rel=createNfsCache]').find('input').prop('checked', false); $fields.filter('[rel=nfsCacheNfsServer]').hide(); $fields.filter('[rel=nfsCachePath]').hide(); @@ -2099,7 +2099,7 @@ $fields.filter('[rel=sockettimeout]').hide(); $fields.filter('[rel=createNfsCache]').hide(); - $fields.filter('[rel=createNfsCache]').find('input').removeAttr('checked'); + $fields.filter('[rel=createNfsCache]').find('input').prop('checked', false); $fields.filter('[rel=nfsCacheNfsServer]').hide(); $fields.filter('[rel=nfsCachePath]').hide();