Repository: ambari Updated Branches: refs/heads/branch-2.4 1fe38e119 -> b05a9c04e
AMBARI-17021. VDF: REgister Version UI inconsistencies + bug.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b05a9c04 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b05a9c04 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b05a9c04 Branch: refs/heads/branch-2.4 Commit: b05a9c04e6e4bb9a19c04e674d8371657fb3170e Parents: 1fe38e1 Author: Xi Wang <[email protected]> Authored: Thu Jun 2 16:04:41 2016 -0700 Committer: Xi Wang <[email protected]> Committed: Thu Jun 2 16:04:51 2016 -0700 ---------------------------------------------------------------------- .../controllers/stackVersions/StackVersionsListCtrl.js | 10 ++++++---- .../main/resources/ui/admin-web/app/styles/main.css | 13 ++++++++++++- .../ui/admin-web/app/views/stackVersions/list.html | 8 +++++--- 3 files changed, 23 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b05a9c04/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js ---------------------------------------------------------------------- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js index b759800..8b697f8 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js +++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsListCtrl.js @@ -137,10 +137,12 @@ angular.module('ambariAdminConsole') $scope.fillStacks = function() { var options = [{label: $t('common.all'), value: ''}]; angular.forEach($scope.stacks, function (stack) { - options.push({ - label: stack.displayName, - value: stack.displayName - }); + if (stack.active) { + options.push({ + label: stack.displayName, + value: stack.displayName + }); + } }); $scope.filter.stack.options = options; if (!$scope.filter.stack.current) { http://git-wip-us.apache.org/repos/asf/ambari/blob/b05a9c04/ambari-admin/src/main/resources/ui/admin-web/app/styles/main.css ---------------------------------------------------------------------- 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 4f2812f..12f44bb 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 @@ -1746,7 +1746,18 @@ thead.view-permission-header > tr > th { #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: 38px; +} .pull-up { margin-top: -2px; } http://git-wip-us.apache.org/repos/asf/ambari/blob/b05a9c04/ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html ---------------------------------------------------------------------- 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 a992898..10d4a82 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 @@ -40,13 +40,15 @@ ng-options="item.label for item in filter.stack.options track by item.value" ></select> </th> - <th class="col-medium"> + <th class="col-medium text-search-container"> <label>{{'common.name' | translate}}</label> <input type="text" class="form-control" ng-change="resetPagination()" ng-model="filter.name" placeholder="{{'common.any' | translate}}"> + <button type="button" class="close clearfilter" ng-show="filter.name" ng-click="filter.name=''; resetPagination()"><span aria-hidden="true">×</span><span class="sr-only">{{'common.controls.close' | translate}}</span></button> </th> - <th class="col-medium"> + <th class="col-medium text-search-container"> <label>{{'common.version' | translate}}</label> <input type="text" class="form-control" ng-change="resetPagination()" ng-model="filter.version" placeholder="{{'common.any' | translate}}"> + <button type="button" class="close clearfilter" ng-show="filter.version" ng-click="filter.version=''; resetPagination()"><span aria-hidden="true">×</span><span class="sr-only">{{'common.controls.close' | translate}}</span></button> </th> <th class="col-small"> <label>{{'common.cluster' | translate}}</label> @@ -56,7 +58,7 @@ ng-options="item.label for item in filter.cluster.options track by item.value" ></select> </th> - <th></th> + <th class="col-small"></th> </tr> </thead> <tbody>
