katello 3.3.0.rc1.1 → 3.3.0.rc2

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

@@ -14,13 +14,12 @@ angular.module('Bastion.content-views').controller('NewContentViewController',
     function ($scope, ContentView, FormUtils, CurrentOrganization) {
 
         function success(response) {
-            var successState = 'content-views.details.repositories.yum.available';
+            var successState = 'content-view.repositories.yum.available';
 
             if (response.composite) {
-                successState = 'content-views.details.components.composite-content-views.available';
+                successState = 'content-view.components.composite-content-views.available';
             }
 
-            $scope.$parent.table.addRow(response);
             $scope.transitionTo(successState, {contentViewId: response.id});
         }
 

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

@@ -1,15 +1,8 @@
 <span page-title>{{ 'New Content View' | translate }}</span>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-
-  <header class="new-header details-header">
-    <h2 class="fl" translate>New Content View</h2>
-    <div class="fr">
-      <button class="btn btn-default" ui-sref="content-views.index">
-        <i class="fa fa-remove"></i>
-        {{ "Close" | translate }}
-      </button>
-    </div>
+<section data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    <h2 translate>New Content View</h2>
   </header>
 
   <div class="row">
@@ -34,9 +27,7 @@
     </form>
   </div>
 
-  <div class="row">
-    <h3 class="col-sm-12" translate>View Details</h3>
-
+  <div data-block="content">
     <form name="contentViewForm" class="col-sm-5" novalidate role="form">
       <div bst-form-group label="{{ 'Name' | translate }}">
         <input id="name"
@@ -65,17 +56,22 @@
         </textarea>
       </div>
 
-      <div bst-form-group label="{{ 'Composite View?' | translate }}">
-        <input id="composite"
-               name="composite"
-               ng-model="contentView.composite"
-               type="checkbox"
-               tabindex="4"/>
+      <div bst-form-group>
+        <div class="checkbox">
+          <label for="composite">
+            <input id="composite"
+                   name="composite"
+                   ng-model="contentView.composite"
+                   type="checkbox"
+                   tabindex="4"/>
+            <span translate>Composite View?</span>
+          </label>
+        </div>
         <p class="help-block" translate>A composite view contains other content views.</p>
       </div>
 
       <div bst-form-buttons
-           on-cancel="transitionTo('content-views.index')"
+           on-cancel="transitionTo('content-views')"
            on-save="save(contentView)"
            working="working">
       </div>

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

@@ -80,7 +80,7 @@
         nutupane.masterOnly = true;
 
         $scope.nutupane = nutupane;
-        $scope.detailsTable = nutupane.table;
+        $scope.table = nutupane.table;
 
         $scope.repository = {name: translate('All Repositories'), id: 'all'};
         $scope.repositories = [];

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-components.html

@@ -1,10 +1,5 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
-  <span  data-block="search"></span>
-  <span  data-block="result-count"></span>
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="search"></span>
 
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
@@ -15,11 +10,10 @@
     </thead>
 
     <tbody>
-      <tr bst-table-row ng-repeat="version in detailsTable.rows">
+      <tr bst-table-row ng-repeat="version in table.rows">
         <td bst-table-cell>{{ version.content_view.name }}</td>
         <td bst-table-cell>{{ version.version }}</td>
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-docker.html

@@ -1,8 +1,4 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>
@@ -14,7 +10,7 @@
     </thead>
 
     <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>
         <td bst-table-cell>{{ repository.relative_path }}</td>
@@ -22,5 +18,4 @@
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-errata.html

@@ -1,50 +1,45 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <table data-block="table" class="table table-striped table-bordered">
-  <thead>
-    <tr bst-table-head>
-      <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="updated">{{ "Updated" | translate }}</th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <tr bst-table-row ng-repeat="errata in detailsTable.rows">
-      <td bst-table-cell>
-          {{ errata.errata_id }}
-        <i class="fa fa-chevron-right selected-icon" ng-show="errata.selected"></i>
-      </td>
-      <td bst-table-cell>
-        <a>
-          {{ errata.title }}
-        </a>
-      </td>
-      <td bst-table-cell>
-          <span ng-show="errata.type == 'security'">
-            <i class="fa fa-warning inline-icon" title="{{ 'Security' | translate }}"></i>
-          </span>
+    <thead>
+      <tr bst-table-head>
+        <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="updated">{{ "Updated" | translate }}</th>
+      </tr>
+    </thead>
 
-          <span ng-show="errata.type == 'bugfix'">
-            <i class="fa fa-bug inline-icon" title="{{ 'Bug Fix' | translate }}"></i>
-          </span>
+    <tbody>
+      <tr bst-table-row ng-repeat="errata in table.rows">
+        <td bst-table-cell>
+            {{ errata.errata_id }}
+          <i class="fa fa-chevron-right selected-icon" ng-show="errata.selected"></i>
+        </td>
+        <td bst-table-cell>
+          <a>
+            {{ errata.title }}
+          </a>
+        </td>
+        <td bst-table-cell>
+            <span ng-show="errata.type == 'security'">
+              <i class="fa fa-warning inline-icon" title="{{ 'Security' | translate }}"></i>
+            </span>
 
-          <span ng-show="errata.type == 'enhancement'">
-            <i class="fa fa-plus-square inline-icon" title="{{ 'Enhancement' | translate }}"></i>
-          </span>
+            <span ng-show="errata.type == 'bugfix'">
+              <i class="fa fa-bug inline-icon" title="{{ 'Bug Fix' | translate }}"></i>
+            </span>
 
-        {{ errata.type }}
-        <span ng-show="errata.severity">- {{ errata.severity }}</span>
-      </td>
-      <td bst-table-cell>{{ errata.hosts_available_count || 0 }}</td>
-      <td bst-table-cell>{{ errata.updated | date:'shortDate'}}</td>
-    </tr>
-  </tbody>
-</table>
+            <span ng-show="errata.type == 'enhancement'">
+              <i class="fa fa-plus-square inline-icon" title="{{ 'Enhancement' | translate }}"></i>
+            </span>
 
+          {{ errata.type }}
+          <span ng-show="errata.severity">- {{ errata.severity }}</span>
+        </td>
+        <td bst-table-cell>{{ errata.hosts_available_count || 0 }}</td>
+        <td bst-table-cell>{{ errata.updated | date:'shortDate'}}</td>
+      </tr>
+    </tbody>
+  </table>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-file.html

@@ -1,8 +1,4 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>
@@ -12,11 +8,10 @@
     </thead>
 
     <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/content-views/versions/views/content-view-version-ostree-branches.html

@@ -1,8 +1,4 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <div data-block="filters">
     <div class="row">
       <div class="form-group col-sm-4">
@@ -23,7 +19,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>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-package-groups.html

@@ -1,16 +1,12 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
-    <div data-block="filters">
-      <div class="row">
-        <div class="form-group col-sm-4">
-          <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories">
-          </select>
-        </div>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="filters">
+    <div class="row">
+      <div class="form-group col-sm-4">
+        <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories">
+        </select>
       </div>
     </div>
+  </div>
 
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
@@ -21,11 +17,10 @@
     </thead>
 
     <tbody>
-      <tr bst-table-row ng-repeat="packageGroup in detailsTable.rows">
+      <tr bst-table-row ng-repeat="packageGroup in table.rows">
         <td bst-table-cell>{{ packageGroup.name }}</td>
         <td bst-table-cell>{{ packageGroup.repository.name }}</td>
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-packages.html

@@ -1,8 +1,4 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <div data-block="filters">
     <div class="row">
       <div class="form-group col-sm-4">
@@ -23,7 +19,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>
@@ -31,5 +27,4 @@
       </tr>
     </tbody>
   </table>
-
 </div>

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

@@ -1,8 +1,4 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>
@@ -12,7 +8,7 @@
     </thead>
 
     <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>
           <a ui-sref="puppet-modules.details.info({puppetModuleId: puppetModule.id})">{{ puppetModule.name }}-{{ puppetModule.version }}</a>
         </td>
@@ -20,5 +16,4 @@
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-yum.html

@@ -1,8 +1,4 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>
@@ -12,11 +8,10 @@
     </thead>
 
     <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/content-views/versions/views/content-view-version.html

@@ -1,90 +1,75 @@
 <span page-title ng-model="version">{{ 'Version:' | translate }} {{ version.version }}</span>
 
-<div class="details details-full" ng-show="version.id !== undefined">
-
-  <ol class="breadcrumb">
-    <li ng-class="{active: isState('content-views.details.versions')}">
-      <a ui-sref="content-views.details.versions" translate>Versions</a>
+<nav role="navigation">
+  <ul class="nav nav-tabs nav-tabs-pf">
+    <li ng-show="contentView.composite" ng-class="{active: isState('content-view.version.components')}">
+      <a ui-sref="content-view.version.components({versionId: version.id})">
+        <span translate>Components</span>
+      </a>
     </li>
 
-    <li>
-      <span translate>Version {{ version.version }}</span>
+    <li ng-class="{active: isState('content-view.version.yum')}"
+        ng-show="hasRepositories(version, 'yum')">
+      <a ui-sref="content-view.version.yum({versionId: version.id})">
+        <span translate>Yum Repositories</span>
+      </a>
     </li>
-  </ol>
-
-  <nav class="details-navigation">
-    <ul>
-
-      <li ng-show="contentView.composite" ng-class="{active: isState('content-views.details.version.components')}">
-        <a ui-sref="content-views.details.version.components({versionId: version.id})">
-          <span translate>Components</span>
-        </a>
-      </li>
-
-      <li ng-class="{active: isState('content-views.details.version.yum')}"
-          ng-show="hasRepositories(version, 'yum')">
-        <a ui-sref="content-views.details.version.yum({versionId: version.id})">
-          <span translate>Yum Repositories</span>
-        </a>
-      </li>
 
-      <li ng-class="{active: isState('content-views.details.version.packages')}"
-          ng-show="version.package_count !== 0">
-        <a ui-sref="content-views.details.version.packages({versionId: version.id})">
-          <span translate>Packages</span>
-        </a>
-      </li>
-
-      <li ng-class="{active: isState('content-views.details.version.package-groups')}"
-          ng-show="version.package_group_count !== 0">
-        <a ui-sref="content-views.details.version.package-groups({versionId: version.id})">
-          <span translate>Package Groups</span>
-        </a>
-      </li>
+    <li ng-class="{active: isState('content-view.version.packages')}"
+        ng-show="version.package_count !== 0">
+      <a ui-sref="content-view.version.packages({versionId: version.id})">
+        <span translate>Packages</span>
+      </a>
+    </li>
 
-      <li ng-class="{active: isState('content-views.details.version.errata')}"
-          ng-show="hasErrata(version)">
-        <a ui-sref="content-views.details.version.errata({versionId: version.id})">
-          <span translate>Errata</span>
-        </a>
-      </li>
+    <li ng-class="{active: isState('content-view.version.package-groups')}"
+        ng-show="version.package_group_count !== 0">
+      <a ui-sref="content-view.version.package-groups({versionId: version.id})">
+        <span translate>Package Groups</span>
+      </a>
+    </li>
 
-      <li ng-class="{active: isState('content-views.details.version.puppet-modules')}"
-          ng-show="version.puppet_module_count !== 0">
-        <a ui-sref="content-views.details.version.puppet-modules({versionId: version.id})">
-          <span translate>Puppet Modules</span>
-        </a>
-      </li>
+    <li ng-class="{active: isState('content-view.version.errata')}"
+        ng-show="hasErrata(version)">
+      <a ui-sref="content-view.version.errata({versionId: version.id})">
+        <span translate>Errata</span>
+      </a>
+    </li>
 
-      <li ng-class="{active: isState('content-views.details.version.docker')}"
-          ng-show="version.docker_tag_count !== 0 || version.docker_manifest_count !== 0">
-        <a ui-sref="content-views.details.version.docker({versionId: version.id})">
-          <span translate>Docker Repositories</span>
-        </a>
-      </li>
+    <li ng-class="{active: isState('content-view.version.puppet-modules')}"
+        ng-show="version.puppet_module_count !== 0">
+      <a ui-sref="content-view.version.puppet-modules({versionId: version.id})">
+        <span translate>Puppet Modules</span>
+      </a>
+    </li>
 
-      <li ng-class="{active: isState('content-views.details.version.file')}">
-        <a ui-sref="content-views.details.version.file({versionId: version.id})">
-          <span translate>File Repositories</span>
-        </a>
-      </li>
+    <li ng-class="{active: isState('content-view.version.docker')}"
+        ng-show="version.docker_tag_count !== 0 || version.docker_manifest_count !== 0">
+      <a ui-sref="content-view.version.docker({versionId: version.id})">
+        <span translate>Docker Repositories</span>
+      </a>
+    </li>
 
-      <li ng-class="{active: isState('content-views.details.version.ostree-branches')}"
-          ng-show="version.ostree_branch_count !== 0">
-        <a ui-sref="content-views.details.version.ostree-branches({versionId: version.id})">
-          <span translate>OSTree Branches</span>
-        </a>
-      </li>
+    <li ng-class="{active: isState('content-view.version.file')}">
+      <a ui-sref="content-view.version.file({versionId: version.id})">
+        <span translate>File Repositories</span>
+      </a>
+    </li>
 
-      <li ng-class="{active: isState('content-views.details.version.details')}">
-        <a ui-sref="content-views.details.version.details({versionId: version.id})">
-          <span translate>Details</span>
-        </a>
-      </li>
+    <li ng-class="{active: isState('content-view.version.ostree-branches')}"
+        ng-show="version.ostree_branch_count !== 0">
+      <a ui-sref="content-view.version.ostree-branches({versionId: version.id})">
+        <span translate>OSTree Branches</span>
+      </a>
+    </li>
 
-    </ul>
-  </nav>
+    <li ng-class="{active: isState('content-view.version.details')}">
+      <a ui-sref="content-view.version.details({versionId: version.id})">
+        <span translate>Details</span>
+      </a>
+    </li>
 
-  <div ui-view></div>
+  </ul>
+</nav>
 
-</div>
+<div ui-view></div>