This is an automated email from the ASF dual-hosted git repository.
atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new ff05ef6 AMBARI-23281 Enable Kerberos Wizard style edits
ff05ef6 is described below
commit ff05ef6236a3d3bf517eb9c452f4eb24c73ca034
Author: Andrii Tkach <[email protected]>
AuthorDate: Mon Mar 19 16:24:21 2018 +0200
AMBARI-23281 Enable Kerberos Wizard style edits
---
ambari-web/app/styles/application.less | 40 ++++++++++++++++++++--
ambari-web/app/styles/bootstrap_overrides.less | 10 ++----
ambari-web/app/styles/common.less | 35 +------------------
ambari-web/app/styles/modal_popups.less | 3 ++
ambari-web/app/styles/service_configurations.less | 8 +++--
ambari-web/app/styles/wizard.less | 21 +++---------
.../app/templates/common/button_progress.hbs | 4 +--
.../templates/common/form/check_db_connection.hbs | 14 ++++----
ambari-web/app/templates/common/progress.hbs | 13 +++----
.../app/templates/main/admin/kerberos/step3.hbs | 8 ++---
.../app/templates/main/admin/kerberos/step5.hbs | 2 +-
.../templates/main/admin/service_auto_start.hbs | 2 +-
ambari-web/app/views/common/controls_view.js | 2 +-
13 files changed, 76 insertions(+), 86 deletions(-)
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 43415dc..335f0a3 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -46,6 +46,25 @@ ul, ol {
.glyphicon-4x{font-size: 4em;}
.glyphicon-5x{font-size: 5em;}
+/************************************************************************
+* Health status(service/host/host component health)icons class names
+***********************************************************************/
+.glyphicon-warning-sign, .icon-warning-sign {
+ color: @health-status-red;
+}
+.glyphicon-ok-sign, .icon-ok-sign {
+ color: @health-status-green;
+}
+.glyphicon-question-sign, .icon-question-sign {
+ color: @health-status-yellow;
+}
+.glyphicon-minus-sign, .icon-minus-sign {
+ color: @health-status-orange;
+}
+.icon-medkit {
+ color: @maintenance-black;
+}
+
body.modal-open {
//fix bootstrap padding when modal opened
padding-right: 0 !important;
@@ -1292,9 +1311,15 @@ table.graphs {
}
/*Start Admin*/
- .btn-padding {
- margin-left: 20px
- }
+.btn-padding {
+ margin-left: 20px
+}
+
+.btn-primary[disabled] {
+ .icon-spinner {
+ color: white;
+ }
+}
#admin-auto-start {
background-color: #fff;
@@ -1328,12 +1353,21 @@ table.graphs {
.all-checkbox {
display: inline-block;
top: 2px;
+ label {
+ font-size: inherit;
+ }
}
}
.general-auto-start {
display: inline-block;
margin-left: 15px;
}
+ .form-horizontal .radio,
+ .form-horizontal .checkbox,
+ .form-horizontal .radio-inline,
+ .form-horizontal .checkbox-inline {
+ padding-top: 0;
+ }
}
.admin-user-settings {
diff --git a/ambari-web/app/styles/bootstrap_overrides.less
b/ambari-web/app/styles/bootstrap_overrides.less
index 6fb1ef4..e3720bd 100644
--- a/ambari-web/app/styles/bootstrap_overrides.less
+++ b/ambari-web/app/styles/bootstrap_overrides.less
@@ -442,14 +442,10 @@ input[type="checkbox"]:checked + label:after {
border-color: #999;
}
-.form-horizontal .radio,
-.form-horizontal .checkbox,
-.form-horizontal .radio-inline,
-.form-horizontal .checkbox-inline {
- padding-top: 0;
-}
-
.radio, .checkbox {
margin-bottom: 0;
margin-top: 0;
+ label {
+ vertical-align: middle;
+ }
}
diff --git a/ambari-web/app/styles/common.less
b/ambari-web/app/styles/common.less
index 1fc3698..fbcdc9a 100644
--- a/ambari-web/app/styles/common.less
+++ b/ambari-web/app/styles/common.less
@@ -21,18 +21,6 @@
*/
/************************************************************************
-* Health status(service/host/host component health)icons class names
-***********************************************************************/
-@health-status-red-icon: glyphicon-warning-sign;
-@health-status-red-icon: icon-warning-sign;
-@health-status-green-icon: glyphicon-ok-sign;
-@health-status-green-icon: icon-ok-sign;
-@health-status-yellow-icon: glyphicon-question-sign;
-@health-status-yellow-icon: icon-question-sign;
-@health-status-orange-icon: glyphicon-minus-sign;
-@health-status-orange-icon: icon-minus-sign;
-@maintenance-icon: icon-medkit;
-/************************************************************************
* Health status(service/host/host component health)icon colors
***********************************************************************/
@health-status-red: #EF6162;
@@ -81,22 +69,6 @@
@bootstrap-danger: #d9534f;
@bootstrap-primary: #337ab7;
-.@{health-status-red-icon} {
- color: @health-status-red;
-}
-.@{health-status-green-icon} {
- color: @health-status-green;
-}
-.@{health-status-yellow-icon} {
- color: @health-status-yellow;
-}
-.@{health-status-orange-icon} {
- color: @health-status-orange;
-}
-.@{maintenance-icon} {
- color: @maintenance-black;
-}
-
@-webkit-keyframes orangePulse {
from { background-color: @restart-indicator-color; }
50% { background-color: #fd910e; }
@@ -214,6 +186,7 @@
@default-font-size: 14px;
@smaller-font-size: 12px;
+@default-button-height: 34px;
/************************************************************************
* Modal popup properties
@@ -225,12 +198,6 @@
// modal footer height
@modal-footer-height: 75px;
-.btn-primary[disabled] {
- .icon-spinner {
- color: white;
- }
-}
-
.ellipsis-overflow {
overflow: hidden;
text-overflow: ellipsis;
diff --git a/ambari-web/app/styles/modal_popups.less
b/ambari-web/app/styles/modal_popups.less
index e8ce292..d0d6db5 100644
--- a/ambari-web/app/styles/modal_popups.less
+++ b/ambari-web/app/styles/modal_popups.less
@@ -115,6 +115,9 @@
/*90% width wizard modal window start*/
.wizard-modal-wrapper {
.modal {
+ .modal-dialog {
+ margin-top: 0;
+ }
.modal-body {
padding: 0;
.wizard {
diff --git a/ambari-web/app/styles/service_configurations.less
b/ambari-web/app/styles/service_configurations.less
index bd60bab..0497172 100644
--- a/ambari-web/app/styles/service_configurations.less
+++ b/ambari-web/app/styles/service_configurations.less
@@ -283,11 +283,15 @@
.glyphicon-warning-sign {
color: @health-status-red;
}
+ .btn-wrapper {
+ min-width: 200px;
+ }
.connection-result {
font-size: 15px;
- line-height: 30px;
+ line-height: @default-button-height;
}
- a.mute {
+ a {
+ vertical-align: top;
color: #333;
&:hover {
text-decoration: none;
diff --git a/ambari-web/app/styles/wizard.less
b/ambari-web/app/styles/wizard.less
index 97717ec..9f5b595 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -301,19 +301,6 @@
margin-top: 10px;
}
}
- #kerberos-wizard-step6, #kerberos-wizard-step8{
- #common-progress-page{
- .item{
- i{
- position:relative;
- top: 5px;
- &.glyphicon-ok{
- top: 3px;
- }
- }
- }
- }
- }
#deploy {
.page-bar {
border: none;
@@ -407,12 +394,12 @@
}
#common-progress-page {
.item {
- line-height: 40px;
+ line-height: @default-button-height;
width:100%;
- float:left;
i {
- font-size: 20px;
+ font-size: 16px;
+ vertical-align: sub;
}
.active-link{
a{
@@ -425,7 +412,7 @@
a{
pointer-events: none;
text-decoration: none;
- color: #0088cc;
+ color: inherit;
cursor: auto;
}
}
diff --git a/ambari-web/app/templates/common/button_progress.hbs
b/ambari-web/app/templates/common/button_progress.hbs
index 03f2cbb..f124edd 100644
--- a/ambari-web/app/templates/common/button_progress.hbs
+++ b/ambari-web/app/templates/common/button_progress.hbs
@@ -16,7 +16,7 @@
* limitations under the License.
}}
-<a {{bindAttr id="view.buttonId" class=":btn view.buttonClassNames"
disabled="view.isDisabled"}} {{action handleClick target="view"}}>
+<button {{bindAttr id="view.buttonId" class=":btn view.buttonClassNames"
disabled="view.isDisabled"}} {{action handleClick target="view"}}>
{{#if view.doSpinRight}}
{{yield}}
{{/if}}
@@ -26,4 +26,4 @@
{{#unless view.doSpinRight}}
{{yield}}
{{/unless}}
-</a>
+</button>
diff --git a/ambari-web/app/templates/common/form/check_db_connection.hbs
b/ambari-web/app/templates/common/form/check_db_connection.hbs
index 39de9c4..c076dfb 100644
--- a/ambari-web/app/templates/common/form/check_db_connection.hbs
+++ b/ambari-web/app/templates/common/form/check_db_connection.hbs
@@ -20,17 +20,15 @@
<div class="col-md-3 form-group control-label"></div>
<div class="col-md-9 form-group">
<div class="row">
- <div class="col-md-5">
- <span {{bindAttr class=":pull-left :btn :btn-primary
view.isBtnDisabled:disabled"}} {{action connectToDatabase
target="view"}}>{{view.btnCaption}}</span>
+ <div class="col-md-4 btn-wrapper">
+ <button {{bindAttr class=":pull-left :btn :btn-primary
view.isBtnDisabled:disabled"}} {{action connectToDatabase
target="view"}}>{{view.btnCaption}}</button>
</div>
- <div class="connection-result col-md-5">
+ <div class="connection-result col-md-6">
<a {{bindAttr class="view.isConnectionSuccess:mute:action :btn
:btn-link"}} {{action showLogsPopup target="view"}}>{{view.responseCaption}}</a>
- </div>
- {{#if view.isConnecting}}
- {{view App.SpinnerView classNames="mll pull-left"}}
- {{/if}}
- <div class="col-md-2">
<i {{bindAttr
class="view.isConnectionSuccess:glyphicon-ok-sign:glyphicon-warning-sign
:glyphicon view.isRequestResolved::hide"}}></i>
+ {{#if view.isConnecting}}
+ {{view App.SpinnerView classNames="mll display-inline-block"}}
+ {{/if}}
</div>
</div>
</div>
diff --git a/ambari-web/app/templates/common/progress.hbs
b/ambari-web/app/templates/common/progress.hbs
index 417498a..6ce37d3 100644
--- a/ambari-web/app/templates/common/progress.hbs
+++ b/ambari-web/app/templates/common/progress.hbs
@@ -24,9 +24,10 @@
<div {{bindAttr class="view.noticeClass"}}>{{{view.notice}}}
{{#if controller.showRetry}}
- <a href="#" {{action retry target="controller"}}>
+ <button class="btn btn-primary retry" {{action retry
target="controller"}}>
+ <i class="glyphicon glyphicon-repeat glyphicon-white"></i>
{{t common.retry}}
- </a>
+ </button>
{{/if}}
</div>
@@ -35,12 +36,12 @@
{{#if controller.isLoaded}}
{{#each task in controller.tasks}}
{{#view view.taskView contentBinding="task"}}
- <div class="item">
- <div {{bindAttr class=":pull-left view.linkClass
view.parentView.labelWidth"}}>
+ <div class="item row">
+ <div {{bindAttr class="view.linkClass
view.parentView.labelWidth"}}>
<i {{bindAttr class="view.icon view.iconColor"}}></i>
<a {{action "showHostProgressPopup" task target="controller"}}
>{{task.title}}</a>
</div>
- <div {{bindAttr class="view.showProgressBar::hide :row :col-md-5
:pull-left" }}>
+ <div {{bindAttr class="view.showProgressBar::hide :col-md-5" }}>
<div {{bindAttr class=":progress-wrapper
controller.isRollback::col-md-8 controller.isRollback:col-md-3"}}>
<div class="progress">
<div class="progress-bar-striped active progress-bar-info
progress-bar" {{bindAttr style="view.barWidth"}}></div>
@@ -53,7 +54,7 @@
<a {{action retryTask target="controller"}} class="btn
btn-primary retry"
rel="tooltip"
data-trigger="click" {{bindAttr title="view.showDBTooltip:testDBRetryTooltip"}}>
- <i class="glyphicon glyphicon-repeat glyphicon-white"></i>
+ <i class="glyphicon glyphicon-repeat
glyphicon-white"></i>
{{t common.retry}}
</a>
{{/if}}
diff --git a/ambari-web/app/templates/main/admin/kerberos/step3.hbs
b/ambari-web/app/templates/main/admin/kerberos/step3.hbs
index 01c927d..1fc2c74 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step3.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step3.hbs
@@ -31,12 +31,12 @@
<div class="clearfix">
{{#each task in controller.tasks}}
{{#view view.taskView contentBinding="task"}}
- <div class="item">
- <div {{bindAttr class=":pull-left view.linkClass
view.parentView.labelWidth"}}>
+ <div class="item row">
+ <div {{bindAttr class="view.linkClass
view.parentView.labelWidth"}}>
<i {{bindAttr class="view.icon view.iconColor"}}></i>
<a {{action "showHostProgressPopup" task
target="controller"}} >{{task.title}}</a>
</div>
- <div {{bindAttr class="view.showProgressBar::hide :row
:col-md-5 :pull-left" }}>
+ <div {{bindAttr class="view.showProgressBar::hide :col-md-5"
}}>
<div {{bindAttr class=":progress-wrapper
controller.isRollback::col-md-8 controller.isRollback:col-md-3"}}>
<div class="progress">
<div class="progress-bar-striped active
progress-bar-info progress-bar" {{bindAttr style="view.barWidth"}}></div>
@@ -49,7 +49,7 @@
<a {{action retryTask target="controller"}} class="btn
btn-primary retry"
rel="tooltip"
data-trigger="click" {{bindAttr title="view.showDBTooltip:testDBRetryTooltip"}}>
- <i class="glyphicon glyphicon-repeat
glyphicon-white"></i>
+ <i class="glyphicon glyphicon-repeat
glyphicon-white"></i>
{{t common.retry}}
</a>
diff --git a/ambari-web/app/templates/main/admin/kerberos/step5.hbs
b/ambari-web/app/templates/main/admin/kerberos/step5.hbs
index 0f55d45..0f42ab0 100644
--- a/ambari-web/app/templates/main/admin/kerberos/step5.hbs
+++ b/ambari-web/app/templates/main/admin/kerberos/step5.hbs
@@ -47,7 +47,7 @@
<div class="additional btn-area clearfix">
{{#view App.ButtonProgressView
classNames="pull-right mls"
- buttonClassNames="btn-primary"
+ buttonClassNames="btn-secondary"
action="downloadCSV"
isInProgressBinding="controller.isCSVRequestInProgress"}}
{{t admin.kerberos.wizard.step5.downloadCSV}}
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 0955d22..c4b785a 100644
--- a/ambari-web/app/templates/main/admin/service_auto_start.hbs
+++ b/ambari-web/app/templates/main/admin/service_auto_start.hbs
@@ -37,8 +37,8 @@
{{view App.CheckboxView
disabledBinding="view.isDisabled"
classNames="all-checkbox"
+ labelTranslate="admin.serviceAutoStart.column.autoStart"
checkedBinding="view.allComponentsChecked"}}
- {{t admin.serviceAutoStart.column.autoStart}}
</th>
<th></th>
</tr>
diff --git a/ambari-web/app/views/common/controls_view.js
b/ambari-web/app/views/common/controls_view.js
index 9cc47a1..901547b 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -1177,7 +1177,7 @@ App.CheckDBConnectionView = Ember.View.extend({
} else {
name = 'AD';
}
- App.popover(this.$(), {
+ App.popover(this.$('.connection-result'), {
title: Em.I18n.t('services.service.config.database.btn.idle'),
content:
Em.I18n.t('installer.controls.checkConnection.popover').format(name),
placement: 'right',
--
To stop receiving notification emails like this one, please contact
[email protected].
