http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/styles/modal_popups.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/modal_popups.less b/ambari-web/app/styles/modal_popups.less index 48c02b5..1125c2a 100644 --- a/ambari-web/app/styles/modal_popups.less +++ b/ambari-web/app/styles/modal_popups.less @@ -17,6 +17,105 @@ */ @import 'common.less'; +#modal { + outline: none; +} + +.host-component-popup-wrap { + .task-top-wrap { + .operation-name-top { + width: 36%; + padding-left: 20px; + float: left; + text-align: left; + } + } + #service-info{ + .show-more { + width: 98.8%; + min-height: 20px; + cursor: pointer; + border-top: 1px solid #CCC; + text-align: center; + padding: 10px 10px 10px 0; + font-size: 16px; + } + } + + #host-info, #service-info{ + overflow: auto; + width: 100%; + max-height: 340px; + &.scheduled{ + max-height: 255px; + } + .col-md-2{ + width:20%; + float: left; + } + .host-progress-num{ + float: left; + padding-left: 8px; + } + .host-name-icon-wrap{ + float: left; + width: 50%; + white-space: nowrap; + } + } + #host-info, #service-info, #host-log { + .log-list-wrap { + cursor: pointer; + padding: 10px 10px 10px 20px; + border-top: 1px solid #CCC; + border-bottom: 1px solid #CCC; + } + .task-list-line-cursor{ + width: 100%; + min-height: 20px; + .progress-wrapper{ + .progress{ + margin-bottom: 0; + } + } + .show-details { + float: right; + cursor: pointer; + font-size: 16px; + i { + color: #333; + } + } + .operation-name-icon-wrap { + float: left; + width: 35%; + } + .start-time-text { + margin-left: 5px; + width: 20%; + float: left; + } + .duration-text { + margin-left: 5px; + width: 10%; + float: left; + } + .time-summary { + padding-left: 0; + color: #808080; + font-size: 12px; + } + } + .task-list-line-cursor:before,.task-list-line-cursor:after { + display: table; + line-height: 0; + content: ""; + } + .task-list-line-cursor:after { + clear: both; + } + } +} .modal { top: 5%; @@ -90,30 +189,9 @@ /*60% width modal window start*/ .modal-edit-widget { - .modal-header{ - min-width: 650px; - } - .modal-footer{ - min-width: 650px; - } - .modal-body { - max-height: 403px; - min-width: 650px; - - #slider-range { - margin-top: 40px; - margin-bottom: 20px; - margin-left: 38px; - max-width: 630px; - max-height: 15px; - } - #min-height-limit .col-md-9{ - min-height: 15px; - } - #min-height-limit .progress{ - margin-left: 40px; + .progress { .bar-success { background-image: linear-gradient(to bottom, @health-status-green, @health-status-green); background-repeat: repeat-x; @@ -131,35 +209,20 @@ } } - .value-on-slider{ - max-height: 100px; - margin-bottom: 40px; - margin-top: 10px; - text-align: center; - } - #slider-value1{ - max-width: 65px; - } - #slider-value2{ - max-width: 250px; - } - #slider-value3{ - max-width: 250px; - } - #slider-value4{ - max-width: 65px; + .value-on-slider { + margin-top: 30px; } .slider-error { color: #b94a48; .help-block { color: #b94a48; } - } - .slider-error input{ - border-color: #b94a48; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + input{ + border-color: #b94a48; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + } } } } @@ -259,7 +322,6 @@ /* modal fill screen popup */ - .full-height-modal { // padding from the top and bottom for full-height popup of window @modal-padding: 40px; @@ -292,8 +354,12 @@ } } - .host-progress-popup { + #service-info, #host-info, #host-log { + .log-list-wrap:hover { + background-color: #e6e6e6; + } + } .task-detail-info { .task-detail-log-info { @@ -361,3 +427,33 @@ } } } + +.modal-graph-line { + .modal-dialog { + width: 810px; + } + .modal-body { + min-height: 450px !important; + overflow: hidden; + .corner-icon { + position: absolute; + right: 15px; + text-decoration: none; + .glyphicon-save { + color: #555; + } + } + .export-graph-list { + top: auto; + right: 15px; + } + } +} + +.modal-body { + .api-error { + max-height: 403px; + word-wrap:break-word; + overflow: auto; + } +} \ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/styles/timepicker-overrides.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/timepicker-overrides.less b/ambari-web/app/styles/timepicker-overrides.less new file mode 100644 index 0000000..98d02a0 --- /dev/null +++ b/ambari-web/app/styles/timepicker-overrides.less @@ -0,0 +1,59 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@import 'common.less'; + +.ui-timepicker-div .ui-widget-header { + margin-bottom: 8px; +} + +.ui-timepicker-div dl { + text-align: left; +} + +.ui-timepicker-div dl dt { + height: 25px; + margin-bottom: -25px; +} + +.ui-timepicker-div dl dd { + margin: 0 10px 10px 65px; +} + +.ui-timepicker-div td { + font-size: 90%; +} + +.ui-tpicker-grid-label { + background: none; + border: none; + margin: 0; + padding: 0; +} + +.ui-timepicker-rtl { + direction: rtl; +} + +.ui-timepicker-rtl dl { + text-align: right; +} + +.ui-timepicker-rtl dl dd { + margin: 0 65px 10px 10px; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/styles/top-nav.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/top-nav.less b/ambari-web/app/styles/top-nav.less new file mode 100644 index 0000000..3dcd298 --- /dev/null +++ b/ambari-web/app/styles/top-nav.less @@ -0,0 +1,212 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@import 'common.less'; + +#top-nav { + + .navbar.navbar-static-top { + background-image: -moz-linear-gradient(top, @top-nav-bg-color-from, @top-nav-bg-color-to); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@top-nav-bg-color-from), to(@top-nav-bg-color-to)); + background-image: -webkit-linear-gradient(top, @top-nav-bg-color-from, @top-nav-bg-color-to); + background-image: -o-linear-gradient(top, @top-nav-bg-color-from, @top-nav-bg-color-to); + background-image: linear-gradient(to bottom, @top-nav-bg-color-from, @top-nav-bg-color-to); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr= @top-nav-bg-color-from, endColorstr=@top-nav-bg-color-to); //for IE9- + box-shadow: inset 0 0 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1); + + .navbar-text.brand-wrapper { + color: @top-nav-brand-color; + font-size: 16px; + font-weight: normal; + text-shadow: 0 1px 0 #555; + + a, a:hover, a:active, a:visited { + color: @top-nav-brand-color; + text-decoration: none; + } + .ambari-link { + margin-left: 25px; + } + .label { + color: @top-nav-ops-count-color; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: @top-nav-ops-count-bg-color; + &.operations-count { + .infoPulse(); + } + &.alert-crit-count { + background-color: @health-status-red; + } + &.alert-warn-count { + background-color: @health-status-orange; + } + &.alerts-none-count { + cursor: default; + } + } + .icon-caret-left { + color: @top-nav-ops-count-bg-color; + margin-right: -1px; + text-shadow: none; + } + .ops-count { + margin-right: -1px; + color: #006DCC; + .infoPulseInner(); + } + } + a:hover { + text-decoration: none; + } + + .logo { + img { + height: 32px; + width: 32px; + position: absolute; + top: 8px; + } + } + + .alerts-label { + margin-left: 5px; + display: inline-block; + } + + .icon-caret-left { + color: @top-nav-ops-count-bg-color; + margin-right: -1px; + text-shadow: none; + } + + .cluster-name { + margin-left: 20px; + } + + .top-nav-menu.nav { + padding-right: 20px; + li > a { + text-shadow: none; + color: @top-nav-menu-text-color; + text-align: center; + white-space: nowrap; + } + .active > a, .active > a:hover, .active > a:focus { + color: @top-nav-menu-active-text-color; + background-color: @top-nav-menu-active-bg-color; + box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125); + } + li > a:focus, li > a:hover { + color: @top-nav-menu-text-hover-color; + text-decoration: none; + background-color: transparent; + } + .glyphicon-th { + font-size: 1.1em; + } + + li.top-nav-dropdown { + position: relative; + } + .top-nav-dropdown:hover .top-nav-dropdown-menu { + display: block; + } + .top-nav-dropdown-menu { + display: none; + position: absolute; + top: 95%; + left: 0; + z-index: 1000; + float: left; + min-width: 220px; + width: 220px; + padding: 5px 0; + margin: 2px 0 0; + list-style: none; + background-color: @top-nav-menu-dropdown-bg-color; + border: 3px solid @top-nav-menu-dropdown-border-color; + box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); + -webkit-background-clip: padding-box; + -moz-background-clip: padding; + background-clip: padding-box; + .alerts-count { + margin-right: 5px; + } + } + .top-nav-dropdown-menu > li{ + position: relative; + } + .top-nav-dropdown-menu > li > a { + text-decoration: none; + text-align: left; + display: block; + padding: 3px 0 3px 5px; + color: @top-nav-menu-dropdown-text-color; + white-space: nowrap; + .glyphicon-health-block > span:before { + line-height: 20px; + } + } + .top-nav-dropdown-menu > li.active > a{ + background-color: #e5e5e5; + } + .top-nav-dropdown-menu > li > a:hover { + color: #fff; + background-color: #666; + background-image: linear-gradient(to bottom, #666, #555); + background-repeat: repeat-x; + } + .top-nav-dropdown-menu > li.disabled > a { + color: #a9a9a9; + cursor: default; + } + .top-nav-dropdown-menu > li.disabled > a:hover { + color: #a9a9a9; + background-color: @top-nav-menu-dropdown-bg-color; + background-image: none; + } + } + } + + .navbar .nav .top-nav-user .active > a, + .navbar .nav .top-nav-user .active > a:hover { + color: #fff; + text-decoration: none; + } + + .navbar .nav .top-nav-user > li > a { + border-radius: 8px; + font-size: 13px; + font-weight: bold; + margin: 1px 10px 2px 0; + padding: 7px 14px; + text-decoration: none; + text-shadow: none; + } + + .navbar .nav .top-nav-user > li > a:hover { + background-color: transparent; + color: #999; + text-decoration: none; + } + + .navbar .nav .top-nav-user > li.right { + float: right; + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/styles/wizard.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/wizard.less b/ambari-web/app/styles/wizard.less new file mode 100644 index 0000000..005bd0c --- /dev/null +++ b/ambari-web/app/styles/wizard.less @@ -0,0 +1,611 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +@import 'common.less'; + +#enable_security { + .step3 { + overflow: auto; + max-height: 500px; + table td { + word-break: break-all; + } + } +} + + +.wizard { + + .btn-extra-info{ + padding-top: 6px; + padding-right: 15px; + } + .btn-area { + margin-top: 20px; + .btn.btn-info { + margin-right: 10px; + } + } + .wizard-content { + .panel.panel-default.panel-internal { + border: 1px solid #ddd; + } + padding: 25px; + background-color: #fff; + + #get-started label{ + font-weight: normal; + } + } + + .mbm { + margin-top: 0; + } + + #installOptions { + .ssh-user, .ssh-port { + padding-top: 5px; + } + + #sshKey { + color: #000; + font-family: "Courier New","courier"; + font-size: 0.9em; + } + input[type="radio"]:focus { + outline: none; + } + } + #confirm-hosts { + + .page-bar { + border: none; + } + + table { + margin-bottom: 0; + th { + input[type="checkbox"] { + //fixes height discrepencies in IE + margin-bottom: -1px; + margin-top: -1px; + } + } + .tinyspan { + width: 2%; + float: none; + } + } + + #host-filter { + + ul { + margin: 3px; + font-size: 12px; + li.filter-status.active a { + text-decoration: none; + color: #fff; + } + li.filter-status.active, + li.filter-status.active:hover { + background-color: #666; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + border-radius: 5px; + } + li.filter-status:hover { + background-color: #d8d8d8; + border-radius: 5px; + } + li.divider { + color: #666; + padding: 4px 2px; + } + li { + list-style: none; + display: block; + float: left; + padding: 4px; + a { + text-decoration: underline; + } + } + li.first { + font-weight: bold; + } + } + } + .progress { + margin-bottom: 0; + } + #confirm-hosts-table { + td.host { + max-width: 290px; + } + td.host .trim_hostname { + max-width: 97% !important; + display: block; + overflow: hidden; + text-overflow: ellipsis; + float:left; + white-space: nowrap; + } + } + } + #step4, #step5, #step6 { + a.selected { + color: #333; + cursor: default; + text-decoration: none !important; + } + .checkbox { + margin-top: 0; + margin-bottom: 5px; + } + .glyphicon-asterisks { + color: #00688B; + } + } + #step6 { + .pre-scrollable { + max-height: 440px; + position: relative; + #component_assign_table { + tbody td, th { + white-space: nowrap; + } + .trim_hostname { + max-width: 180px; + float:left; + white-space: nowrap; + display: block; + overflow: hidden; + text-overflow: ellipsis; + } + .checkbox { + margin: 0; + } + } + } + .spinner-overlay { + position: absolute; + width: 100%; + height: 100%; + background-color: #808080; + opacity: 0.2; + } + } + #deploy { + + .page-bar { + border: none; + } + .pre-scrollable { + max-height: 750px; + } + table { + margin-bottom: 0; + } + #host-filter { + margin-top: 1px; + ul { + margin: 3px; + font-size: 12px; + li.filter-status.active a { + text-decoration: none; + color: #fff; + } + li.filter-status.active, + li.filter-status.active:hover { + background-color: #666; + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + border-radius: 5px; + } + li.filter-status:hover { + background-color: #d8d8d8; + border-radius: 5px; + } + li.divider { + color: #666; + padding: 4px 2px; + } + li { + list-style: none; + display: block; + float: left; + padding: 4px; + a { + text-decoration: underline; + } + } + li.first { + font-weight: bold; + } + } + } + + #deploy-status-by-host { + margin-bottom: 0; + th.host { + width: 40%; + } + th.status { + width: 22%; + } + th.messgage { + width: 35%; + } + td.host { + max-width: 290px; + } + td.host .trim_hostname { + max-width: 97% !important; + display: block; + overflow: hidden; + text-overflow: ellipsis; + float:left; + white-space: nowrap; + } + .progress-wrapper { + width: 73%; + .progress { + margin-bottom: 0; + } + } + .progress-percentage { + margin-left: 5px; + width: 20% - 10px; + } + } + } + #step14 { + .item { + line-height: 30px; + i { + font-size: 20px; + } + } + .row { + margin-left: 0; + } + } + #common-progress-page { + .item { + line-height: 40px; + width:100%; + float:left; + + i { + font-size: 20px; + } + .active-link{ + a{ + pointer-events: auto; + color: #0088cc; + cursor: pointer; + } + } + .active-text{ + a{ + pointer-events: none; + text-decoration: none; + color: #0088cc; + cursor: auto; + } + } + .retry { + cursor: pointer; + margin-left: 15px; + i { + font-size: 14px; + } + } + .pull-left{ + float: left; + } + .progress-wrapper{ + margin-top: 10px; + + .progress{ + margin-bottom: 0; + } + } + + } + .row { + margin-left: 0; + } + } + #ha-step1, #ha-step4, #ha-step8, #mjn-step7 { + .alert.alert-warn { + margin-top: 10px; + margin-bottom: 10px; + } + .nameserviceid-input { + display: inline-block; + } + } + + #ha-step4 li, #ha-step6 li, #ha-step8 li, #mjn-step7 li { + margin-top: 8px; + } + + #ha-step3-review-table, #manage-journal-node-step2-review-table { + td { + text-align: left; + vertical-align: top; + padding: 5px; + ul { + margin: 0; + } + li { + list-style-type: none; + } + } + .to-be-disabled-red { + color: #ff0000; + } + .to-be-installed-green { + color: #008000; + } + } +} + +/*assign masters*/ + +.assign-masters { + .select-hosts { + white-space: nowrap; + .help-block { + white-space: normal; + } + } + + label.host-name { + padding-top: 5px; + } + + .remaining-hosts { + padding: 25px; + border-top: solid 1px #ccc; + border-left: solid 1px #ccc; + border-right: groove 5px #ccc; + border-bottom: groove 5px #ccc; + margin-top: 20px; + background-color: #FCF8E3; + color: #C09853; + } + + .host-assignments .mapping-box { + border: solid 1px #ccc; + padding: 8px; + margin-bottom: 10px; + background-color: #fafafa; + } + + .host-assignments { + .service-component { + white-space: nowrap; + font-size: 0.9em; + display: inline-block; + margin: 2px; + } + .new-service { + background-color: @green; + } + } + + .host-assignments .grey { + background-color: #808080; + border: solid 1px #000; + } + + .form-horizontal .control-label { + white-space: normal; + width: 120px; + padding-right: 10px; + } + + .form-horizontal .control-group select { + width: 85%; + min-width: 100px; + max-width: 250px; + } + + .hostName { + word-wrap: break-word!important; + white-space: normal; + width: 220px; + line-height: 30px; + display: inline-block; + } + .hostString { + margin-bottom: 5px; + word-wrap: break-word; + } + + .badge { + background-color: @green; + color: #fff; + cursor: pointer; + font-weight: bold; + text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); + } + + .badge:hover { + background-color: @green; + } + + .alertFlag { + font-size: 1.3em; + color: #B94A48; + font-weight: bold; + vertical-align: middle; + } + + .additional-hosts-list { + margin-bottom: 15px; + .host-cell { + line-height: 30px; + } + } +} + + +#add-host .back { + display: block; + width: 105px; + margin-bottom: 10px; +} + +#add-service .back { + display: block; + width: 130px; + margin-bottom: 10px; +} + +#step8-content { + ul { + li { + list-style: none; + } + } + max-height: 440px; +} + +.log_popup { + .bar { + -webkit-transition: width 0.0s ease; + -moz-transition: width 0.0s ease; + -ms-transition: width 0.0s ease; + -o-transition: width 0.0s ease; + transition: width 0.0s ease; + } +} + +#step10-content { + ul { + li { + list-style: none; + } + } + max-height: 440px; +} + +#select-stack .stack-version-selection{ + .select-version-label { + padding: 5px 25px; + } + .right-stack-info { + margin-left: 0; + .available-repos-dropdown { + a, a.disbled{ + cursor: pointer; + } + a.disabled{ + color: #999; + background: none; + } + } + } +} +#select-stack .stack-version-selection.disabled{ + .select-version-label { + color: #999; + } +} + +#select-stack { + .big-radio { + &.disabled>span{ + opacity: 0.7; + } + } + #public-disabled-link { + margin-left: 10px; + font-weight: normal; + cursor: pointer; + } +} + +#select-stack { + .panel-heading { + font-weight: bold; + p { + margin-bottom: 0; + display: block; + } + } + .details-panel .patch-icon { + color: #ff4500; + } + .details-panel .version-contents-section { + border: 1px solid #ddd; + max-height: 200px; + overflow: auto; + margin: 8px 0; + .table { + margin-bottom: 0; + tr:first-child td { + border-top: none; + } + } + } + .repos-panel { + .remove-icon { + color: red; + margin: 20px 0 0 0; + padding: 0; + text-align: center; + cursor: pointer; + &.disabled { + color: grey; + } + } + .repos-inner-table { + margin-bottom: 0; + background-color: transparent; + } + .repo-url input { + width: 90%; + height: 24px; + } + #skip-validation, #use-redhat { + span.disabled { + opacity: 0.7; + } + } + } +} + +@media all and (max-width: 2560px) { + .wizard-content { + #serviceConfig { + .nav-tabs { + margin-bottom: 20px; + } + .alert { + padding-right: 10px!important; + } + } + .filter-combobox { + > input { + width: 115px!important; + } + } + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/application.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/application.hbs b/ambari-web/app/templates/application.hbs index 4da11fc..cf3e561 100644 --- a/ambari-web/app/templates/application.hbs +++ b/ambari-web/app/templates/application.hbs @@ -24,7 +24,7 @@ <div id="top-nav"> <nav class="navbar navbar-default navbar-static-top"> <div class="container main-container"> - <div class="navbar-header"> + <div class="navbar-header navbar-nav"> {{#if enableLinks}} <a {{translateAttr href="topnav.logo.href"}} class="navbar-brand logo"> <img src="/img/logo-white.png" alt="Apache Ambari" title="Apache Ambari"> @@ -33,7 +33,7 @@ <a class="logo"><img src="/img/logo-white.png" alt="Apache Ambari" title="Apache Ambari"></a> {{/if}} </div> - <p class="navbar-text brand-wrapper"> + <p class="navbar-text navbar-nav brand-wrapper"> {{#if enableLinks}} <a {{translateAttr href="topnav.logo.href"}} class="ambari-link" title="Apache Ambari">{{t app.name}}</a> {{! cluster name }} @@ -70,7 +70,7 @@ {{/if}} {{! alerts label end }} {{else}} - <a title="Apache Ambari">{{t app.name}}</a> + <a title="Apache Ambari" class="ambari-link">{{t app.name}}</a> {{/if}} </p> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/common/host_progress_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs index 0a7592b..2123f0a 100644 --- a/ambari-web/app/templates/common/host_progress_popup.hbs +++ b/ambari-web/app/templates/common/host_progress_popup.hbs @@ -155,6 +155,7 @@ <div class="select-wrap tasks-list-select"> {{t common.show}}: {{view Ember.Select + class="form-control" contentBinding="view.categories" optionValuePath="content.value" optionLabelPath="content.label" http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/common/modal_popups/select_groups_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/modal_popups/select_groups_popup.hbs b/ambari-web/app/templates/common/modal_popups/select_groups_popup.hbs index 39e23b7..c7da8a4 100644 --- a/ambari-web/app/templates/common/modal_popups/select_groups_popup.hbs +++ b/ambari-web/app/templates/common/modal_popups/select_groups_popup.hbs @@ -22,10 +22,8 @@ <div class="col-sm-8"> {{#if view.hasGroups}} {{view Ember.Select contentBinding="view.groups" valueBinding="view.selectedGroup" disabledBinding="view.disabled"}} - {{else}} - <span class="line-height-30"> - {{t popup.dependent.configs.select.config.group.no.groups}} - </span> + {{else}} + <p>{{t popup.dependent.configs.select.config.group.no.groups}}</p> {{/if}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/installer.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/installer.hbs b/ambari-web/app/templates/installer.hbs index 8ea98a1..79d2a7e 100644 --- a/ambari-web/app/templates/installer.hbs +++ b/ambari-web/app/templates/installer.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} {{#if isServerClientVersionMismatch}} - <div id="version-mismatch-title">{{t app.versionMismatchAlert.title}}</div> + <h3 id="version-mismatch-title">{{t app.versionMismatchAlert.title}}</h3> <div class="alert alert-danger"> {{{versionConflictAlertBody}}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main.hbs b/ambari-web/app/templates/main.hbs index b54b7b6..e442ea5 100644 --- a/ambari-web/app/templates/main.hbs +++ b/ambari-web/app/templates/main.hbs @@ -16,13 +16,13 @@ * limitations under the License. }} {{#if isServerClientVersionMismatch}} - <div id="version-mismatch-title">{{t app.versionMismatchAlert.title}}</div> + <h3 id="version-mismatch-title">{{t app.versionMismatchAlert.title}}</h3> <div class="alert alert-danger"> {{{versionConflictAlertBody}}} </div> {{else}} {{#unless isClusterDataLoaded}} - <h2>{{t app.loadingPlaceholder}} </h2> + <h2>{{t app.loadingPlaceholder}}</h2> <div class="progress"> <div class="progress-bar progress-bar-striped active" {{bindAttr style="controller.clusterDataLoadedPercent"}}></div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/admin.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin.hbs b/ambari-web/app/templates/main/admin.hbs index 17cf426..d1dfe74 100644 --- a/ambari-web/app/templates/main/admin.hbs +++ b/ambari-web/app/templates/main/admin.hbs @@ -17,7 +17,7 @@ }} <div class="row"> - <div id="main-admin-menu" class="well col-md-2"> + <div id="main-admin-menu" class="well col-md-2 side-menu-well"> <ul class="nav nav-list"> {{#each category in view.categories}} {{#view view.NavItemView itemBinding="category.name" elementIdBinding="category.name"}} @@ -27,8 +27,10 @@ </ul> </div> <div class="col-md-10"> - <div class="row col-md-12"> - {{outlet}} + <div class="row"> + <div class="col-md-12"> + {{outlet}} + </div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/admin/kerberos.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/kerberos.hbs b/ambari-web/app/templates/main/admin/kerberos.hbs index 5e2f27b..0e6facf 100644 --- a/ambari-web/app/templates/main/admin/kerberos.hbs +++ b/ambari-web/app/templates/main/admin/kerberos.hbs @@ -30,8 +30,7 @@ {{/unless}} <br/> {{#unless isEditMode}} - <a {{action makeConfigsEditable target="controller"}} - class="pull-right edit-link"> + <a href="#" {{action makeConfigsEditable target="controller"}} class="pull-right"> {{t common.edit}} </a> {{/unless}} http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/admin/serviceAccounts.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/serviceAccounts.hbs b/ambari-web/app/templates/main/admin/serviceAccounts.hbs index 40421e0..b4d46bb 100644 --- a/ambari-web/app/templates/main/admin/serviceAccounts.hbs +++ b/ambari-web/app/templates/main/admin/serviceAccounts.hbs @@ -16,12 +16,10 @@ * limitations under the License. }} <div class="admin-misc"> - <div class="header background-text"> - <strong>{{t admin.misc.header}}</strong> - </div> + <h4>{{t admin.misc.header}}</h4> {{#if controller.dataIsLoaded}} {{#if controller.users}} - <div class="col-md-6"> + <div class="row col-md-6"> <table class="table table-hover"> <thead> <tr> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/admin/service_auto_start.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/service_auto_start.hbs b/ambari-web/app/templates/main/admin/service_auto_start.hbs index c02a92b..bd2be51 100644 --- a/ambari-web/app/templates/main/admin/service_auto_start.hbs +++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs @@ -17,61 +17,69 @@ }} <div class="admin-auto-start"> - <div class="header background-text"> - <strong>{{t admin.serviceAutoStart.header}}</strong> - </div> - <div> - {{t admin.serviceAutoStart.header.text}} - </div> - <br/> + <h4>{{t admin.serviceAutoStart.header}}</h4> + <p>{{t admin.serviceAutoStart.header.text}}</p> <div class="cluster-switcher row"> - <div class="col-md-2"> - <strong>{{t admin.serviceAutoStart.body.text}}</strong> - </div> - <div class="col-md-4"> - {{view App.CheckboxView checkedBinding="view.switcherValue"}} - </div> - <div class="col-md-6"> - <div class="pull-right operations-button"> - <button class="btn btn-default" {{action doReload target="controller"}} {{bindAttr disabled="controller.isSaveDisabled"}}>{{t common.discard}}</button> - <button class="btn btn-success" {{action showSavePopup target="controller"}} {{bindAttr disabled="controller.isSaveDisabled"}}>{{t common.save}}</button> - </div> + <div class="col-md-2"> + <strong>{{t admin.serviceAutoStart.body.text}}</strong> + </div> + <div class="col-md-4"> + {{view App.CheckboxView checkedBinding="view.switcherValue"}} + </div> + <div class="col-md-6"> + <div class="pull-right operations-button"> + <button class="btn btn-default" {{action doReload target="controller"}} {{bindAttr disabled="controller.isSaveDisabled"}}>{{t common.discard}}</button> + <button class="btn btn-success" {{action showSavePopup target="controller"}} {{bindAttr disabled="controller.isSaveDisabled"}}>{{t common.save}}</button> </div> + </div> </div> {{#if view.switcherValue}} <hr> - <div class="row mlm"><h5 class="col-md-3">{{t common.service}}</h5><h5 class="col-md-3">{{t common.component}}</h5><h5 class="col-md-3">{{t common.status}}</h5></div> <div class="row"> - <ul class="nav nav-tabs nav-stacked col-md-3"> - {{#each tab in controller.tabs}} - <li {{bindAttr class="tab.isActive:active"}}> - <a href="#" data-toggle="tab" {{bindAttr data-target="tab.headingClass"}}> - {{tab.display_name}} - {{view App.MainAdminServiceAutoStartIndicatorView tabBinding="tab"}} - </a> - </li> - {{/each}} + <div class="col-md-4 col-lg-3"><h5>{{t common.service}}</h5></div> + <div class="col-md-8 col-lg-9 row"> + <div class="col-md-4"><h5>{{t common.component}}</h5></div> + <div class="col-md-8"><h5>{{t common.status}}</h5></div> + </div> + </div> + <div class="row"> + <div class="col-md-4 col-lg-3"> + <ul class="nav nav-tabs nav-stacked nav-tabs-left"> + {{#each tab in controller.tabs}} + <li {{bindAttr class="tab.isActive:active"}}> + <a href="#" data-toggle="tab" {{bindAttr data-target="tab.headingClass"}}> + {{tab.display_name}} + {{view App.MainAdminServiceAutoStartIndicatorView tabBinding="tab"}} + </a> + </li> + {{/each}} </ul> - <div class="tab-content col-md-9"> - {{#each tab in controller.tabs}} - <div {{bindAttr class=":tab-pane tab.isActive:active tab.service_name :row :mtm"}}> - {{#each component in tab.componentRecovery}} - <div class="row mbm"> - <div class="col-md-4"> - {{component.display_name}} - </div> - <div class="col-md-8"> - {{view App.MainAdminServiceAutoStartComponentView recoveryEnabledBinding="component.recovery_enabled" componentBinding="component" tabBinding="tab"}} - </div> - </div> - {{/each}} - <div class="col-md-offset-4"> - <a href="#" class="enable-all-link" {{action enableAll tab target="controller"}}>{{t common.enableAll}}</a> | - <a href="#" {{action disableAll tab target="controller"}}>{{t common.disableAll}}</a> - </div> - </div> + </div> + <div class="tab-content col-md-8 col-lg-9"> + {{#each tab in controller.tabs}} + <div {{bindAttr class=":tab-pane tab.isActive:active tab.service_name"}}> + <table class="table"> + {{#each component in tab.componentRecovery}} + <tr> + <td class="col-md-4"> + {{component.display_name}} + </td> + <td class="col-md-8"> + {{view App.MainAdminServiceAutoStartComponentView recoveryEnabledBinding="component.recovery_enabled" componentBinding="component" tabBinding="tab"}} + </td> + </tr> {{/each}} - </div> + <tr> + <td class="col-md-4"></td> + <td class="col-md-8"> + <a href="#" class="enable-all-link" {{action enableAll tab target="controller"}}>{{t common.enableAll}}</a> | + <a href="#" {{action disableAll tab target="controller"}}>{{t common.disableAll}}</a> + </td> + </tr> + </table> + </div> + {{/each}} + </div> </div> {{/if}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs index b8a38e0..84666a3 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs @@ -18,7 +18,7 @@ <div id="stack-upgrade-dialog"> <div {{bindAttr class=":upgrade-options-link controller.isDowngrade:disabled"}} {{action openUpgradeOptions target="controller"}}> - <i class="glyphicon glyphicon-cogs"></i><a>{{t common.options}}</a> + <i class="icon-cogs"></i><a>{{t common.options}}</a> </div> <div {{bindAttr class="view.isLoaded::hidden :row"}}> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/alerts/definition_details.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/alerts/definition_details.hbs b/ambari-web/app/templates/main/alerts/definition_details.hbs index 5789de6..6991efe 100644 --- a/ambari-web/app/templates/main/alerts/definition_details.hbs +++ b/ambari-web/app/templates/main/alerts/definition_details.hbs @@ -74,7 +74,7 @@ <div class="pull-right col-md-5"> {{#isAuthorized "SERVICE.TOGGLE_ALERTS"}} {{#unless App.router.mainAlertDefinitionConfigsController.canEdit}} - <a {{action editConfigs target="App.router.mainAlertDefinitionConfigsController"}} class="pull-right edit-link btn btn-link"> + <a href="#" {{action editConfigs target="App.router.mainAlertDefinitionConfigsController"}} class="pull-right btn btn-link"> {{t common.edit}} </a> {{/unless}} http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/dashboard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard.hbs b/ambari-web/app/templates/main/dashboard.hbs index 06e3a13..41170fd 100644 --- a/ambari-web/app/templates/main/dashboard.hbs +++ b/ambari-web/app/templates/main/dashboard.hbs @@ -17,7 +17,7 @@ }} <div class="row"> - <div class="services-menu well col-md-2 service-menu-width" style="padding: 8px 0"> + <div class="services-menu well col-md-2 side-menu-well"> {{view App.MainServiceMenuView}} {{view App.AllServicesActionView}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs b/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs index 727543e..3a36ed6 100644 --- a/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs +++ b/ambari-web/app/templates/main/dashboard/edit_widget_popup.hbs @@ -23,27 +23,23 @@ </div> <div class="row" id= "min-height-limit"> + <div class="col-md-12"> {{#if view.configPropertyObj.isIE9}} - {{#if view.configPropertyObj.isGreenOrangeRed}} - <div class="progress col-md-9"> - <div class="bar bar-success" style="width: 33%;"></div> - <div class="bar bar-warning" style="width: 33%;"></div> - <div class="bar bar-danger" style="width: 34%;"></div> - </div> - {{else}} - <div class="progress col-md-9"> - <div class="bar bar-danger" style="width: 33%;"></div> - <div class="bar bar-warning" style="width: 33%;"></div> - <div class="bar bar-success" style="width: 34%;"></div> - </div> - {{/if}} + <div class="progress"> + <div {{bindAttr class=":bar view.configPropertyObj.isGreenOrangeRed:bar-success:bar-danger"}} style="width: 33%;"></div> + <div class="bar bar-warning" style="width: 33%;"></div> + <div {{bindAttr class=":bar view.configPropertyObj.isGreenOrangeRed:bar-danger:bar-success"}} style="width: 34%;"></div> + </div> {{else}} - <div class="col-md-9" id="slider-range"></div> + <div id="slider-range"></div> {{/if}} + </div> </div> <div class="row"> - <div id="slider-value1" class="value-on-slider col-md-2">0</div> + <div id="slider-value1" class="value-on-slider col-md-2"> + <input type="text" value="0" disabled="disabled" class="form-control" /> + </div> <div id="slider-value2" {{bindAttr class="view.configPropertyObj.isThresh1Error:slider-error :value-on-slider :col-md-4 view.configPropertyObj.isThresh1Error:has-error"}}> {{view Ember.TextField class="form-control" valueBinding="view.configPropertyObj.thresh1"}} {{#if view.configPropertyObj.errorMessage1}} @@ -56,7 +52,9 @@ <span class="help-block validation-block">{{view.configPropertyObj.errorMessage2}}</span> {{/if}} </div> - <div id="slider-value4" class="value-on-slider col-md-2">{{view.configPropertyObj.maxValue}}</div> + <div id="slider-value4" class="value-on-slider col-md-2"> + {{view Em.TextField valueBinding="view.configPropertyObj.maxValue" classNames="form-control" disabled="disabled"}} + </div> </div> </form> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs b/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs index 035b62e..d80e601 100644 --- a/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs +++ b/ambari-web/app/templates/main/dashboard/edit_widget_popup_single_threshold.hbs @@ -24,32 +24,33 @@ </div> <div class="row" id= "min-height-limit"> + <div class="col-md-12"> {{#if view.configPropertyObj.isIE9}} {{#if view.configPropertyObj.isGreenRed}} - <div class="progress col-md-9"> - <div class="bar bar-success" style="width: 33%;"></div> - <div class="bar bar-danger" style="width: 34%;"></div> - </div> - {{else}} - <div class="progress col-md-9"> - <div class="bar bar-danger" style="width: 33%;"></div> - <div class="bar bar-success" style="width: 34%;"></div> + <div class="progress"> + <div {{bindAttr class=":bar view.configPropertyObj.isGreenRed:bar-success:bar-danger"}} style="width: 33%;"></div> + <div {{bindAttr class=":bar view.configPropertyObj.isGreenRed:bar-danger:bar-success"}} style="width: 34%;"></div> </div> {{/if}} {{else}} - <div class="col-md-9" id="slider-range"></div> + <div id="slider-range"></div> {{/if}} + </div> </div> <div class="row"> - <div id="slider-value1" class="value-on-slider col-md-2" style="margin-left: 20px">0</div> - <div id="slider-value2" style="margin-left: 100px"{{bindAttr class="view.configPropertyObj.isThresh1Error:slider-error :value-on-slider :col-md-4 view.configPropertyObj.isThresh1Error:has-error"}}> + <div id="slider-value1" class="value-on-slider col-md-2"> + <input type="text" value="0" disabled="disabled" class="form-control" /> + </div> + <div id="slider-value2" {{bindAttr class="view.configPropertyObj.isThresh1Error:slider-error :value-on-slider :col-md-4 :col-md-offset-2 :col-sm-offset-2 view.configPropertyObj.isThresh1Error:has-error"}}> {{view Ember.TextField valueBinding="view.configPropertyObj.thresh1" class="form-control"}} {{#if view.configPropertyObj.errorMessage1}} - <span class="help-block validation-block">{{view.configPropertyObj.errorMessage1}}</span> + <span class="help-block validation-block">{{view.configPropertyObj.errorMessage1}}</span> {{/if}} </div> - <div id="slider-value3" style="margin-left: 150px" class="value-on-slider col-md-2">{{view.configPropertyObj.maxValue}}</div> + <div id="slider-value3" class="value-on-slider col-md-2 col-md-offset-2 col-sm-offset-2"> + {{view Em.TextField valueBinding="view.configPropertyObj.maxValue" classNames="form-control" disabled="disabled"}} + </div> </div> </form> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/host/configs.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/configs.hbs b/ambari-web/app/templates/main/host/configs.hbs index 9cc832b..7587d52 100644 --- a/ambari-web/app/templates/main/host/configs.hbs +++ b/ambari-web/app/templates/main/host/configs.hbs @@ -19,7 +19,7 @@ {{#if view.isConfigAvailable}} <div class="row host-configs"> <div class="col-md-2"> - <div class="well services-host-menu"> + <div class="well side-menu-well"> {{view App.MainHostServiceMenuView}} </div> </div> @@ -28,7 +28,7 @@ </div> </div> {{else}} - <div class="services-host-menu"> + <div class="side-menu-well"> <i class="message alert alert-info">{{t hosts.host.serviceNotAvailable}}</i> </div> {{/if}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/host/host_alerts.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/host_alerts.hbs b/ambari-web/app/templates/main/host/host_alerts.hbs index 51b600c..17c8bc3 100644 --- a/ambari-web/app/templates/main/host/host_alerts.hbs +++ b/ambari-web/app/templates/main/host/host_alerts.hbs @@ -18,9 +18,10 @@ <div id="alerts"> <div class="row"> - <h2 class="table-title col-sm-1">{{t hosts.host.alerts.label}}</h2> - </div> - + <div class="col-md-12"> + <h2 class="table-title">{{t hosts.host.alerts.label}}</h2> + </div> + <div class="col-md-12"> {{#if App.router.mainAlertInstancesController.isLoaded}} <table class="table advanced-header-table table-hover alerts-table" id="host-alerts-table"> @@ -81,5 +82,6 @@ {{else}} {{view App.SpinnerView}} {{/if}} - + </div> +</div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/service.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service.hbs b/ambari-web/app/templates/main/service.hbs index 6cfb591..30ead45 100644 --- a/ambari-web/app/templates/main/service.hbs +++ b/ambari-web/app/templates/main/service.hbs @@ -17,7 +17,7 @@ }} <div class="row"> - <div class="services-menu well col-md-2 service-menu-width" style="padding: 8px 0"> + <div class="services-menu well col-md-2 side-menu-well"> {{view App.MainServiceMenuView}} {{view App.AllServicesActionView}} </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/main/service/all_services_actions.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/service/all_services_actions.hbs b/ambari-web/app/templates/main/service/all_services_actions.hbs index aba1838..f2ce0fd 100644 --- a/ambari-web/app/templates/main/service/all_services_actions.hbs +++ b/ambari-web/app/templates/main/service/all_services_actions.hbs @@ -33,27 +33,27 @@ {{/isAuthorized}} {{#isAuthorized "SERVICE.START_STOP"}} <li class="divider"></li> - <li {{bindAttr class="view.serviceController.isStartAllDisabled:disabled" }}> + <li {{bindAttr class="view.serviceController.isStartAllDisabled:disabled"}}> <a href="#" data-toggle="modal" - {{bindAttr class="view.serviceController.isStartAllDisabled:disabled" }} + {{bindAttr class="view.serviceController.isStartAllDisabled:disabled"}} {{action "startAllService" target="view.serviceController"}}> - <i {{bindAttr class=":glyphicon glyphicon-play view.serviceController.isStartAllDisabled:disabled:enabled " }}></i> + <i {{bindAttr class=":glyphicon :glyphicon-play view.serviceController.isStartAllDisabled:disabled:enabled"}}></i> {{t services.service.startAll}} </a> </li> - <li {{bindAttr class="view.serviceController.isStopAllDisabled:disabled" }}> + <li {{bindAttr class="view.serviceController.isStopAllDisabled:disabled"}}> <a href="#" data-toggle="modal" - {{bindAttr class="view.serviceController.isStopAllDisabled:disabled" }} + {{bindAttr class="view.serviceController.isStopAllDisabled:disabled"}} {{action "stopAllService" target="view.serviceController"}}> - <i {{bindAttr class=":glyphicon glyphicon-stop view.serviceController.isStopAllDisabled:disabled:enabled" }}></i> + <i {{bindAttr class=":glyphicon :glyphicon-stop view.serviceController.isStopAllDisabled:disabled:enabled"}}></i> {{t services.service.stopAll}} </a> </li> - <li {{bindAttr class="view.serviceController.isRestartAllRequiredDisabled:disabled" }}> + <li {{bindAttr class="view.serviceController.isRestartAllRequiredDisabled:disabled"}}> <a href="#" data-toggle="modal" - {{bindAttr class="view.serviceController.isRestartAllRequiredDisabled:disabled" }} + {{bindAttr class="view.serviceController.isRestartAllRequiredDisabled:disabled"}} {{action "restartAllRequired" target="view.serviceController"}}> - <i {{bindAttr class=":glyphicon glyphicon-repeat view.serviceController.isRestartAllRequiredDisabled:disabled:enabled" }}></i> + <i {{bindAttr class=":glyphicon :glyphicon-repeat view.serviceController.isRestartAllRequiredDisabled:disabled:enabled"}}></i> {{t services.service.restartAllRequired}} </a> </li> http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs b/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs index d7d5be5..77e4bd2 100644 --- a/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs +++ b/ambari-web/app/templates/wizard/step1/public_option_disabled_window_body.hbs @@ -17,10 +17,10 @@ }} -<div class="public-disabled-message">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg}}</div> +<p class="public-disabled-message">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg}}</p> <ul> <li class="public-disabled-option">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg1}}</li> <li class="public-disabled-option">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg2}}</li> <li class="public-disabled-option">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg3}}</li> </ul> -<div class="public-disabled-message">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg4}}</div> \ No newline at end of file +<p class="public-disabled-message">{{t installer.step1.selectUseRepoOptions.public.networkLost.popup.msg4}}</p> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs b/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs index 7e95724..3d6895c 100644 --- a/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs +++ b/ambari-web/app/templates/wizard/step9/step9HostTasksLogPopup.hbs @@ -30,6 +30,7 @@ <div class="select-wrap"> {{t common.show}}: {{view Ember.Select + class="form-control" contentBinding="view.categories" optionValuePath="content.value" optionLabelPath="content.label" http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/utils/host_progress_popup.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js index 97ecbb8..5bd0ceb 100644 --- a/ambari-web/app/utils/host_progress_popup.js +++ b/ambari-web/app/utils/host_progress_popup.js @@ -172,7 +172,7 @@ App.HostPopup = Em.Object.create({ 'FAILED': ['FAILED', 'icon-exclamation-sign', 'progress-bar-danger', false], 'ABORTED': ['ABORTED', 'glyphicon glyphicon-minus', 'progress-bar-warning', false], 'TIMEDOUT': ['TIMEDOUT', 'glyphicon glyphicon-time', 'progress-bar-warning', false], - 'IN_PROGRESS': ['IN_PROGRESS', 'glyphicon glyphicon-cogs', 'progress-bar-info', true], + 'IN_PROGRESS': ['IN_PROGRESS', 'icon-cogs', 'progress-bar-info', true], 'COMPLETED': ['SUCCESS', 'glyphicon glyphicon-ok', 'progress-bar-success', false] }, @@ -360,7 +360,7 @@ App.HostPopup = Em.Object.create({ return ['TIMEDOUT', 'glyphicon glyphicon-time', 'progress-bar-warning', false]; } if (taskStatus === 'IN_PROGRESS') { - return ['IN_PROGRESS', 'glyphicon glyphicon-cogs', 'progress-bar-info', true] + return ['IN_PROGRESS', 'icon-cogs', 'progress-bar-info', true] } } if (isCompleted) { @@ -560,7 +560,7 @@ App.HostPopup = Em.Object.create({ var statusIconMap = { 'pending': 'glyphicon glyphicon-cog', 'queued': 'glyphicon glyphicon-cog', - 'in_progress': 'glyphicon glyphicon-cogs', + 'in_progress': 'icon-cogs', 'completed': 'glyphicon glyphicon-ok', 'failed': 'icon-exclamation-sign', 'aborted': 'glyphicon glyphicon-minus', http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/views/common/helpers/status_icon_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/helpers/status_icon_view.js b/ambari-web/app/views/common/helpers/status_icon_view.js index 7f94e60..fbd8e3a 100644 --- a/ambari-web/app/views/common/helpers/status_icon_view.js +++ b/ambari-web/app/views/common/helpers/status_icon_view.js @@ -33,7 +33,7 @@ App.StatusIconView = Em.View.extend({ 'SKIPPED_FAILED': 'glyphicon glyphicon-share-alt failed', 'PENDING': 'glyphicon glyphicon-cog pending', 'QUEUED': 'glyphicon glyphicon-cog queued', - 'IN_PROGRESS': 'glyphicon glyphicon-cogs in_progress', + 'IN_PROGRESS': 'icon-cogs in_progress', 'HOLDING': 'glyphicon glyphicon-pause', 'SUSPENDED': 'glyphicon glyphicon-pause', 'ABORTED': 'glyphicon glyphicon-minus aborted', http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/views/main/admin/stack_and_upgrade_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_and_upgrade_view.js b/ambari-web/app/views/main/admin/stack_and_upgrade_view.js index 801dda8..09e34b0 100644 --- a/ambari-web/app/views/main/admin/stack_and_upgrade_view.js +++ b/ambari-web/app/views/main/admin/stack_and_upgrade_view.js @@ -17,10 +17,8 @@ */ var App = require('app'); -var stringUtils = require('utils/string_utils'); App.MainAdminStackAndUpgradeView = Em.View.extend({ - templateName: require('templates/main/admin/stack_and_upgrade'), - classNames: ['col-md-12'] + templateName: require('templates/main/admin/stack_and_upgrade') }); http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js b/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js index ae683e0..3dad7d8 100644 --- a/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js +++ b/ambari-web/app/views/wizard/step9/hostLogPopupBody_view.js @@ -149,7 +149,7 @@ App.WizardStep9HostLogPopupBodyView = Em.View.extend({ if (taskInfo.get('status') == 'pending' || taskInfo.get('status') == 'queued') { taskInfo.set('icon', 'glyphicon glyphicon-cog'); } else if (taskInfo.get('status') == 'in_progress') { - taskInfo.set('icon', 'glyphicon glyphicon-cogs'); + taskInfo.set('icon', 'icon-cogs'); } else if (taskInfo.get('status') == 'completed') { taskInfo.set('icon', 'glyphicon glyphicon-ok'); } else if (taskInfo.get('status') == 'failed') { http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js b/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js index 736782e..ff42b18 100644 --- a/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js +++ b/ambari-web/test/views/wizard/step9/hostLogPopupBody_view_test.js @@ -220,7 +220,7 @@ describe('App.WizardStep9HostLogPopupBodyView', function() { }, { status: 'in_progress', - icon:'glyphicon glyphicon-cogs' + icon:'icon-cogs' }, { status: 'completed', http://git-wip-us.apache.org/repos/asf/ambari/blob/945e5d4d/ambari-web/vendor/styles/bootstrap.css ---------------------------------------------------------------------- diff --git a/ambari-web/vendor/styles/bootstrap.css b/ambari-web/vendor/styles/bootstrap.css index 1181a7d..4b1874e 100644 --- a/ambari-web/vendor/styles/bootstrap.css +++ b/ambari-web/vendor/styles/bootstrap.css @@ -3632,7 +3632,7 @@ tbody.collapse.in { bottom: 100%; margin-bottom: 2px; } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-right .dropdown-menu { right: 0; left: auto; @@ -4169,12 +4169,12 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-bottom: 20px; border: 1px solid transparent; } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar { border-radius: 4px; } } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-header { float: left; } @@ -4191,7 +4191,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-collapse.in { overflow-y: auto; } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-collapse { width: auto; border-top: 0; @@ -4231,7 +4231,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-right: -15px; margin-left: -15px; } -@media (min-width: 768px) { +@media (min-width: 0) { .container > .navbar-header, .container-fluid > .navbar-header, .container > .navbar-collapse, @@ -4244,7 +4244,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { z-index: 1000; border-width: 0 0 1px; } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-static-top { border-radius: 0; } @@ -4256,7 +4256,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { left: 0; z-index: 1030; } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-fixed-top, .navbar-fixed-bottom { border-radius: 0; @@ -4285,7 +4285,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-brand > img { display: block; } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { margin-left: -15px; @@ -4315,7 +4315,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { .navbar-toggle .icon-bar + .icon-bar { margin-top: 4px; } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-toggle { display: none; } @@ -4328,7 +4328,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { padding-bottom: 10px; line-height: 20px; } -@media (max-width: 767px) { +@media (max-width:0) { .navbar-nav .open .dropdown-menu { position: static; float: none; @@ -4351,7 +4351,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { background-image: none; } } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-nav { float: left; margin: 0; @@ -4425,7 +4425,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { top: 0; } } -@media (max-width: 767px) { +@media (max-width: 0) { .navbar-form .form-group { margin-bottom: 5px; } @@ -4433,7 +4433,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-bottom: 0; } } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-form { width: auto; padding-top: 0; @@ -4473,14 +4473,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn { margin-top: 15px; margin-bottom: 15px; } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-text { float: left; margin-right: 15px; margin-left: 15px; } } -@media (min-width: 768px) { +@media (min-width: 0) { .navbar-left { float: left !important; } @@ -4547,7 +4547,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { color: #555; background-color: #e7e7e7; } -@media (max-width: 767px) { +@media (max-width: 0) { .navbar-default .navbar-nav .open .dropdown-menu > li > a { color: #777; } @@ -4643,7 +4643,7 @@ fieldset[disabled] .navbar-default .btn-link:focus { color: #fff; background-color: #080808; } -@media (max-width: 767px) { +@media (max-width: 0) { .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header { border-color: #080808; }
