You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2018/05/16 11:18:27 UTC
[ambari] branch trunk updated: AMBARI-23845 Manage Ambari UI style
fixes
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 81ed7f4 AMBARI-23845 Manage Ambari UI style fixes
81ed7f4 is described below
commit 81ed7f46af3b34a44e1837ab19a8c733f7335ffc
Author: Andrii Tkach <at...@apache.org>
AuthorDate: Tue May 15 15:13:31 2018 +0300
AMBARI-23845 Manage Ambari UI style fixes
---
.../resources/ui/admin-web/app/styles/user-management.css | 12 +++++++++---
.../ui/admin-web/app/views/userManagement/groupEdit.html | 12 ++++++------
.../ui/admin-web/app/views/userManagement/userEdit.html | 6 +++---
ambari-web/app/messages.js | 1 +
ambari-web/app/styles/config_versions_control.less | 4 ++++
.../templates/common/configs/config_versions_dropdown.hbs | 7 +++++--
.../views/common/configs/config_versions_dropdown_view.js | 7 ++++++-
7 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/user-management.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/user-management.css
index bca53ca..cc79ba5 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/user-management.css
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/user-management.css
@@ -33,9 +33,15 @@
margin-top: -35px;
}
-#group-edit .roles-label,
-#user-edit .roles-label {
- line-height: 30px;
+#user-edit label,
+#group-edit label {
+ max-width: 150px;
+ line-height: 34px;
+}
+
+#user-edit .one-row-value,
+#group-edit .one-row-value {
+ line-height: 20px;
}
#create-user-form .roles-label i,
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
index a6f3c08..833afea 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/groupEdit.html
@@ -23,22 +23,22 @@
<li class="active">{{group.group_name}}</li>
</ol>
</div>
-
+ <hr>
<form class="form-horizontal" role="form" novalidate name="form" >
<div class="form-group">
- <label class="col-sm-2 control-label">{{'common.type' | translate}}</label>
+ <label class="col-sm-2 one-row-value">{{'common.type' | translate}}</label>
<div class="col-sm-10">
- <label class="control-label">{{group.groupTypeName | translate}}</label>
+ <label class="one-row-value">{{group.groupTypeName | translate}}</label>
</div>
</div>
<div class="form-group">
- <label class="col-sm-2 control-label">{{group.groupTypeName | translate}} {{'groups.members' | translate}}</label>
+ <label class="col-sm-2">{{group.groupTypeName | translate}} {{'groups.members' | translate}}</label>
<div class="col-sm-10">
<editable-list items-source="group.editingUsers" resource-type="User" editable="group.group_type == 'LOCAL'"></editable-list>
</div>
</div>
<div class="form-group" ng-show="cluster">
- <label for="role" class="col-sm-2 roles-label control-label">
+ <label for="role" class="col-sm-2 roles-label">
{{'groups.role' | translate}}
<i class="fa fa-question-circle" aria-hidden="true" ng-click="showHelpPage()"></i>
</label>
@@ -53,7 +53,7 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-2 control-label">{{'common.privileges' | translate}}</label>
+ <label class="col-sm-2">{{'common.privileges' | translate}}</label>
<div class="col-sm-10">
<table class="table" ng-hide="hidePrivileges">
<thead>
diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
index 9c15041..e82eaeb 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/userManagement/userEdit.html
@@ -26,9 +26,9 @@
<hr>
<form class="form-horizontal" role="form" >
<div class="form-group">
- <label class="col-sm-2 ">{{'common.type' | translate}}</label>
+ <label class="col-sm-2 one-row-value">{{'common.type' | translate}}</label>
<div class="col-sm-10">
- <label>{{user.userTypeName}}</label>
+ <label class="one-row-value">{{user.userTypeName}}</label>
</div>
</div>
<div class="form-group">
@@ -58,7 +58,7 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-2 ">{{getUserMembership(user.user_type)}}</label>
+ <label class="col-sm-2 one-row-value">{{getUserMembership(user.user_type)}}</label>
<div class="col-sm-10">
<editable-list items-source="editingGroupsList" resource-type="Group" editable="user.user_type == 'LOCAL'"></editable-list>
</div>
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 52861bd..e35a264 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -3219,6 +3219,7 @@ Em.I18n.translations = {
'dashboard.configHistory.info-bar.view.button.disabled': 'You are currently viewing this version.',
'dashboard.configHistory.info-bar.compare.button.disabled': 'You cannot compare against the same version.',
'dashboard.configHistory.info-bar.revert.button.disabled': 'This is the current version.',
+ 'dashboard.configHistory.info-bar.compare.tooltip': 'Compare this version with current',
'timeRange.presets.1hour':'1h',
'timeRange.presets.12hour':'12h',
diff --git a/ambari-web/app/styles/config_versions_control.less b/ambari-web/app/styles/config_versions_control.less
index 9150003..365ef0f 100644
--- a/ambari-web/app/styles/config_versions_control.less
+++ b/ambari-web/app/styles/config_versions_control.less
@@ -40,8 +40,12 @@
box-shadow: inset 0 0 0 @border-color, inset 0px -10px 8px -8px @border-color;
}
.grey-text {
+ vertical-align: middle;
color: @top-nav-brand-color;
}
+ .close {
+ vertical-align: middle;
+ }
.current-color {
color: @health-status-green;
}
diff --git a/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs b/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs
index b693700..fcf3be2 100644
--- a/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs
+++ b/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs
@@ -58,8 +58,11 @@
</div>
</div>
{{#unless view.isCompareMode}}
- <button {{bindAttr class="item.isDisplayed:hide :compare-button :btn :btn-default"}}
- {{action compare item target="view.parentView"}}>
+ <button data-toggle="tooltip" data-placement="right"
+ {{bindAttr class="item.isDisplayed:hide :compare-button :btn :btn-default"}}
+ {{action compare item target="view.parentView"}}
+ {{translateAttr title="dashboard.configHistory.info-bar.compare.tooltip"
+ data-original-title="dashboard.configHistory.info-bar.compare.tooltip"}}>
<i class="icon-exchange" aria-hidden="true"></i>
</button>
{{/unless}}
diff --git a/ambari-web/app/views/common/configs/config_versions_dropdown_view.js b/ambari-web/app/views/common/configs/config_versions_dropdown_view.js
index 917b52d..f78783f 100644
--- a/ambari-web/app/views/common/configs/config_versions_dropdown_view.js
+++ b/ambari-web/app/views/common/configs/config_versions_dropdown_view.js
@@ -35,16 +35,21 @@ App.ConfigVersionsDropdownView = Em.View.extend({
displayedServiceVersion: Em.computed.findBy('serviceVersions', 'isDisplayed', true),
didInsertElement: function() {
- this.$().on("shown.bs.dropdown", function() {
+ this.$().on("shown.bs.dropdown", () => {
const versionsBlock = $(this).find('.versions-list');
if (versionsBlock.height() < versionsBlock.prop('scrollHeight')) {
versionsBlock.addClass('bottom-shadow');
} else {
versionsBlock.removeClass('bottom-shadow');
}
+ App.tooltip(this.$('[data-toggle="tooltip"]'));
});
},
+ willDestroyElement: function() {
+ this.$('[data-toggle="tooltip"]').tooltip('destroy');
+ },
+
mainClickAction: function (event) {
if (this.get('isSecondary')) {
this.get('parentView').compare(event);
--
To stop receiving notification emails like this one, please contact
atkach@apache.org.