katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-filter.html

@@ -1,23 +1,23 @@
 <span page-title ng-model="filter">{{ 'Package Filter:' | translate }} {{ filter.name }}</span>
 
 <nav>
-  <ul class="nav nav-tabs">
+  <ul class="nav nav-tabs nav-tabs-pf">
 
-    <li ng-class="{active: isState('content-view.filter.rpm.edit')}">
-      <a ui-sref="content-view.filter.rpm.edit" translate>
+    <li ng-class="{active: isState('content-view.yum.filter.rpm.edit')}">
+      <a ui-sref="content-view.yum.filter.rpm.edit" translate>
         Details
       </a>
     </li>
 
-    <li ng-class="{active: isState('content-view.filter.rpm.details')}">
-      <a ui-sref="content-view.filter.rpm.details" translate>
+    <li ng-class="{active: isState('content-view.yum.filter.rpm.details')}">
+      <a ui-sref="content-view.yum.filter.rpm.details" translate>
         RPMs
       </a>
     </li>
 
-    <li ng-class="{active: isState('content-view.filter.rpm.repositories')}"
+    <li ng-class="{active: isState('content-view.yum.filter.rpm.repositories')}"
         ng-show="!contentView.permissions.editable">
-      <a ui-sref="content-view.filter.rpm.repositories({filterId: filter.id})"
+      <a ui-sref="content-view.yum.filter.rpm.repositories({filterId: filter.id})"
          ng-include="'content-views/details/filters/views/partials/filter-repositories-count.html'">
       </a>
     </li>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-group-filter-details.html

@@ -1,16 +1,16 @@
 <div data-extend-template="layouts/partials/table.html">
 
   <div data-block="list-actions">
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
             ng-disabled="table.numSelected === 0"
-            ng-show="isState('content-view.filter.package_group.list') && permitted('edit_content_views', contentView)"
+            ng-show="isState('content-view.yum.filter.package_group.list') && permitted('edit_content_views', contentView)"
             ng-click="removePackageGroups(filter)">
       <span translate>Remove Package Group</span>
     </button>
 
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
             ng-disabled="table.numSelected === 0"
-            ng-show="isState('content-view.filter.package_group.available') && permitted('edit_content_views', contentView)"
+            ng-show="isState('content-view.yum.filter.package_group.available') && permitted('edit_content_views', contentView)"
             ng-click="addPackageGroups(filter)">
       <span translate>Add Package Group</span>
     </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-group-filter.html

@@ -2,36 +2,36 @@
 
 <div class="details details-full">
   <nav>
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs nav-tabs-pf">
 
-      <li ng-class="{active: isState('content-view.filter.package_group.edit')}">
-        <a ui-sref="content-view.filter.package_group.edit">
+      <li ng-class="{active: isState('content-view.yum.filter.package_group.edit')}">
+        <a ui-sref="content-view.yum.filter.package_group.edit">
         <span translate>
 	  Details
         </span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-view.filter.package_group.list')}">
-        <a ui-sref="content-view.filter.package_group.list({filterId: filter.id})">
+      <li ng-class="{active: isState('content-view.yum.filter.package_group.list')}">
+        <a ui-sref="content-view.yum.filter.package_group.list({filterId: filter.id})">
         <span translate>
           List/Remove
         </span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-view.filter.package_group.available')}"
+      <li ng-class="{active: isState('content-view.yum.filter.package_group.available')}"
           ng-show="!contentView.permissions.editable">
-        <a ui-sref="content-view.filter.package_group.available({filterId: filter.id})">
+        <a ui-sref="content-view.yum.filter.package_group.available({filterId: filter.id})">
         <span translate>
           Add
         </span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-view.filter.package_group.repositories')}"
+      <li ng-class="{active: isState('content-view.yum.filter.package_group.repositories')}"
           ng-show="!contentView.permissions.editable">
-        <a ui-sref="content-view.filter.package_group.repositories({filterId: filter.id})"
+        <a ui-sref="content-view.yum.filter.package_group.repositories({filterId: filter.id})"
            ng-include="'content-views/details/filters/views/partials/filter-repositories-count.html'">
         </a>
       </li>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/partials/filter-repositories-count.html

@@ -1,2 +1,2 @@
-<span translate>Affected repositories</span>
-<span class="badge">{{ filter.repositories.length || 'all' | translate }}</span>
+<span translate>Affected Repositories</span>
+<span class="badge">{{ filterRepositoriesByType().length || 'all' | translate }}</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.controller.js

@@ -19,6 +19,7 @@ angular.module('Bastion.content-views').controller('ContentViewHistoryController
             'sort_by': 'created_at',
             'sort_order': 'DESC'
         });
+        $scope.controllerName = 'katello_content_views';
 
         nutupane.table.closeItem = function () {};
         $scope.table = nutupane.table;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/views/content-view-history.html

@@ -1,8 +1,6 @@
 <span page-title ng-model="contentView">{{ 'History for Content View:' | translate }} {{ contentView.name }}</span>
 
-<header data-block="sub-header">
-  <h3 translate>Promotion History</h3>
-</header>
+<h3 translate>Promotion History</h3>
 
 <div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-names.controller.js

@@ -18,6 +18,7 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModuleNames
             {id: $scope.$stateParams.contentViewId},
             'availablePuppetModuleNames'
         );
+        $scope.controllerName = 'katello_content_views';
         nutupane.masterOnly = true;
         $scope.table = nutupane.table;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/content-view-puppet-module-versions.controller.js

@@ -24,6 +24,7 @@ angular.module('Bastion.content-views').controller('ContentViewPuppetModuleVersi
         };
 
         nutupane = new Nutupane(ContentView, params, 'availablePuppetModules');
+        $scope.controllerName = 'katello_content_views';
         nutupane.masterOnly = true;
         $scope.table = nutupane.table;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-names.html

@@ -1,10 +1,8 @@
 <span page-title ng-model="contentView">{{ 'Available Puppet Modules for Content View:' | translate }} {{ contentView.name }}</span>
 
-<header data-block="sub-header">
-  <h3 translate>
-    Select A New Puppet Module To Add
-  </h3>
-</header>
+<h3 translate>
+  Select A New Puppet Module To Add
+</h3>
 
 <div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>
@@ -16,20 +14,18 @@
   </span>
 
   <div data-block="search">
-    <div class="col-sm-3">
-      <div class="input-group">
-        <input type="text"
-               class="form-control"
-               placeholder="{{ 'Filter...' | translate }}"
-               ng-model="table.searchTerm"
-               bst-on-enter="table.search(table.searchTerm)"
-               ng-trim="false"
-               uib-typeahead="item.label for item in table.fetchAutocomplete($viewValue)"
-               typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
-        <span class="input-group-btn">
-          <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
-        </span>
-      </div>
+    <div class="input-group">
+      <input type="text"
+             class="form-control"
+             placeholder="{{ 'Filter...' | translate }}"
+             ng-model="table.searchTerm"
+             bst-on-enter="table.search(table.searchTerm)"
+             ng-trim="false"
+             uib-typeahead="item.label for item in table.fetchAutocomplete($viewValue)"
+             typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
+      <span class="input-group-btn">
+        <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
+      </span>
     </div>
   </div>
 
@@ -47,6 +43,8 @@
           <td >{{ item.name }}</td>
           <td  class="action-cell">
             <button translate
+                    type="button"
+                    class="btn btn-default"
                     ng-hide="denied('edit_content_views', contentView)"
                     ng-click="selectVersion(item.name)">
               Select a Version

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-versions.html

@@ -1,10 +1,8 @@
 <span page-title ng-model="$stateParams">{{ 'Versions for Puppet Module:' | translate }} {{ $stateParams.moduleName }}</span>
 
-<header data-block="sub-header">
-  <h3 translate>
-    Select an Available Version of {{ $stateParams.moduleName }}
-  </h3>
-</header>
+<h3 translate>
+  Select an Available Version of {{ $stateParams.moduleName }}
+</h3>
 
 <div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>
@@ -16,21 +14,19 @@
   </span>
 
   <div data-block="search">
-    <div class="col-sm-3">
-      <div class="input-group">
-        <input type="text"
-               class="form-control"
-               placeholder="{{ 'Filter...' | translate }}"
-               ng-model="table.searchTerm"
-               bst-on-enter="table.search(table.searchTerm)"
-               ng-trim="false"
-               typeahead="item.label for item in table.fetchAutocomplete($viewValue)"
-               typeahead-empty
-               typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
-        <span class="input-group-btn">
-          <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
-        </span>
-      </div>
+    <div class="input-group">
+      <input type="text"
+             class="form-control"
+             placeholder="{{ 'Filter...' | translate }}"
+             ng-model="table.searchTerm"
+             bst-on-enter="table.search(table.searchTerm)"
+             ng-trim="false"
+             uib-typeahead="item.label for item in table.fetchAutocomplete($viewValue)"
+             typeahead-empty
+             typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
+      <span class="input-group-btn">
+        <button ng-click="table.search(table.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
+      </span>
     </div>
   </div>
 
@@ -56,7 +52,7 @@
           </ul>
         </td>
         <td bst-table-cell class="action-cell">
-          <button translate
+          <button type="button" class="btn btn-default" translate
                   ng-hide="denied('edit_content_views', contentView)"
                   ng-click="selectVersion(item)">
             Select Version

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-modules.html

@@ -4,7 +4,7 @@
   <span data-block="header" translate>Currently Selected Puppet Modules</span>
 
   <div data-block="list-actions">
-    <button class="btn btn-default"
+    <button type="button" class="btn btn-default"
             ng-hide="denied('edit_content_views', contentView)"
             ui-sref="content-view.puppet-modules.names">
       <span translate>Add New Module</span>
@@ -36,12 +36,12 @@
           <td bst-table-cell >{{ contentViewPuppetModule.author}}</td>
           <td bst-table-cell >{{ versionText(contentViewPuppetModule) }}</td>
           <td bst-table-cell class="action-cell">
-            <button translate
+            <button type="button" class="btn btn-default" translate
                     ng-hide="denied('edit_content_views', contentView)"
                     ng-click="selectNewVersion(contentViewPuppetModule)">
               Select new version
             </button>
-            <button translate
+            <button type="button" class="btn btn-default" translate
                     ng-hide="denied('edit_content_views', contentView)"
                     ng-click="removeModule(contentViewPuppetModule)">
               Remove Module

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-details.html

@@ -14,7 +14,7 @@
 
   <nav data-block="item-actions">
     <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button class="btn btn-default" ng-disabled="denied('publish_content_views', contentView)" ui-sref="content-view.publish">
+      <button type="button" class="btn btn-default" ng-disabled="denied('publish_content_views', contentView)" ui-sref="content-view.publish">
         <span translate>Publish New Version</span>
       </button>
 
@@ -68,7 +68,7 @@
       </li>
 
       <li uib-dropdown
-          ng-class="{active: stateIncludes('content-view.repositories.yum') || stateIncludes('content-view.filters')}"
+          ng-class="{active: stateIncludes('content-view.repositories.yum') || stateIncludes('content-view.yum.filters')}"
           ng-hide="contentView.composite">
         <a uib-dropdown-toggle>
           <span translate>Yum Content</span>
@@ -81,7 +81,7 @@
             </a>
           </li>
           <li>
-            <a ui-sref="content-view.filters" translate>
+            <a ui-sref="content-view.yum.filters" translate>
               Filters
             </a>
           </li>
@@ -102,11 +102,25 @@
         </a>
       </li>
 
-      <li ng-class="{active: stateIncludes('content-view.repositories.docker')}"
+      <li uib-dropdown
+          ng-class="{active: stateIncludes('content-view.repositories.docker') || stateIncludes('content-view.docker.filters')}"
           ng-hide="contentView.composite">
-        <a ui-sref="content-view.repositories.docker.list" translate>
-          Docker Content
+        <a uib-dropdown-toggle>
+          <span translate>Docker Content</span>
+          <i class="fa fa-chevron-down"></i>
         </a>
+        <ul uib-dropdown-menu>
+          <li>
+            <a ui-sref="content-view.repositories.docker.list" translate>
+              Repositories
+            </a>
+          </li>
+          <li>
+            <a ui-sref="content-view.docker.filters" translate>
+              Filters
+            </a>
+          </li>
+        </ul>
       </li>
 
       <li ng-class="{active: stateIncludes('content-view.repositories.ostree')}"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html

@@ -1,13 +1,11 @@
 <span page-title ng-model="contentView">{{ 'Repositories for Content View:' | translate }} {{ contentView.name }}</span>
 
-<header data-block="sub-header">
-  <h3 translate>
-    Docker Repository Selection
-  </h3>
-</header>
+<h3 translate>
+  Docker Repository Selection
+</h3>
 
 <nav data-block="navigation">
-  <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
+  <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('edit_content_views', contentView)">
     <li ng-class="{active: isState('content-view.repositories.docker.list')}">
       <a ui-sref="content-view.repositories.docker.list">
         <span translate>
@@ -27,13 +25,13 @@
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
     <div class="col-sm-4">
-      <button class="btn btn-default"
+      <button type="button" class="btn btn-default"
               ng-disabled="table.numSelected === 0"
               ng-show="isState('content-view.repositories.docker.list') && permitted('edit_content_views', contentView)"
               ng-click="removeRepositories(contentView)">
         <span translate>Remove Repositories</span>
       </button>
-      <button class="btn btn-default"
+      <button type="button" class="btn btn-default"
               ng-disabled="table.numSelected === 0"
               ng-show="isState('content-view.repositories.docker.available') && permitted('edit_content_views', contentView)"
               ng-click="addRepositories(contentView)">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-file-repositories.html

@@ -1,11 +1,9 @@
 <span page-title ng-model="contentView">{{ 'Repositories for Content View:' | translate }} {{ contentView.name }}</span>
 
-<header data-block="sub-header">
-  <h3 translate>File Repositories</h3>
-</header>
+<h3 translate>File Repositories</h3>
 
 <nav data-block="navigation">
-  <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
+  <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('edit_content_views', contentView)">
     <li ng-class="{active: isState('content-view.repositories.file.list')}">
       <a ui-sref="content-view.repositories.file.list">
         <span translate>
@@ -24,13 +22,13 @@
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
             ng-disabled="table.numSelected === 0"
             ng-show="isState('content-view.repositories.file.list') && permitted('edit_content_views', contentView)"
             ng-click="removeRepositories(contentView)">
       <span translate>Remove Repositories</span>
     </button>
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
             ng-disabled="table.numSelected === 0"
             ng-show="isState('content-view.repositories.file.available') && permitted('edit_content_views', contentView)"
             ng-click="addRepositories(contentView)">
@@ -63,7 +61,7 @@
           row-select="repository"
           ng-repeat="repository in table.rows | filter:repositorySearch | filter:repositoryFilter as filteredItems">
         <td bst-table-cell>
-          <a ui-sref="products.details.repositories.info({productId: repository.product.id, repositoryId: repository.id})">
+          <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.id})">
             {{ repository.name }}
           </a>
         </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html

@@ -1,7 +1,6 @@
 <span page-title ng-model="contentView">{{ 'Details for Content View:' | translate }} {{ contentView.name }}</span>
-<header data-block="sub-header">
-  <h3 translate>Details for {{ contentView.name }}</h3>
-</header>
+
+<h3 translate>Details for {{ contentView.name }}</h3>
 
 <div class="row">
   <div class="col-sm-6">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-ostree-repositories.html

@@ -1,11 +1,9 @@
 <span page-title ng-model="contentView">{{ 'Repositories for Content View:' | translate }} {{ contentView.name }}</span>
 
-<header data-block="sub-header">
-  <h3 translate>OSTree Repositories</h3>
-</header>
+<h3 translate>OSTree Repositories</h3>
 
 <nav data-block="navigation">
-  <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
+  <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('edit_content_views', contentView)">
     <li ng-class="{active: isState('content-view.repositories.ostree.list')}">
       <a ui-sref="content-view.repositories.ostree.list">
         <span translate>
@@ -24,13 +22,13 @@
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
             ng-disabled="table.numSelected === 0"
             ng-show="isState('content-view.repositories.ostree.list') && permitted('edit_content_views', contentView)"
             ng-click="removeRepositories(contentView)">
       <span translate>Remove Repositories</span>
     </button>
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
             ng-disabled="table.numSelected === 0"
             ng-show="isState('content-view.repositories.ostree.available') && permitted('edit_content_views', contentView)"
             ng-click="addRepositories(contentView)">
@@ -63,7 +61,7 @@
           row-select="repository"
           ng-repeat="repository in table.rows | filter:repositorySearch | filter:repositoryFilter as filteredItems">
         <td bst-table-cell>
-          <a ui-sref="products.details.repositories.info({productId: repository.product.id, repositoryId: repository.id})">
+          <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.id})">
             {{ repository.name }}
           </a>
         </td>