katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-docker.html

@@ -1,13 +1,7 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
-  <div class="well" data-block="filters">
-    <div>
-      <select ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
-      <select ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
-    </div>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
+    <select class="form-control" ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
   </div>
 
   <span data-block="no-rows-message" translate>
@@ -28,12 +22,11 @@
     </thead>
 
     <tbody>
-      <tr bst-table-row ng-repeat="dockerTag in detailsTable.rows">
+      <tr bst-table-row ng-repeat="dockerTag in table.rows">
         <td bst-table-cell>{{ dockerTag.name }}</td>
         <td bst-table-cell>{{ dockerTag.product.name }}</td>
         <td bst-table-cell>{{ dockerTag.repository.name }}</td>
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-errata.html

@@ -1,13 +1,7 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
-  <div class="well" data-block="filters">
-    <div>
-      <select ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
-      <select ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
-    </div>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
+    <select class="form-control" ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
   </div>
 
   <span data-block="no-rows-message" translate>
@@ -24,15 +18,15 @@
         <th bst-table-column="errataId" sortable>{{ "Errata ID" | translate }}</th>
         <th bst-table-column="title">{{ "Title" | translate }}</th>
         <th bst-table-column="type">{{ "Type" | translate }}</th>
-        <th bst-table-column="numberOfContentHosts">{{ "Affected Content Hosts" | translate }}</th>
+        <th bst-table-column="numberOfContentHosts">{{ "Applicable Content Hosts" | translate }}</th>
         <th bst-table-column="updated">{{ "Updated" | translate }}</th>
       </tr>
     </thead>
 
     <tbody>
-      <tr bst-table-row ng-repeat="errata in detailsTable.rows">
+      <tr bst-table-row ng-repeat="errata in table.rows">
         <td bst-table-cell>
-          <a ui-sref="errata.details.info({errataId: errata.id})">
+          <a ui-sref="erratum.info({errataId: errata.id})">
             {{ errata.errata_id }}
           </a>
         </td>
@@ -60,5 +54,4 @@
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-ostree.html

@@ -1,13 +1,7 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
-  <div class="well" data-block="filters">
-    <div>
-      <select ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
-      <select ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
-    </div>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
+    <select class="form-control" ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
   </div>
 
   <span data-block="no-rows-message" translate>
@@ -29,7 +23,7 @@
     </thead>
 
     <tbody>
-      <tr bst-table-row ng-repeat="branch in detailsTable.rows">
+      <tr bst-table-row ng-repeat="branch in table.rows">
         <td bst-table-cell>{{ branch.name }}</td>
         <td bst-table-cell>{{ branch.version }}</td>
         <td bst-table-cell>{{ branch.commit }}</td>
@@ -37,5 +31,4 @@
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-packages.html

@@ -1,13 +1,7 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
-  <div class="well" data-block="filters">
-    <div>
-      <select ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
-      <select ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
-    </div>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
+    <select class="form-control" ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
   </div>
 
   <span data-block="no-rows-message" translate>
@@ -29,7 +23,7 @@
     </thead>
 
     <tbody>
-      <tr bst-table-row ng-repeat="package in detailsTable.rows">
+      <tr bst-table-row ng-repeat="package in table.rows">
         <td bst-table-cell>{{ package.name }}</td>
         <td bst-table-cell>{{ package.version }}</td>
         <td bst-table-cell>{{ package.release }}</td>
@@ -37,5 +31,4 @@
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-puppet-modules.html

@@ -1,12 +1,6 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
-  <div class="well" data-block="filters">
-    <div>
-      <select ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
-    </div>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
   </div>
 
   <table data-block="table" class="table table-striped table-bordered">
@@ -27,12 +21,11 @@
     </span>
 
     <tbody>
-      <tr bst-table-row ng-repeat="puppetModule in detailsTable.rows">
+      <tr bst-table-row ng-repeat="puppetModule in table.rows">
         <td bst-table-cell>{{ puppetModule.name }}</td>
         <td bst-table-cell>{{ puppetModule.author }}</td>
         <td bst-table-cell>{{ puppetModule.version }}</td>
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-repositories.html

@@ -1,10 +1,6 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
-  <span class="input-group-addon" data-block="search-filter">
-    <select ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="search-filter">
+    <select class="form-control" ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
   </span>
 
   <table data-block="table" class="table table-striped table-bordered">
@@ -24,11 +20,10 @@
     </span>
 
     <tbody>
-      <tr bst-table-row ng-repeat="repository in detailsTable.rows">
+      <tr bst-table-row ng-repeat="repository in table.rows">
         <td bst-table-cell>{{ repository.name }}</td>
         <td bst-table-cell>{{ repository.product.name }}</td>
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment.html

@@ -1,53 +1,34 @@
-<div data-extend-template="layouts/panel.html">
-  <section data-block="panel" class="details-page">
-    <div ng-show="panel.error" bst-alerts error-messages="errorMessages"></div>
-
-    <div ng-hide="panel.error">
-      <ol class="breadcrumb">
-        <li>
-          <a ui-sref="environments.index" translate>Environments List</a>
-        </li>
-
-        <li class="active">
-          <a translate>
-            {{ environment.name }} Environment
-          </a>
-        </li>
-      </ol>
-
-      <div class="row">
-        <h1 class="col-sm-12">
-          <span translate>Environment: {{ environment.name }}</span>
-          <button ng-show="!environment.library && !environment.successor"
-                  ng-click="remove(environment)"
-                  class="btn btn-default fr">
-            <i class="fa fa-trash-o inline-icon"></i>
-            Remove Environment
-          </button>
-        </h1>
-      </div>
-
-      <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
-      <nav>
-        <ul class="nav nav-tabs">
-
-          <li ng-repeat="type in contentTypes" ng-class="{active: isState('environments.environment.' + type.state)}">
-            <a ng-href="{{ $state.href('environments.environment.' + type.state, {environmentId: environment.id}) }}">
-              <span translate>{{ type.display }}</span>
-            </a>
-          </li>
-
-          <li ng-class="{active: isState('environments.environment.details')}">
-            <a ui-sref="environments.environment.details({environmentId: environment.id})">
-              <span translate>Details</span>
-            </a>
-          </li>
-
-        </ul>
-      </nav>
-
-      <div ui-view></div>
-    </div>
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    {{ environment.name }}
+  </header>
+
+  <div data-block="item-actions">
+    <button ng-show="!environment.library && !environment.successor"
+            ng-click="remove(environment)"
+            type="button"
+            class="btn btn-default">
+      <span translate>Remove Environment</span>
+    </button>
+  </div>
+
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs">
+      <li ng-class="{active: isState('environment.details')}">
+        <a ui-sref="environment.details({environmentId: environment.id})">
+          <span translate>Details</span>
+        </a>
+      </li>
+
+      <li ng-repeat="type in contentTypes" ng-class="{active: isState('environment.' + type.state)}">
+        <a ng-href="{{ $state.href('environment.' + type.state, {environmentId: environment.id}) }}">
+          <span translate>{{ type.display }}</span>
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <section data-block="content">
+    <div ui-view></div>
   </section>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.routes.js

@@ -9,83 +9,127 @@
  */
 angular.module('Bastion.environments').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('environments', {
-        abstract: true,
+        url: '/lifecycle_environments',
         permission: 'view_lifecycle_environments',
-        template: '<div ui-view></div>'
+        template: '<div ui-view></div>',
+        views: {
+            '@': {
+                controller: 'EnvironmentsController',
+                templateUrl: 'environments/views/environments.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: '{{ "Environments" | translate }}'
+        }
     });
 
-    $stateProvider.state('environments.index', {
-        url: '/lifecycle_environments',
-        permission: 'view_lifecycle_environments',
-        controller: 'EnvironmentsController',
-        templateUrl: 'environments/views/environments.html'
-    })
-    .state('environments.new', {
+    $stateProvider.state('environments.new', {
         url: '/lifecycle_environments/:priorId/new',
         permission: 'create_lifecycle_environments',
-        controller: 'NewEnvironmentController',
-        templateUrl: 'environments/views/new-environment.html'
+        views: {
+            '@': {
+                controller: 'NewEnvironmentController',
+                templateUrl: 'environments/views/new-environment.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: '{{ "New Environment" | translate }}',
+            parent: 'environments'
+        }
     });
 
-    $stateProvider.state('environments.environment', {
+    $stateProvider.state('environment', {
+        abstract: true,
         url: '/lifecycle_environments/:environmentId',
         permission: 'view_lifecycle_environments',
         controller: 'EnvironmentController',
         templateUrl: 'environments/details/views/environment.html'
     })
-    .state('environments.environment.details', {
-        url: '/details',
+    .state('environment.details', {
+        url: '',
         permission: 'view_lifecycle_environments',
-        templateUrl: 'environments/details/views/environment-details.html'
+        templateUrl: 'environments/details/views/environment-details.html',
+        ncyBreadcrumb: {
+            label: '{{ environment.name }}',
+            parent: 'environments'
+        }
     })
-    .state('environments.environment.errata', {
+    .state('environment.errata', {
         url: '/errata?repositoryId&contentViewId',
         reloadOnSearch: false,
         permission: 'view_lifecycle_environments',
         controller: 'EnvironmentContentController',
-        templateUrl: 'environments/details/views/environment-errata.html'
+        templateUrl: 'environments/details/views/environment-errata.html',
+        ncyBreadcrumb: {
+            label: '{{ "Errata" | translate }}',
+            parent: 'environment.details'
+        }
     })
-    .state('environments.environment.repositories', {
+    .state('environment.repositories', {
         url: '/repositories?contentViewId',
         reloadOnSearch: false,
         permission: 'view_lifecycle_environments',
         controller: 'EnvironmentContentController',
-        templateUrl: 'environments/details/views/environment-repositories.html'
+        templateUrl: 'environments/details/views/environment-repositories.html',
+        ncyBreadcrumb: {
+            label: '{{ "Repositories" | translate }}',
+            parent: 'environment.details'
+        }
     })
-    .state('environments.environment.packages', {
+    .state('environment.packages', {
         url: '/packages?repositoryId&contentViewId',
         reloadOnSearch: false,
         permission: 'view_lifecycle_environments',
         controller: 'EnvironmentContentController',
-        templateUrl: 'environments/details/views/environment-packages.html'
+        templateUrl: 'environments/details/views/environment-packages.html',
+        ncyBreadcrumb: {
+            label: '{{ "Packages" | translate }}',
+            parent: 'environment.details'
+        }
     })
-    .state('environments.environment.puppet-modules', {
+    .state('environment.puppet-modules', {
         url: '/puppet-modules?contentViewId',
         reloadOnSearch: false,
         permission: 'view_lifecycle_environments',
         controller: 'EnvironmentContentController',
-        templateUrl: 'environments/details/views/environment-puppet-modules.html'
+        templateUrl: 'environments/details/views/environment-puppet-modules.html',
+        ncyBreadcrumb: {
+            label: '{{ "Puppet Modules" | translate }}',
+            parent: 'environment.details'
+        }
     })
-    .state('environments.environment.docker', {
+    .state('environment.docker', {
         url: '/docker?repositoryId&contentViewId',
         reloadOnSearch: false,
         permission: 'view_lifecycle_environments',
         controller: 'EnvironmentContentController',
-        templateUrl: 'environments/details/views/environment-docker.html'
+        templateUrl: 'environments/details/views/environment-docker.html',
+        ncyBreadcrumb: {
+            label: '{{ "Docker" | translate }}',
+            parent: 'environment.details'
+        }
     })
-    .state('environments.environment.ostree', {
+    .state('environment.ostree', {
         url: '/ostree?repositoryId&contentViewId',
         reloadOnSearch: false,
         permission: 'view_lifecycle_environments',
         controller: 'EnvironmentContentController',
-        templateUrl: 'environments/details/views/environment-ostree.html'
+        templateUrl: 'environments/details/views/environment-ostree.html',
+        ncyBreadcrumb: {
+            label: '{{ "OSTree Branches" | translate }}',
+            parent: 'environment.details'
+        }
     })
-    .state('environments.environment.content-views', {
+    .state('environment.content-views', {
         url: '/content-views',
         reloadOnSearch: false,
         permission: 'view_lifecycle_environments',
         controller: 'EnvironmentContentController',
-        templateUrl: 'environments/details/views/environment-content-views.html'
+        templateUrl: 'environments/details/views/environment-content-views.html',
+        ncyBreadcrumb: {
+            label: '{{ "Content Views" | translate }}',
+            parent: 'environment.details'
+        }
     });
 
 }]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/new-environment.controller.js

@@ -11,7 +11,7 @@
     function NewEnvironmentController($scope, Environment, FormUtils) {
 
         function success() {
-            $scope.transitionTo('environments.index');
+            $scope.transitionTo('environments');
         }
 
         function error(response) {