katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register.html

@@ -1,37 +1,32 @@
 <span page-title>{{ 'Register a Content Host' | translate }}</span>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
+<section data-extend-template="layouts/details-page-with-breadcrumbs.html">
 
-  <header class="details-header new-header">
-    <h2 class="fl" translate>Content Host Registration</h2>
-
-    <div class="fr">
-      <button class="btn btn-default" ui-sref="content-hosts.index">
-        <i class="fa fa-remove"></i>
-        {{ "Close" | translate }}
-      </button>
-    </div>
+  <header data-block="header">
+    <h2 translate>Content Host Registration</h2>
   </header>
 
- <p translate>To register a content host to this server, follow these steps.</p>
-  <ol>
-    <li ng-hide="noCapsulesFound">
-      <p translate>Select a Content Source:</p>
-      <p><select ng-model="selectedCapsule" ng-options="capsule.name for capsule in capsules.results"></select></p>
-    </li>
-    <li>
-      <p translate>Install the pre-built bootstrap RPM:</p>
-      <pre><code>rpm -Uvh http://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/{{ consumerCertRPM }}</code></pre>
-    </li>
-    <li>
-      <p translate>Run subscription-manager in a console on the client host.  You may use an Activation Key to register:</p>
-      <pre><code>subscription-manager register --org="{{ organization.label }}" --activationkey="&ltActivation Key Name&gt"</code></pre>
-      <p translate>or authenticate with a username and password:</p>
-      <pre><code>subscription-manager register --org="{{ organization.label }}" --environment="Library"</code></pre>
-    </li>
-    <li>
-      <p translate>Install katello-agent for remote actions and displaying errata information:</p>
-      <pre><code>yum -y install katello-agent</code></pre>
-    </li>
-  </ol>
+  <div data-block="content">
+    <p translate>To register a content host to this server, follow these steps.</p>
+    <ol>
+      <li ng-hide="noCapsulesFound">
+        <p translate>Select a Content Source:</p>
+        <p><select ng-model="selectedCapsule" ng-options="capsule.name for capsule in capsules.results"></select></p>
+      </li>
+      <li>
+        <p translate>Install the pre-built bootstrap RPM:</p>
+        <pre><code>rpm -Uvh http://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/{{ consumerCertRPM }}</code></pre>
+      </li>
+      <li>
+        <p translate>Run subscription-manager in a console on the client host.  You may use an Activation Key to register:</p>
+        <pre><code>subscription-manager register --org="{{ organization.label }}" --activationkey="&ltActivation Key Name&gt"</code></pre>
+        <p translate>or authenticate with a username and password:</p>
+        <pre><code>subscription-manager register --org="{{ organization.label }}" --environment="Library"</code></pre>
+      </li>
+      <li>
+        <p translate>Install katello-agent for remote actions and displaying errata information:</p>
+        <pre><code>yum -y install katello-agent</code></pre>
+      </li>
+    </ol>
+  </div>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.controller.js

@@ -23,8 +23,8 @@ angular.module('Bastion.content-views').controller('ContentViewsController',
             'sort_order': 'ASC'
         });
         nutupane.masterOnly = true;
+        $scope.controllerName = 'katello_content_views';
 
         $scope.table = nutupane.table;
-        $scope.controllerName = 'katello_content_views';
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js

@@ -429,18 +429,24 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
         }
     })
 
-    .state('content-view.filters', {
+    .state('content-view.yum', {
+        url: '/repositories/yum',
+        abstract: true,
+        template: '<div ui-view></div>'
+    })
+
+    .state('content-view.yum.filters', {
         url: '/filters',
         permission: 'view_content_views',
         controller: 'FiltersController',
         templateUrl: 'content-views/details/filters/views/filters.html',
         ncyBreadcrumb: {
-            label: '{{ "Filters" | translate }}',
+            label: '{{ "Yum Filters" | translate }}',
             parent: 'content-view.info'
         }
 
     })
-    .state('content-view.filters.new', {
+    .state('content-view.yum.filters.new', {
         url: '/new',
         permission: 'edit_content_views',
         views: {
@@ -450,156 +456,232 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
             }
         },
         ncyBreadcrumb: {
-            label: '{{ "Create Filter" | translate }}',
-            parent: 'content-view.filters'
+            label: '{{ "Create Yum Filter" | translate }}',
+            parent: 'content-view.yum.filters'
         }
     });
 
-    $stateProvider.state('content-view.filter', {
+    $stateProvider.state('content-view.yum.filter', {
         abstract: true,
         controller: 'FilterDetailsController',
         templateUrl: 'content-views/details/filters/views/filter-details.html'
     })
 
-    .state('content-view.filter.rpm', {
+    .state('content-view.yum.filter.rpm', {
         abstract: true,
         url: '/filters/:filterId/package',
         permission: 'view_content_views',
         controller: 'PackageFilterController',
         templateUrl: 'content-views/details/filters/views/package-filter.html'
     })
-    .state('content-view.filter.rpm.details', {
+    .state('content-view.yum.filter.rpm.details', {
         url: '/details',
         permission: 'view_content_views',
         controller: 'PackageFilterController',
         templateUrl: 'content-views/details/filters/views/package-filter-details.html',
         ncyBreadcrumb: {
             label: '{{ filter.name }}',
-            parent: 'content-view.filters'
+            parent: 'content-view.yum.filters'
         }
     })
-    .state('content-view.filter.rpm.edit', {
+    .state('content-view.yum.filter.rpm.edit', {
         url: '/edit',
         controller: 'FilterEditController',
         permission: 'edit_content_views',
         templateUrl: 'content-views/details/filters/views/edit-filter.html',
         ncyBreadcrumb: {
             label: '{{ "Edit" | translate}} {{ filter.name }}',
-            parent: 'content-view.filters'
+            parent: 'content-view.yum.filters'
         }
     })
-    .state('content-view.filter.rpm.repositories', {
+    .state('content-view.yum.filter.rpm.repositories', {
         url: '/repositories',
         permission: 'view_content_views',
         controller: 'FilterRepositoriesController',
         templateUrl: 'content-views/details/filters/views/filter-repositories.html',
         ncyBreadcrumb: {
             label: '{{ "Repositories" | translate }}',
-            parent: 'content-view.filter.rpm.edit'
+            parent: 'content-view.yum.filter.rpm.edit'
         }
     })
 
-    .state('content-view.filter.package_group', {
+    .state('content-view.yum.filter.package_group', {
         abstract: true,
         url: '/filters/:filterId/package-group',
         templateUrl: 'content-views/details/filters/views/package-group-filter.html'
     })
-    .state('content-view.filter.package_group.edit', {
+    .state('content-view.yum.filter.package_group.edit', {
         url: '/edit',
         controller: 'FilterEditController',
         permission: 'edit_content_views',
         templateUrl: 'content-views/details/filters/views/edit-filter.html',
         ncyBreadcrumb: {
             label: '{{ "Edit" | translate }} {{ filter.name }}',
-            parent: 'content-view.filters'
+            parent: 'content-view.yum.filters'
         }
     })
-    .state('content-view.filter.package_group.list', {
+    .state('content-view.yum.filter.package_group.list', {
         url: '/list',
         permission: 'view_content_views',
         controller: 'PackageGroupFilterListController',
         templateUrl: 'content-views/details/filters/views/package-group-filter-details.html',
         ncyBreadcrumb: {
             label: '{{ "Package Groups" | translate }}',
-            parent: 'content-view.filter.package_group.edit'
+            parent: 'content-view.yum.filter.package_group.edit'
         }
     })
-    .state('content-view.filter.package_group.available', {
+    .state('content-view.yum.filter.package_group.available', {
         url: '/available',
         permission: 'edit_content_views',
         controller: 'AvailablePackageGroupFilterController',
         templateUrl: 'content-views/details/filters/views/package-group-filter-details.html',
         ncyBreadcrumb: {
             label: '{{ "Add Package Groups" | translate }}',
-            parent: 'content-view.filter.package_group.edit'
+            parent: 'content-view.yum.filter.package_group.edit'
         }
     })
-    .state('content-view.filter.package_group.repositories', {
+    .state('content-view.yum.filter.package_group.repositories', {
         url: '/repositories',
         permission: 'view_content_views',
         controller: 'FilterRepositoriesController',
         templateUrl: 'content-views/details/filters/views/filter-repositories.html',
         ncyBreadcrumb: {
             label: '{{ "Repositories | translate }}',
-            parent: 'content-view.filter.package_group.edit'
+            parent: 'content-view.yum.filter.package_group.edit'
         }
     })
 
-    .state('content-view.filter.erratum', {
+    .state('content-view.yum.filter.erratum', {
         abstract: true,
         url: '/filters/:filterId/errata',
         controller: 'ErrataFilterController',
         templateUrl: 'content-views/details/filters/views/errata-filter.html'
     })
-    .state('content-view.filter.erratum.edit', {
+    .state('content-view.yum.filter.erratum.edit', {
         url: '/edit',
         controller: 'FilterEditController',
         permission: 'edit_content_views',
         templateUrl: 'content-views/details/filters/views/edit-filter.html',
         ncyBreadcrumb: {
             label: '{{ "Edit" | translate }} {{ filter.name }}',
-            parent: 'content-view.filters'
+            parent: 'content-view.yum.filters'
         }
     })
-    .state('content-view.filter.erratum.list', {
+    .state('content-view.yum.filter.erratum.list', {
         url: '/list',
         permission: 'view_content_views',
         controller: 'ErrataFilterListController',
         templateUrl: 'content-views/details/filters/views/errata-filter-details.html',
         ncyBreadcrumb: {
             label: '{{ "Erratum" | translate }}',
-            parent: 'content-view.filter.erratum.edit'
+            parent: 'content-view.yum.filter.erratum.edit'
         }
     })
-    .state('content-view.filter.erratum.available', {
+    .state('content-view.yum.filter.erratum.available', {
         url: '/available',
         permission: 'edit_content_views',
         controller: 'AvailableErrataFilterController',
         templateUrl: 'content-views/details/filters/views/errata-filter-details.html',
         ncyBreadcrumb: {
             label: '{{ "Add Erratum" | translate }}',
-            parent: 'content-view.filter.erratum.edit'
+            parent: 'content-view.yum.filter.erratum.edit'
         }
     })
-    .state('content-view.filter.erratum.dateType', {
+    .state('content-view.yum.filter.erratum.dateType', {
         url: '/date_type',
         permission: 'view_content_views',
         controller: 'DateTypeErrataFilterController',
         templateUrl: 'content-views/details/filters/views/date-type-errata-filter.html',
         ncyBreadcrumb: {
             label: '{{ filter.name }}',
-            parent: 'content-view.filters'
+            parent: 'content-view.yum.filters'
+        }
+
+    })
+    .state('content-view.yum.filter.erratum.repositories', {
+        url: '/repositories',
+        permission: 'view_content_views',
+        controller: 'FilterRepositoriesController',
+        templateUrl: 'content-views/details/filters/views/filter-repositories.html',
+        ncyBreadcrumb: {
+            label: '{{ "Repositories" | translate }}',
+            parent: 'content-view.yum.filter.erratum.edit'
+        }
+    })
+
+    .state('content-view.docker', {
+        url: '/repositories/docker',
+        abstract: true,
+        template: '<div ui-view></div>'
+    })
+
+    .state('content-view.docker.filters', {
+        url: '/filters',
+        permission: 'view_content_views',
+        controller: 'FiltersController',
+        templateUrl: 'content-views/details/filters/views/filters.html',
+        ncyBreadcrumb: {
+            label: '{{ "Docker Filters" | translate }}',
+            parent: 'content-view.info'
+        }
+
+    })
+    .state('content-view.docker.filters.new', {
+        url: '/new',
+        permission: 'edit_content_views',
+        views: {
+            '@content-view': {
+                controller: 'NewFilterController',
+                templateUrl: 'content-views/details/filters/views/new-filter.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: '{{ "Create Docker Filter" | translate }}',
+            parent: 'content-view.docker.filters'
         }
+    });
+
+    $stateProvider.state('content-view.docker.filter', {
+        abstract: true,
+        controller: 'FilterDetailsController',
+        templateUrl: 'content-views/details/filters/views/filter-details.html'
+    })
 
+    .state('content-view.docker.filter.tag', {
+        abstract: true,
+        url: '/filters/:filterId/docker',
+        permission: 'view_content_views',
+        controller: 'DockerTagFilterController',
+        templateUrl: 'content-views/details/filters/views/docker-filter.html'
+    })
+    .state('content-view.docker.filter.tag.details', {
+        url: '/details',
+        permission: 'view_content_views',
+        controller: 'DockerTagFilterController',
+        templateUrl: 'content-views/details/filters/views/docker-tag-filter-details.html',
+        ncyBreadcrumb: {
+            label: '{{ filter.name }}',
+            parent: 'content-view.docker.filters'
+        }
+    })
+    .state('content-view.docker.filter.tag.edit', {
+        url: '/edit',
+        controller: 'FilterEditController',
+        permission: 'edit_content_views',
+        templateUrl: 'content-views/details/filters/views/edit-filter.html',
+        ncyBreadcrumb: {
+            label: '{{ "Edit" | translate}} {{ filter.name }}',
+            parent: 'content-view.docker.filters'
+        }
     })
-    .state('content-view.filter.erratum.repositories', {
+    .state('content-view.docker.filter.tag.repositories', {
         url: '/repositories',
         permission: 'view_content_views',
         controller: 'FilterRepositoriesController',
         templateUrl: 'content-views/details/filters/views/filter-repositories.html',
         ncyBreadcrumb: {
             label: '{{ "Repositories" | translate }}',
-            parent: 'content-view.filter.erratum.edit'
+            parent: 'content-view.docker.filter.tag.edit'
         }
     })
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-activation-keys.controller.js

@@ -26,6 +26,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionAc
             'sort_order': 'ASC'
         };
         nutupane = new Nutupane(ActivationKey, params);
+        $scope.controllerName = 'katello_activation_keys';
 
         nutupane.searchTransform = function (term) {
             var addition,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-content-hosts.controller.js

@@ -27,6 +27,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
             'sort_order': 'ASC'
         };
         nutupane = new Nutupane(Host, params);
+        $scope.controllerName = 'hosts';
 
         nutupane.searchTransform = function (term) {
             var addition,
@@ -65,7 +66,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
 
         $scope.contentHostsLink = function () {
             var search = $scope.searchString($scope.contentView, $scope.deleteOptions.environments);
-            return $scope.$state.href('content-hosts.index') + '?search=' + search;
+            return $scope.$state.href('content-hosts') + '?search=' + search;
         };
 
         $scope.toggleHosts = function () {

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

@@ -24,7 +24,7 @@
           <td>{{ environmentNames(version).join(', ') }}</td>
           <td>
             <a ui-sref="content-view.version-deletion.environments({contentViewId: contentView.id, versionId: version.id})" ng-show="version.permissions.deletable">
-              <button class="btn btn-default">
+              <button class="btn btn-default" type="button" >
                 <span translate>Remove Version</span>
               </button>
             </a>
@@ -46,7 +46,7 @@
       </span>
     </div>
 
-    <button ng-disabled="working" class="btn btn-danger" ng-click="delete()" >
+    <button ng-disabled="working" type="button" class="btn btn-danger" ng-click="delete()" >
       <i class="fa fa-spinner fa-spin" ng-show="working"></i>
       <span translate>Remove</span>
     </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-activation-keys.html

@@ -46,14 +46,14 @@
 
       <div class="fr">
         <a ui-sref="content-view.versions({contentViewId: contentView.id})" >
-          <button class="btn btn-default" translate>
+          <button type="button" class="btn btn-default" translate>
             Cancel
           </button>
         </a>
-        <button class="btn btn-default" ng-click="transitionBack()" translate>
+        <button type="button" class="btn btn-default" ng-click="transitionBack()" translate>
           Back
         </button>
-        <button class="btn btn-primary" ng-click="processSelection()" ng-disabled="selectedContentViewId === undefined" translate>
+        <button type="button" class="btn btn-primary" ng-click="processSelection()" ng-disabled="selectedContentViewId === undefined" translate>
           Next
         </button>
       </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-confirm.html

@@ -61,14 +61,14 @@
 
     <div class="fr">
       <a ui-sref="content-view.versions({contentViewId: contentView.id})" >
-        <button class="btn btn-default" ng-disabled="deleting" translate>
+        <button type="button" class="btn btn-default" ng-disabled="deleting" translate>
           Cancel
         </button>
       </a>
-      <button class="btn btn-default" ng-click="transitionBack()" ng-disabled="deleting" translate>
+      <button type="button" class="btn btn-default" ng-click="transitionBack()" ng-disabled="deleting" translate>
         Back
       </button>
-      <button class="btn btn-primary" ng-click="performDeletion()" ng-disabled="deleting">
+      <button type="button" class="btn btn-primary" ng-click="performDeletion()" ng-disabled="deleting">
         <i class="fa fa-spinner fa-spin" ng-show="deleting"></i>
         <span translate>Confirm Remove</span>
       </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-content-hosts.html

@@ -37,14 +37,14 @@
 
     <div class="fr">
       <a ui-sref="content-view.versions({contentViewId: contentView.id})" >
-        <button class="btn btn-default" translate>
+        <button type="button" class="btn btn-default" translate>
           Cancel
         </button>
       </a>
-      <button class="btn btn-default" ng-click="transitionBack()" translate>
+      <button type="button" class="btn btn-default" ng-click="transitionBack()" translate>
         Back
       </button>
-      <button class="btn btn-primary" ng-click="processSelection()" ng-disabled="selectedContentViewId === undefined" translate>
+      <button type="button" class="btn btn-primary" ng-click="processSelection()" ng-disabled="selectedContentViewId === undefined" translate>
         Next
       </button>
     </div>