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 2d41316 AMBARI-23790 Manage Ambari UI issues 2d41316 is described below commit 2d4131613d37cec2e1795a8addd6422ee7fb3d0f Author: Andrii Tkach <atk...@apache.org> AuthorDate: Tue May 8 14:12:05 2018 +0300 AMBARI-23790 Manage Ambari UI issues --- .../controllers/ambariViews/ViewsEditCtrl.js | 7 ++- .../controllers/ambariViews/ViewsListCtrl.js | 7 ++- .../app/scripts/directives/comboSearch.js | 2 +- .../ui/admin-web/app/scripts/i18n.config.js | 8 +-- .../ui/admin-web/app/scripts/services/Filters.js | 6 +- .../resources/ui/admin-web/app/styles/main.css | 41 +------------ .../ui/admin-web/app/styles/stack-versions.css | 68 ++++++++++++++++++++++ .../resources/ui/admin-web/app/styles/views.css | 4 ++ .../ui/admin-web/app/views/ambariViews/edit.html | 2 +- .../app/views/ambariViews/modals/create.html | 8 --- .../ui/admin-web/app/views/stackVersions/list.html | 2 +- .../app/views/userManagement/groupEdit.html | 2 +- 12 files changed, 98 insertions(+), 59 deletions(-) diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js index 834efdb..b852b39 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js @@ -441,7 +441,12 @@ angular.module('ambariAdminConsole') $t('common.deleteConfirmation', { instanceType: $t('views.viewInstance'), instanceName: instance.ViewInstanceInfo.label - }) + }), + null, + null, + { + primaryClass: 'btn-danger' + } ).then(function() { View.deleteInstance(instance.ViewInstanceInfo.view_name, instance.ViewInstanceInfo.version, instance.ViewInstanceInfo.instance_name) .then(function() { diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js index f536e50..6638dd0 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsListCtrl.js @@ -107,7 +107,12 @@ function($scope, View, $modal, Alert, ConfirmationModal, $translate, Settings, P $t('common.deleteConfirmation', { instanceType: $t('views.viewInstance'), instanceName: instance.label - }) + }), + null, + null, + { + primaryClass: 'btn-danger' + } ).then(function () { View.deleteInstance(instance.view_name, instance.version, instance.instance_name) .then(function () { diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/comboSearch.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/comboSearch.js index f1cd515..93957ad 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/comboSearch.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/directives/comboSearch.js @@ -82,7 +82,7 @@ angular.module('ambariAdminConsole') $scope.appliedFilters = $scope.appliedFilters.filter(function(item) { return filter.id !== item.id; }); - $scope.observeSearchFilterInput(event); + $scope.observeSearchFilterInput(); mainInputElement.focus(); $scope.updateFilters($scope.appliedFilters); }; diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js index 58b068d..821a466 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js @@ -274,11 +274,11 @@ angular.module('ambariAdminConsole') 'clusters.assignRoles': 'Assign roles to these {{term}}', 'clusters.alerts.cannotLoadClusterData': 'Cannot load cluster data', - 'clusters.devBlueprint': 'Dev Blueprint', + 'clusters.devBlueprint': 'Cluster Blueprint', 'groups.createLocal': 'Add Groups', 'groups.name': 'Group name', - 'groups.role': 'Add roles to this group', + 'groups.role': 'Group Access', 'groups.addUsers': 'Add users to this group', 'groups.members': 'Members', 'groups.membersPlural': '{{n}} member{{n == 1 ? "" : "s"}}', @@ -304,11 +304,11 @@ angular.module('ambariAdminConsole') 'users.inactive': 'Inactive', 'users.status': 'Status', 'users.password': 'Password', - 'users.role': 'Add roles for this user', + 'users.role': 'User Access', 'users.confirmPassword': 'Confirm Password', 'users.passwordConfirmation': 'Password сonfirmation', 'users.isAmbariAdmin': 'Is this user an Ambari Admin?', - 'users.isActive': 'Deactivate this user?', + 'users.isActive': 'User Status', 'users.userIsAdmin': 'This user is an Ambari Admin and has all privileges.', 'users.showAll': 'Show all users', 'users.showAdmin': 'Show only admin users', diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Filters.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Filters.js index 7c6815f..ed32d59 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Filters.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Filters.js @@ -62,12 +62,14 @@ angular.module('ambariAdminConsole') if (customValueFilter) { return filter.values.every(function(value) { var itemValue = customValueFilter.customValueConverter(item); - return String(Array.isArray(itemValue) ? itemValue.join() : itemValue).indexOf(value) === -1; + var preparedValue = Array.isArray(itemValue) ? itemValue.join().toLowerCase() : itemValue.toLowerCase(); + return String(preparedValue).indexOf(value.toLowerCase()) === -1; }); } return filter.values.every(function(value) { var itemValue = item[filter.key]; - return String(Array.isArray(itemValue) ? itemValue.join() : itemValue).indexOf(value) === -1; + var preparedValue = Array.isArray(itemValue) ? itemValue.join().toLowerCase() : itemValue.toLowerCase(); + return String(preparedValue).indexOf(value.toLowerCase()) === -1; }); })); diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css index 08f8960..d11e8b2 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css +++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css @@ -729,14 +729,6 @@ accordion .panel-group .panel{ word-break: break-all; } -#stack-versions .table .col-small { - width: 15% -} - -#stack-versions .table .col-medium { - width: 30% -} - .table-bar { padding-top: 4px; border: 1px solid #E4E4E4; @@ -812,21 +804,6 @@ accordion .panel-group .panel{ cursor: default; } -.repo-table-title #name-label-adjust { - width: 20.7%; - padding-left:0px; - right:5px; -} - -.repo-table-title #repo-base-url-label { - padding-left:0px; - right:3px; -} - -.verison-label-row .label { - font-size: 100%; -} - .panel-body .sub-group { margin-left: 10px; } @@ -1154,21 +1131,6 @@ thead.view-permission-header > tr > th { margin: 0px 5px; } -#stack-versions .no-version-alert { - text-align: center; -} -#stack-versions table { - table-layout: fixed; -} -#stack-versions table .text-search-container { - font-weight: normal; - position: relative; -} -#stack-versions table .text-search-container .close { - position: absolute; - right: 15px; - top: 40px; -} .pull-up { margin-top: -2px; } @@ -1336,12 +1298,13 @@ body { color: inherit; font-size: 16px; cursor: pointer; - padding: 0 5px; + padding: 0 3px; } td.entity-actions, th.entity-actions { width: 10%; + min-width: 80px; } .entity-actions a:hover, diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/stack-versions.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/stack-versions.css new file mode 100644 index 0000000..b0381ac --- /dev/null +++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/stack-versions.css @@ -0,0 +1,68 @@ +/** + * 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. + */ + +#stack-versions .table .col-small { + width: 15% +} + +#stack-versions .table .col-medium { + width: 30% +} + +#stack-versions .no-version-alert { + text-align: center; +} +#stack-versions table { + table-layout: fixed; +} +#stack-versions table .text-search-container { + font-weight: normal; + position: relative; +} +#stack-versions table .text-search-container .close { + position: absolute; + right: 15px; + top: 40px; +} + +#stack-versions table td > * { + line-height: 24px; +} + +.repo-table-title #name-label-adjust { + width: 20.7%; + padding-left:0px; + right:5px; +} + +.repo-table-title #repo-base-url-label { + padding-left:0px; + right:3px; +} + +.verison-label-row .label { + font-size: 100%; +} + +.verison-label-row .btn { + padding: 10px; +} + +.verison-label-row.button-padding { + padding: 4px; +} diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/styles/views.css b/ambari-admin/src/main/resources/ui/admin-web/app/styles/views.css index 9bb84df..0a80917 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/styles/views.css +++ b/ambari-admin/src/main/resources/ui/admin-web/app/styles/views.css @@ -103,3 +103,7 @@ input[type="checkbox"] + label { -webkit-animation-delay: -1.0s; animation-delay: -1.0s; } + +#views-table td { + word-break: break-all; +} diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html index 7f2f8a3..738560a 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/edit.html @@ -282,7 +282,7 @@ <div class="col-sm-12"> <span translate="views.clusterPermissions.infoMessage" translate-values="{cluster: cluster.name}"></span> </div> - <div class="col-sm-offset-2 col-sm-10"> + <div class="col-sm-10"> <div class="checkbox col-sm-12" ng-repeat="key in permissionRoles"> <div ng-init="i18nKey = 'views.clusterPermissions.' + key.split('.').join('').toLowerCase()"> <input ng-attr-id="{{i18nKey}}" type="checkbox" class="form-control" ng-model="permissionsEdit['VIEW.USER']['ROLE'][key]"> diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/create.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/create.html index b9d50c7..5ca916e 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/create.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/ambariViews/modals/create.html @@ -34,7 +34,6 @@ <div class="form-group col-sm-6" ng-class="{ 'has-error': form.instanceCreateForm.view.$error.required && form.instanceCreateForm.submitted }"> <label for="view"> {{'views.createInstance.selectView' | translate}}<span>*</span> - <i class="fa fa-question-circle" aria-hidden="true"></i> </label> <select ng-disabled="instanceClone" @@ -54,7 +53,6 @@ <div class="form-group col-sm-6" ng-class="{ 'has-error': form.instanceCreateForm.version.$error.required && form.instanceCreateForm.submitted }"> <label for="version"> {{'views.createInstance.selectVersion' | translate}}<span>*</span> - <i class="fa fa-question-circle" aria-hidden="true"></i> </label> <select ng-disabled="instanceClone" @@ -77,7 +75,6 @@ ng-class="{ 'has-error': (form.instanceCreateForm.instanceName.$error.required || form.instanceCreateForm.instanceName.$error.pattern || isInstanceExists) && form.instanceCreateForm.submitted }"> <label for="instanceName"> {{'views.instanceName' | translate}}<span>*</span> - <i class="fa fa-question-circle" aria-hidden="true"></i> </label> <input type="text" class="form-control" ng-model="formData.instanceName" @@ -101,7 +98,6 @@ <div class="form-group" ng-class="{ 'has-error': form.instanceCreateForm.displayName.$error.required && form.instanceCreateForm.submitted }"> <label for="displayName"> {{'views.displayName' | translate}}<span>*</span> - <i class="fa fa-question-circle" aria-hidden="true"></i> </label> <input type="text" class="form-control" required name="displayName" @@ -115,7 +111,6 @@ <div class="form-group" ng-class="{ 'has-error': form.instanceCreateForm.description.$error.required && form.instanceCreateForm.submitted }"> <label for="description"> {{'views.description' | translate}}<span>*</span> - <i class="fa fa-question-circle" aria-hidden="true"></i> </label> <input type="text" class="form-control" required name="description" @@ -133,7 +128,6 @@ id="visible"> <label for="visible"> {{'views.visible' | translate}} - <i class="fa fa-question-circle" aria-hidden="true"></i> </label> </div> </div> @@ -171,7 +165,6 @@ <div class="form-group"> <label for="clusterType"> {{'views.createInstance.clusterType' | translate}}? - <i class="fa fa-question-circle" aria-hidden="true"></i> </label> <div> <div class="btn-group" role="group" id="clusterType"> @@ -198,7 +191,6 @@ <div class="form-group col-sm-6" ng-class="{ 'has-error': form.instanceCreateForm.clusterName.$error.required && form.instanceCreateForm.submitted }"> <label for="clusterName"> {{'views.clusterName' | translate}}<span>*</span> - <i class="fa fa-question-circle" aria-hidden="true"></i> </label> <select ng-required="clusterType !== 'NONE'" diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html index 41af2eb..058eed4 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html @@ -81,7 +81,7 @@ {{'common.none' | translate}} </span> </td> - <td class="verison-label-row"> + <td class="verison-label-row" ng-class="{'button-padding': !repo.cluster}"> <div ng-show="repo.status == 'CURRENT'"> <span class="label {{'status-' + repo.status}}">{{'versions.current' | translate}}: {{repo.currentHosts}}/{{repo.totalHosts}}</span> </div> 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 fbab9de..a6f3c08 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 @@ -38,7 +38,7 @@ </div> </div> <div class="form-group" ng-show="cluster"> - <label for="role" class="col-sm-2 roles-label"> + <label for="role" class="col-sm-2 roles-label control-label"> {{'groups.role' | translate}} <i class="fa fa-question-circle" aria-hidden="true" ng-click="showHelpPage()"></i> </label> -- To stop receiving notification emails like this one, please contact atk...@apache.org.