AMBARI-17021. VDF: REgister Version UI inconsistencies + bug.(xiwang)

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) {

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;
 }

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">&times;</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">&times;</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>