katello 3.2.1.1 → 3.3.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-info.html

@@ -1,102 +1,76 @@
-<div class="details-full pull-left">
-  <section>
+<div data-extend-template="layouts/two-column-details.html">
+  <div data-block="left-column">
     <h4 translate>Subscription Info</h4>
 
-    <div class="detail">
-      <span class="info-label" translate>Name</span>
-      <span class="info-value">{{ subscription.name }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Description</span>
-      <span class="info-value">{{ subscription.description }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Consumed</span>
-      <span class="info-value">{{ subscription | subscriptionConsumedFilter }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Starts</span>
-      <span class="info-value">{{ subscription.start_date | date:"short" }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Ends</span>
-      <span class="info-value">{{ subscription.end_date | date:"short" }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Product ID</span>
-      <span class="info-value">{{ subscription.product_id }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Contract Number</span>
-      <span class="info-value">{{ subscription.contract_number }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Account Number</span>
-      <span class="info-value">{{ subscription.account_number }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Support Level</span>
-      <span class="info-value">{{ subscription.support_level }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Support Type</span>
-      <span class="info-value">{{ subscription.support_type }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Architecture(s)</span>
-      <span class="info-value">{{ subscription.arch }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Type</span>
-      <span class="info-value">{{ subscription.type }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Limits</span>
-      <span class="info-value">{{ subscriptionLimits(subscription) }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Multi-entitlement</span>
-      <span class="info-value">{{ subscription.multi_entitlement | booleanToYesNo }}</span>
-    </div>
-
-    <div class="detail">
-      <span class="info-label" translate>Instance-based</span>
-      <span class="info-value">{{ formatInstanceBased(subscription) }}</span>
-    </div>
-
-    <div class="detail" ng-hide="subscription.stacking_id == ''">
-      <span class="info-label" translate>Stacking ID</span>
-      <span class="info-value">{{ subscription.stacking_id }}</span>
-    </div>
-
-    <div class="detail" ng-hide="subscription.source_pool_id == undefined || subscription.source_pool_id == ''">
-      <span class="info-label" translate>Virtual Guest From</span>
-      <span class="info-value">{{ subscription.name }}</span>
-    </div>
-
-    <div class="detail" ng-hide="subscription.host_id == undefined || subscription.host_id == ''">
-      <span class="info-label" translate>Required Host</span>
-      <span class="info-value">{{ subscription.host.name }}</span>
-    </div>
-  </section>
-
-  <section ng-show="subscription.provided_products.length > 0" class="subscription-products">
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Name</dt>
+      <dd>{{ subscription.name }}</dd>
+
+      <dt translate>Description</dt>
+      <dd>{{ subscription.description }}</dd>
+
+      <dt translate>Consumed</dt>
+      <dd>{{ subscription | subscriptionConsumedFilter }}</dd>
+
+      <dt translate>Starts</dt>
+      <dd>{{ subscription.start_date | date:"short" }}</dd>
+
+      <dt translate>Ends</dt>
+      <dd>{{ subscription.end_date | date:"short" }}</dd>
+
+      <dt translate>Product ID</dt>
+      <dd>{{ subscription.product_id }}</dd>
+
+      <dt translate>Contract Number</dt>
+      <dd>{{ subscription.contract_number }}</dd>
+
+      <dt translate>Account Number</dt>
+      <dd>{{ subscription.account_number }}</dd>
+
+      <dt translate>Support Level</dt>
+      <dd>{{ subscription.support_level }}</dd>
+
+      <dt translate>Support Type</dt>
+      <dd>{{ subscription.support_type }}</dd>
+
+      <dt translate>Architecture(s)</dt>
+      <dd>{{ subscription.arch }}</dd>
+
+      <dt translate>Type</dt>
+      <dd>{{ subscription.type }}</dd>
+
+      <dt translate>Limits</dt>
+      <dd>{{ subscriptionLimits(subscription) }}</dd>
+
+      <dt translate>Multi-entitlement</dt>
+      <dd>{{ subscription.multi_entitlement | booleanToYesNo }}</dd>
+
+      <dt translate>Instance-based</dt>
+      <dd>{{ formatInstanceBased(subscription) }}</dd>
+
+      <dt ng-hide="subscription.stacking_id == ''" translate>Stacking ID</dt>
+      <dd ng-hide="subscription.stacking_id == ''">{{ subscription.stacking_id }}</dd>
+
+      <dt ng-hide="subscription.source_pool_id == undefined || subscription.source_pool_id == ''" translate>Virtual Guest From</dt>
+      <dd ng-hide="subscription.source_pool_id == undefined || subscription.source_pool_id == ''">{{ subscription.name }}</dd>
+
+      <dt ng-hide="subscription.host_id == undefined || subscription.host_id == ''" translate>Required Host</dt>
+      <dd ng-hide="subscription.host_id == undefined || subscription.host_id == ''">{{ subscription.host.name }}</dd>
+    </dl>
+  </div>
+
+  <div data-block="right-column">
     <h4 translate>Provided Products</h4>
-    <div class="detail" ng-repeat="product in subscription.provided_products">
-      <div class="product">{{ product.name }}</div>
-    </div>
-  </section>
+
+    <ul>
+      <li ng-repeat="product in subscription.provided_products">
+        {{ product.name }}
+      </li>
+    </ul>
+
+    <p ng-show="subscription.provided_products.length === 0" translate>
+      No Products are provided by this Subscription.
+    </p>
+  </div>
 </div>
+

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-products.html

@@ -1,4 +1,4 @@
-<div alert type="'info'">
+<div bst-alert="info">
   {{ "Below are the product's repository content sets currently available for this subscription. For Red Hat subscriptions, additional content can be made available through the" | translate}}
   <a ng-href="/katello/providers/redhat_provider" translate>Red Hat Repositories page</a>.
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-details.controller.js

@@ -15,7 +15,7 @@ angular.module('Bastion.subscriptions').controller('ManifestDetailsController',
     function ($scope, $q, CurrentOrganization, Organization) {
 
         $scope.organization = Organization.get({id: CurrentOrganization});
-
+        $scope.redhatProvider = Organization.redhatProvider();
 
         $q.all([$scope.organization.$promise]).then(function () {
             $scope.details = $scope.organization['owner_details'];

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html

@@ -41,7 +41,7 @@
       </button>
       <span ng-show="upstream.idCert == undefined || upstream.idCert.cert == undefined"
         translate>
-        Refreshing manifest not suppported by this manifest.
+        Refreshing manifest not supported by this manifest.
       </span>
     </div>
   </div>
@@ -80,5 +80,5 @@
 
   <div ng-include="'subscriptions/manifest/views/manifest-import-history.html'"></div>
 
-  <a ui-sref="subscriptions.manifest.history()" ng-show="showHistoryMoreLink" translate>More...</a>
+  <a ui-sref="subscriptions-manifest.history" ng-show="showHistoryMoreLink" translate>More...</a>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest.html

@@ -1,46 +1,31 @@
-<div data-extend-template="layouts/panel.html">
-  <div data-block="panel">
-    <section class="nutupane-details" ng-cloak bst-container-scroll>
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    <h2 translate>Subscription Manifest</h2>
+  </header>
 
-      <header class="details-header">
-        <h2 class="pull-left" translate>Subscription Manifest</h2>
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs details-nav" role="menu">
+      <li role="menuitem" ui-sref-active="active">
+        <a ui-sref="subscriptions-manifest.details">
+          <span translate>Details</span>
+        </a>
+      </li>
 
-        <div class="fr">
-          <button class="btn btn-default" ui-sref="subscriptions.index">
-            <i class="fa fa-remove"></i>
-            {{ "Close" | translate }}
-          </button>
-        </div>
-      </header>
+      <li role="menuitem" ui-sref-active="active">
+        <a ui-sref="subscriptions-manifest.import">
+          <span translate>Import/Remove Manifest</span>
+        </a>
+      </li>
 
-      <nav>
-        <ul class="nav nav-tabs">
-          <li ng-class="{active: isState('subscriptions.manifest.details')}">
-            <a class="clickable"
-               translate
-               ui-sref="subscriptions.manifest.details()">
-              Details
-            </a>
-          </li>
-          <li ng-class="{active: stateIncludes('subscriptions.manifest.import')}">
-            <a class="clickable"
-               translate
-               ui-sref="subscriptions.manifest.import()">
-              Actions
-            </a>
-          </li>
-          <li ng-class="{active: stateIncludes('subscriptions.manifest.history')}">
-            <a class="clickable"
-               translate
-               ui-sref="subscriptions.manifest.history()">
-              Import History
-            </a>
-          </li>
-        </ul>
-      </nav>
+      <li role="menuitem" ui-sref-active="active">
+        <a ui-sref="subscriptions-manifest.history">
+          <span translate>Import History</span>
+        </a>
+      </li>
+    </ul>
+  </nav>
 
-      <section class="nutupane-sub-section" ui-view></section>
-
-    </section>
+  <div data-block="content">
+    <section ui-view></section>
   </div>
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.controller.js

@@ -31,19 +31,21 @@ angular.module('Bastion.subscriptions').controller('SubscriptionsController',
         };
 
         nutupane = new Nutupane(Subscription, params);
+        nutupane.masterOnly = true;
         $scope.table = nutupane.table;
         $scope.refreshTable = nutupane.refresh;
         $scope.controllerName = 'katello_subscriptions';
 
-        $scope.table.closeItem = function () {
-            $scope.transitionTo('subscriptions.index');
-        };
-
         $scope.groupedSubscriptions = {};
         $scope.$watch('table.rows', function (rows) {
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
         });
 
+        $scope.hasManifest = false;
+        Organization.get({id: CurrentOrganization}, function (organization) {
+            $scope.hasManifest = organization['owner_details'] && organization['owner_details'].upstreamConsumer;
+        });
+
         $scope.formatConsumed = function (subscription) {
             var quantity = $filter('unlimitedFilter')(subscription.quantity);
 
@@ -58,13 +60,12 @@ angular.module('Bastion.subscriptions').controller('SubscriptionsController',
         };
 
         $scope.redhatProvider = Organization.redhatProvider();
-
         $scope.subscriptions = Subscription.queryPaged();
 
         $scope.$on('$stateChangeSuccess', function () {
             $scope.subscriptions.$promise.then(function () {
                 if ($scope.subscriptions.results.length < 1) {
-                    $scope.transitionTo('subscriptions.manifest.import');
+                    $scope.transitionTo('subscriptions-manifest.import');
                 }
             });
         });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/subscriptions.module.js

@@ -15,110 +15,3 @@ angular.module('Bastion.subscriptions', [
     'Bastion.components',
     'Bastion.components.formatters'
 ]);
-
-/**
- * @ngdoc object
- * @name Bastion.subscriptions.config
- *
- * @requires $stateProvider
- *
- * @description
- *   Used for subscriptions level configuration such as setting up the ui state machine.
- */
-angular.module('Bastion.subscriptions').config(['$stateProvider', function ($stateProvider) {
-    $stateProvider.state('subscriptions', {
-        abstract: true,
-        controller: 'SubscriptionsController',
-        templateUrl: 'subscriptions/views/subscriptions.html'
-    });
-
-    $stateProvider.state('subscriptions.index', {
-        url: '/subscriptions',
-        permission: 'view_subscriptions',
-        views: {
-            'table': {
-                templateUrl: 'subscriptions/views/subscriptions-table-full.html'
-            }
-        }
-    })
-
-    .state('subscriptions.details', {
-        abstract: true,
-        url: '/subscriptions/:subscriptionId',
-        permission: 'view_subscriptions',
-        collapsed: true,
-        views: {
-            'table': {
-                templateUrl: 'subscriptions/views/subscriptions-table-collapsed.html'
-            },
-            'action-panel': {
-                controller: 'SubscriptionDetailsController',
-                templateUrl: 'subscriptions/details/views/subscription-details.html'
-            }
-        }
-    })
-    .state('subscriptions.details.info', {
-        url: '/info',
-        permission: 'view_subscriptions',
-        collapsed: true,
-        templateUrl: 'subscriptions/details/views/subscription-info.html'
-    })
-    .state('subscriptions.details.products', {
-        url: '/products',
-        permission: 'view_subscriptions',
-        collapsed: true,
-        controller: 'SubscriptionProductsController',
-        templateUrl: 'subscriptions/details/views/subscription-products.html'
-    })
-    .state('subscriptions.details.associations-activation-keys', {
-        url: '/associations/activation-keys',
-        permission: 'view_subscriptions',
-        collapsed: true,
-        controller: 'SubscriptionAssociationsActivationKeysController',
-        templateUrl: 'subscriptions/details/views/subscription-associations-activation-keys.html'
-    })
-    .state('subscriptions.details.associations-content-hosts', {
-        url: '/associations/content-hosts',
-        permission: 'view_subscriptions',
-        collapsed: true,
-        controller: 'SubscriptionAssociationsContentHostsController',
-        templateUrl: 'subscriptions/details/views/subscription-associations-content-hosts.html'
-    })
-
-    // manifest states
-    .state('subscriptions.manifest', {
-        abstract: true,
-        collapsed: true,
-        views: {
-            'table': {
-                templateUrl: 'subscriptions/views/subscriptions-table-collapsed.html'
-            },
-            'action-panel': {
-                controller: 'ManifestController',
-                templateUrl: 'subscriptions/manifest/views/manifest.html'
-            }
-        }
-    })
-    .state('subscriptions.manifest.import', {
-        url: '/subscriptions/manifest/import',
-        permission: 'import_manifest',
-        collapsed: true,
-        controller: 'ManifestImportController',
-        templateUrl: 'subscriptions/manifest/views/manifest-import.html'
-    })
-    .state('subscriptions.manifest.details', {
-        url: '/subscriptions/manifest/details',
-        permission: 'import_manifest',
-        collapsed: true,
-        controller: 'ManifestDetailsController',
-        templateUrl: 'subscriptions/manifest/views/manifest-details.html'
-    })
-    .state('subscriptions.manifest.history', {
-        url: '/subscriptions/manifest/history',
-        permission: 'import_manifest',
-        collapsed: true,
-        controller: 'ManifestHistoryController',
-        templateUrl: 'subscriptions/manifest/views/manifest-import-history.html'
-    });
-
-}]);

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

@@ -0,0 +1,110 @@
+/**
+ * @ngdoc object
+ * @name Bastion.subscriptions.config
+ *
+ * @requires $stateProvider
+ *
+ * @description
+ *   Used for subscriptions level configuration such as setting up the ui state machine.
+ */
+angular.module('Bastion.subscriptions').config(['$stateProvider', function ($stateProvider) {
+    $stateProvider.state('subscriptions', {
+        url: '/subscriptions',
+        permission: 'view_subscriptions',
+        template: '<div ui-view></div>',
+        views: {
+            '@': {
+                controller: 'SubscriptionsController',
+                templateUrl: 'subscriptions/views/subscriptions.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: "{{ 'Subscriptions' | translate }}"
+        }
+    });
+
+    $stateProvider.state('subscription', {
+        abstract: true,
+        url: '/subscriptions/:subscriptionId',
+        permission: 'view_subscriptions',
+        controller: 'SubscriptionDetailsController',
+        templateUrl: 'subscriptions/details/views/subscription-details.html'
+    })
+    .state('subscription.info', {
+        url: '',
+        permission: 'view_subscriptions',
+        templateUrl: 'subscriptions/details/views/subscription-info.html',
+        ncyBreadcrumb: {
+            label: "{{ subscription.name }}",
+            parent: 'subscriptions'
+        }
+    })
+    .state('subscription.products', {
+        url: '/products',
+        permission: 'view_subscriptions',
+        controller: 'SubscriptionProductsController',
+        templateUrl: 'subscriptions/details/views/subscription-products.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Product Content' | translate }}",
+            parent: 'subscription.info'
+        }
+    })
+    .state('subscription.activation-keys', {
+        url: '/activation-keys',
+        permission: 'view_subscriptions',
+        controller: 'SubscriptionActivationKeysController',
+        templateUrl: 'subscriptions/details/views/subscription-activation-keys.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Activation Keys' | translate }}",
+            parent: 'subscription.info'
+        }
+    })
+    .state('subscription.content-hosts', {
+        url: '/content-hosts',
+        permission: 'view_subscriptions',
+        controller: 'SubscriptionContentHostsController',
+        templateUrl: 'subscriptions/details/views/subscription-content-hosts.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Content Hosts' | translate }}",
+            parent: 'subscription.info'
+        }
+    });
+
+    $stateProvider.state('subscriptions-manifest', {
+        abstract: true,
+        url: '/subscriptions/manifest',
+        permission: 'import_manifest',
+        controller: 'ManifestController',
+        templateUrl: 'subscriptions/manifest/views/manifest.html'
+    })
+    .state('subscriptions-manifest.details', {
+        url: '/details',
+        permission: 'import_manifest',
+        controller: 'ManifestDetailsController',
+        templateUrl: 'subscriptions/manifest/views/manifest-details.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Manifest Details' | translate }}",
+            parent: 'subscriptions'
+        }
+    })
+    .state('subscriptions-manifest.import', {
+        url: '/import',
+        permission: 'import_manifest',
+        controller: 'ManifestImportController',
+        templateUrl: 'subscriptions/manifest/views/manifest-import.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Import Manifest' | translate }}",
+            parent: 'subscriptions'
+        }
+    })
+    .state('subscriptions-manifest.history', {
+        url: '/history',
+        permission: 'import_manifest',
+        controller: 'ManifestHistoryController',
+        templateUrl: 'subscriptions/manifest/views/manifest-import-history.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Manifest History' | translate }}",
+            parent: 'subscriptions'
+        }
+    });
+}]);