katello 3.1.0.1 → 3.2.0.rc1

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

@@ -129,6 +129,13 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
         controller: 'ContentViewVersionContentController',
         templateUrl: 'content-views/versions/views/content-view-version-ostree-branches.html'
     })
+    .state('content-views.details.version.file', {
+        collapsed: true,
+        url: '/file',
+        permission: 'view_content_views',
+        controller: 'ContentViewVersionContentController',
+        templateUrl: 'content-views/versions/views/content-view-version-file.html'
+    })
 
     .state('content-views.details.promotion', {
         collapsed: true,
@@ -202,6 +209,25 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
         controller: 'ContentViewAvailableRepositoriesController',
         templateUrl: 'content-views/details/views/content-view-repositories.html'
     })
+    .state('content-views.details.repositories.file', {
+        abstract: true,
+        collapsed: true,
+        template: '<div ui-view></div>'
+    })
+    .state('content-views.details.repositories.file.list', {
+        collapsed: true,
+        url: '/repositories/file',
+        permission: 'view_content_views',
+        controller: 'ContentViewFileRepositoriesListController',
+        templateUrl: 'content-views/details/views/content-view-file-repositories.html'
+    })
+    .state('content-views.details.repositories.file.available', {
+        collapsed: true,
+        url: '/repositories/file/available',
+        permission: 'view_content_views',
+        controller: 'ContentViewAvailableFileRepositoriesController',
+        templateUrl: 'content-views/details/views/content-view-file-repositories.html'
+    })
     .state('content-views.details.repositories.docker', {
         abstract: true,
         collapsed: true,

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

@@ -14,8 +14,8 @@
  *   as part of content view version deletion.
  */
 angular.module('Bastion.content-views').controller('ContentViewVersionDeletionContentHostsController',
-    ['$scope', '$location', 'Organization', 'CurrentOrganization', 'Nutupane', 'ContentHost',
-    function ($scope, $location, Organization, CurrentOrganization, Nutupane, ContentHost) {
+    ['$scope', '$location', 'Organization', 'CurrentOrganization', 'Nutupane', 'Host',
+    function ($scope, $location, Organization, CurrentOrganization, Nutupane, Host) {
 
         var params, nutupane;
 
@@ -26,10 +26,17 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
-        nutupane = new Nutupane(ContentHost, params);
+        nutupane = new Nutupane(Host, params);
 
         nutupane.searchTransform = function (term) {
-            var addition = "(environment_id:(" + $scope.selectedEnvironmentIds().join(" OR ") + "))";
+            var addition,
+                envIdClausses = [];
+
+            angular.forEach($scope.selectedEnvironmentIds(), function(envId) {
+                envIdClausses.push("lifecycle_environment_id = " + envId);
+            });
+            addition = '(' + envIdClausses.join(" OR ") + ')';
+            addition = addition + " AND content_view_id = " + $scope.contentView.id;
             if (term === "" || angular.isUndefined(term)) {
                 return addition;
             }

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

@@ -20,7 +20,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionEn
             } else {
                 angular.forEach($scope.environmentsTable.rows, function (row) {
                     row.unselectable = !row.permissions['promotable_or_removable'] ||
-                                         !row.permissions['all_systems_editable'] ||
+                                         !row.permissions['all_hosts_editable'] ||
                                          !row.permissions['all_keys_editable'];
                 });
 

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

@@ -111,7 +111,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
 
         $scope.totalHostCount = function () {
             return _.reduce($scope.deleteOptions.environments, function (sum, env) {
-                return sum + env['system_count'];
+                return sum + env['host_count'];
             }, 0);
         };
 

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

@@ -1,7 +1,7 @@
 <span page-title ng-model="contentView">{{ 'Remove Content View ' | translate }} {{ contentView.name }}</span>
 
 <div>
-  <h3 translate>Delete {{ contentView.name }}</h3>
+  <h3 translate>Remove {{ contentView.name }}</h3>
 
   <div ng-show="conflictingVersions().length > 0">
     <i class="fa fa-warning"></i>
@@ -38,7 +38,7 @@
 
   <div class="details" ng-show="conflictingVersions().length === 0">
     <p translate>
-      Are you sure you want to delete Content View "{{ contentView.name }}"?
+      Are you sure you want to remove Content View "{{ contentView.name }}"?
     </p>
 
     <div ng-show="versions.length > 0">
@@ -52,7 +52,7 @@
     <div class="fr">
       <button ng-disabled="working" class="btn-danger btn-lg" ng-click="delete()" >
         <i class="fa fa-spinner fa-spin" ng-show="working"></i>
-        <span translate>Delete</span>
+        <span translate>Remove</span>
       </button>
 
       <a ui-sref="content-views.details.versions" ng-disabled="working" class="btn btn-default btn-lg"  translate role="button">

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

@@ -68,7 +68,7 @@
           <thead>
             <tr bst-table-head>
               <th bst-table-column="name"><span translate>Name</span></th>
-              <th bst-table-column="name"><span translate>Environment</span></th>
+              <th bst-table-column="name"><span translate>Lifecycle Environment</span></th>
             </tr>
           </thead>
 
@@ -78,7 +78,7 @@
                   {{ host.name }}
               </td>
               <td bst-table-cell>
-                  {{ host.environment.name }}
+                  {{ host.content_facet_attributes.lifecycle_environment_name }}
               </td>
             </tr>
           </tbody>

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

@@ -27,7 +27,7 @@
     <thead>
       <tr bst-table-head row-select>
         <th translate>Name</th>
-        <th translate>Affected Systems</th>
+        <th translate>Affected Hosts</th>
         <th translate>Affected Activation Keys</th>
       </tr>
     </thead>
@@ -41,7 +41,7 @@
           row-select="environment"
           ng-repeat="environment in environmentsTable.rows">
         <td>{{ environment.name }}</td>
-        <td>{{ environment.system_count }} <span class="note warning" ng-hide="environment.permissions.all_systems_editable" translate>  (Not all Content Hosts editable )</span></td>
+        <td>{{ environment.host_count }} <span class="note warning" ng-hide="environment.permissions.all_hosts_editable" translate>  (Not all Content Hosts editable )</span></td>
         <td>{{ environment.activation_key_count }} <span class="note warning"  ng-hide="environment.permissions.all_keys_editable" translate>  (Not all Activation Keys editable )</span></td>
       </tr>
     </tbody>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-file-repositories.controller.js

@@ -0,0 +1,47 @@
+(function () {
+
+    /**
+     * @ngdoc object
+     * @name  Bastion.content-views.controller:ContentViewAvailableFileRepositoriesController
+     *
+     * @requires $scope
+     * @requires Repository
+     * @requires Nutupane
+     * @requires CurrentOrganization
+     * @requires ContentViewRepositoriesUtil
+     *
+     * @description
+     *    Provides UI functionality add file repositories to a content view
+     */
+    function ContentViewAvailableFileRepositoriesController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
+        var nutupane;
+
+        ContentViewRepositoriesUtil($scope);
+
+        nutupane = new Nutupane(Repository, {
+            'organization_id': CurrentOrganization,
+            'library': true,
+            'content_type': 'file',
+            'content_view_id': $scope.$stateParams.contentViewId,
+            'available_for': 'content_view'
+        },
+        'queryUnpaged');
+
+        nutupane.load();
+
+        $scope.repositoriesTable = nutupane.table;
+
+        $scope.addRepositories = function (contentView) {
+            $scope.addSelectedRepositoriesToContentView(nutupane, contentView);
+        };
+    }
+
+    angular
+        .module('Bastion.content-views')
+        .controller('ContentViewAvailableFileRepositoriesController', ContentViewAvailableFileRepositoriesController);
+
+    ContentViewAvailableFileRepositoriesController.$inject = [
+        '$scope', 'Repository', 'Nutupane', 'CurrentOrganization', 'ContentViewRepositoriesUtil'
+    ];
+
+})();

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

@@ -18,7 +18,13 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
     function ($scope, ContentView, ContentViewVersion, Nutupane, AggregateTask, translate, ApiErrorHandler) {
         var nutupane, contentViewId = $scope.$stateParams.contentViewId;
 
+        $scope.panel = {
+            error: false,
+            loading: true
+        };
+
         if ($scope.contentView) {
+            $scope.panel.loading = false;
             contentViewId = $scope.contentView.id;
         }
 
@@ -124,8 +130,10 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
         };
 
         $scope.contentView = ContentView.get({id: $scope.$stateParams.contentViewId}, function () {
+            $scope.panel.loading = false;
             $scope.loading = false;
         }, function (response) {
+            $scope.panel.loading = false;
             $scope.loading = false;
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-file-repositories-list.controller.js

@@ -0,0 +1,45 @@
+(function () {
+
+    /**
+     * @ngdoc object
+     * @name  Bastion.content-views.controller:ContentViewFileRepositoriesListController
+     *
+     * @requires $scope
+     * @requires Repository
+     * @requires Nutupane
+     * @requires CurrentOrganization
+     * @requires ContentViewRepositoriesUtil
+     *
+     * @description
+     *    Provides UI functionality list/remove file repositories from a content view
+     */
+    function ContentViewFileRepositoriesListController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
+        var nutupane;
+
+        ContentViewRepositoriesUtil($scope);
+
+        nutupane = new Nutupane(Repository, {
+            'organization_id': CurrentOrganization,
+            'content_view_id': $scope.$stateParams.contentViewId,
+            'content_type': 'file'
+        },
+        'queryUnpaged');
+
+        nutupane.load();
+
+        $scope.repositoriesTable = nutupane.table;
+
+        $scope.removeRepositories = function () {
+            $scope.removeSelectedRepositoriesFromContentView(nutupane, $scope.contentView);
+        };
+    }
+
+    angular
+        .module('Bastion.content-views')
+        .controller('ContentViewFileRepositoriesListController', ContentViewFileRepositoriesListController);
+
+    ContentViewFileRepositoriesListController.$inject = [
+        '$scope', 'Repository', 'Nutupane', 'CurrentOrganization', 'ContentViewRepositoriesUtil'
+    ];
+
+})();

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

@@ -9,6 +9,10 @@
   <div data-block="header"></div>
   <span data-block="no-rows-message" translate>No Errata to display</span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Errata.
+  </span>
+
   <div data-block="actions">
     <button class="btn btn-primary fr"
             ng-show="isState('content-views.details.filters.details.erratum.list') && permitted('edit_content_views', contentView)"

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

@@ -28,6 +28,9 @@
     You currently don't have any Filters included in this Content View, you can add a new Filter by using the button on the right.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Filters.
+  </span>
 
   <div data-block="table">
     <table class="table table-striped table-bordered" ng-show="detailsTable.rows.length > 0"

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

@@ -70,7 +70,7 @@
         </span>
 
         <span ng-show="rule.type === 'greater' || rule.type === 'less' || rule.type === 'range'">
-          <span class="col-sm-2">
+          <span class="col-sm-5">
             <input type="text"
                    class="form-control"
                    ng-model="rule.min_version"
@@ -78,7 +78,7 @@
                    ng-disabled="rule.type === 'less'"/>
           </span>
           <span class="fl">-</span>
-          <span class="col-sm-2">
+          <span class="col-sm-5">
             <input type="text"
                    class="form-control"
                    ng-model="rule.max_version"
@@ -88,7 +88,7 @@
         </span>
 
         <span ng-show="rule.type === 'equal'">
-          <span class="col-sm-4">
+          <span class="col-sm-5">
             <input type="text" class="form-control"
                    ng-model="rule.version"
                    ng-hide="denied('edit_content_views', contentView)"/>
@@ -135,7 +135,7 @@
         </span>
 
         <span ng-show="rule.type === 'greater' || rule.type === 'less' || rule.type === 'range'">
-          <span class="col-sm-2">
+          <span class="col-sm-5">
             <input type="text"
                    class="form-control"
                    ng-model="rule.min_version"
@@ -143,7 +143,7 @@
                    ng-disabled="rule.type === 'less'"/>
           </span>
           <span class="fl" ng-show="rule.type === 'range' && rule.editMode">-</span>
-          <span class="col-sm-2">
+          <span class="col-sm-5">
             <input type="text"
                    class="form-control"
                    ng-model="rule.max_version"
@@ -153,7 +153,7 @@
         </span>
 
         <span ng-show="rule.type === 'equal'">
-          <span class="col-sm-4">
+          <span class="col-sm-5">
             <input type="text"
                    class="form-control"
                    ng-model="rule.version"

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

@@ -40,6 +40,12 @@
 
   <span data-block="selection-summary"></span>
   <span data-block="no-rows-message" translate>No puppet modules found</span>
+
+  <span data-block="no-search-results-message">
+    Your search returned zero Puppet Modules.
+  </span>
+
+
   <div data-block="table">
     <table class="table table-striped table-bordered">
       <thead>

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

@@ -18,6 +18,10 @@
     You currently don't have any Puppet Modules included in this Content View, you can add Puppet Modules using the button on the right.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Puppet Modules.
+  </span>
+
   <div data-block="table">
     <table class="table table-striped table-bordered" ng-show="detailsTable.rows.length > 0">
       <thead>

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

@@ -42,7 +42,8 @@
       <tbody>
       <tr bst-table-row
           ng-repeat="contentView in detailsTable.rows | filter:contentViewFilter | orderBy:'name'"
-          row-select="contentView">
+          row-select="contentView"
+          ng-hide="contentView.versions.length === 0">
         <td bst-table-cell>{{ contentView.name }}</td>
         <td bst-table-cell>
           <select class="form-control"

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

@@ -36,7 +36,8 @@
 
       <tbody>
       <tr bst-table-row ng-repeat="contentViewVersion in detailsTable.rows | filter:contentViewVersionFilter | orderBy:'name'"
-          row-select="contentViewVersion">
+          row-select="contentViewVersion"
+          ng-hide="contentViewVersions.length === 0">
         <td bst-table-cell>{{ contentViewVersion.content_view.name }}</td>
         <td bst-table-cell>
           <span bst-edit-select="contentViewVersion.id"

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

@@ -1,153 +1,164 @@
 <span page-title ng-model="contentView">{{ 'Content View:' | translate }} {{ contentView.name }}</span>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-  <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+<div data-extend-template="layouts/panel.html">
+  <div data-block="panel">
+    <section class="nutupane-details" ng-cloak bst-container-scroll>
+      <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
-  <div bst-alert="info" ng-show="pendingVersionTask">
-   <span translate>Many Content View actions are disabled while a version task is in progress.</span>
-  </div>
+      <div bst-alert="info" ng-show="pendingVersionTask">
+       <span translate>Many Content View actions are disabled while a version task is in progress.</span>
+      </div>
 
-  <div ng-hide="panel.error">
-    <header class="details-header row">
-      <h2 class="col-sm-6" ng-hide="contentView.composite">{{ contentView.name }}</h2>
-      <h2 class="col-sm-6" ng-show="contentView.composite" translate>Composite Content View {{ contentView.name }}</h2>
-
-      <div class="col-sm-6">
-        <div class="fr">
-          <button class="btn btn-primary" ng-click="$state.go('content-views.details.publish')"
-             ng-disabled="pendingVersionTask"
-             ng-hide="denied('publish_content_views', contentView)">
-            <i class="fa fa-paste"></i>
-            <span translate>Publish New Version</span>
-          </button>
-
-          <button class="btn btn-default"
-             ng-disabled="pendingVersionTask"
-             ng-hide="denied('create_content_views')"
-             ng-click="showCopy = true">
-            <i class="fa fa-copy"></i>
-            <span translate>Copy View</span>
-          </button>
-
-          <button class="btn btn-default" ng-click="$state.go('content-views.details.deletion')"
-                  ng-disabled="pendingVersionTask"
-                  ng-hide="denied('destroy_content_views', contentView)">
-            <i class="fa fa-trash-o"></i>
-            {{ "Remove View" | translate }}
-          </button>
-
-          <a class="btn btn-default" ui-sref="content-views.index">
-            <i class="fa fa-remove"></i>
-            <span translate>Close</span>
-          </a>
-        </div>
+      <div ng-hide="panel.error">
+        <header class="details-header row">
+          <h2 class="col-sm-6" ng-hide="contentView.composite">{{ contentView.name }}</h2>
+          <h2 class="col-sm-6" ng-show="contentView.composite" translate>Composite Content View {{ contentView.name }}</h2>
+
+          <div class="col-sm-6">
+            <div class="fr">
+              <button class="btn btn-primary" ng-click="$state.go('content-views.details.publish')"
+                 ng-disabled="pendingVersionTask"
+                 ng-hide="denied('publish_content_views', contentView)">
+                <i class="fa fa-paste"></i>
+                <span translate>Publish New Version</span>
+              </button>
+
+              <button class="btn btn-default"
+                 ng-disabled="pendingVersionTask"
+                 ng-hide="denied('create_content_views')"
+                 ng-click="showCopy = true">
+                <i class="fa fa-copy"></i>
+                <span translate>Copy View</span>
+              </button>
+
+              <button class="btn btn-default" ng-click="$state.go('content-views.details.deletion')"
+                      ng-disabled="pendingVersionTask"
+                      ng-hide="denied('destroy_content_views', contentView)">
+                <i class="fa fa-trash-o"></i>
+                {{ "Remove View" | translate }}
+              </button>
+
+              <a class="btn btn-default" ui-sref="content-views.index">
+                <i class="fa fa-remove"></i>
+                <span translate>Close</span>
+              </a>
+            </div>
 
-      </div>
-    </header>
-
-    <div ng-show="showCopy" class="fr action-pane" >
-      <form>
-        <h5 translate>Copy</h5>
-        <div class="input">
-          <div bst-alerts error-messages="copyErrorMessages"></div>
-          <div class="info-label">
-            <label for="copy_name" translate>New Name:</label>
-          </div>
-          <input ng-model="copyName"
-                 id="copy_name"
-                 name="copy_name"
-                 tabindex="1"
-                 autofocus
-                 required/>
-          <div>
-            <button class="btn btn-default" ng-click="copy(copyName)">
-                <span translate>Create</span>
-            </button>
-            <button class="btn btn-default" ng-click="showCopy = false">
-              <span translate>Cancel</span>
-            </button>
           </div>
+        </header>
+
+        <div ng-show="showCopy" class="fr action-pane" >
+          <form>
+            <h5 translate>Copy</h5>
+            <div class="input">
+              <div bst-alerts error-messages="copyErrorMessages"></div>
+              <div class="info-label">
+                <label for="copy_name" translate>New Name:</label>
+              </div>
+              <input ng-model="copyName"
+                     id="copy_name"
+                     name="copy_name"
+                     tabindex="1"
+                     autofocus
+                     required/>
+              <div>
+                <button class="btn btn-default" ng-click="copy(copyName)">
+                    <span translate>Create</span>
+                </button>
+                <button class="btn btn-default" ng-click="showCopy = false">
+                  <span translate>Cancel</span>
+                </button>
+              </div>
+            </div>
+          </form>
         </div>
-      </form>
-    </div>
-
-    <nav>
-      <ul class="nav nav-tabs" ng-show="contentView.$resolved">
-        <li ng-class="{active: stateIncludes('content-views.details.version') || stateIncludes('content-views.details.versions')}">
-          <a ui-sref="content-views.details.versions" translate>
-            Versions
-          </a>
-        </li>
-
-        <li ng-class="{active: stateIncludes('content-views.details.composite-content-views')}" ng-show="contentView.composite">
-          <a ui-sref="content-views.details.composite-content-views.list" translate>
-            Content Views
-          </a>
-        </li>
-
-        <li class="dropdown"
-            ng-class="{active: stateIncludes('content-views.details.repositories.yum') || stateIncludes('content-views.details.filters')}"
-            ng-hide="contentView.composite">
-          <a class="dropdown-toggle">
-            <span translate>Yum Content</span>
-            <i class="fa fa-chevron-down"></i>
-          </a>
-          <ul class="dropdown-menu">
-            <li>
-              <a ui-sref="content-views.details.repositories.yum.list" translate>
-                Repositories
+
+        <nav>
+          <ul class="nav nav-tabs" ng-show="contentView.$resolved">
+            <li ng-class="{active: stateIncludes('content-views.details.version') || stateIncludes('content-views.details.versions')}">
+              <a ui-sref="content-views.details.versions" translate>
+                Versions
               </a>
             </li>
-            <li>
-              <a ui-sref="content-views.details.filters.list" translate>
-                Filters
+
+            <li ng-class="{active: stateIncludes('content-views.details.composite-content-views')}" ng-show="contentView.composite">
+              <a ui-sref="content-views.details.composite-content-views.list" translate>
+                Content Views
+              </a>
+            </li>
+
+            <li class="dropdown"
+                ng-class="{active: stateIncludes('content-views.details.repositories.yum') || stateIncludes('content-views.details.filters')}"
+                ng-hide="contentView.composite">
+              <a class="dropdown-toggle">
+                <span translate>Yum Content</span>
+                <i class="fa fa-chevron-down"></i>
+              </a>
+              <ul class="dropdown-menu">
+                <li>
+                  <a ui-sref="content-views.details.repositories.yum.list" translate>
+                    Repositories
+                  </a>
+                </li>
+                <li>
+                  <a ui-sref="content-views.details.filters.list" translate>
+                    Filters
+                  </a>
+                </li>
+              </ul>
+            </li>
+
+            <li ng-class="{active: stateIncludes('content-views.details.repositories.file')}"
+                ng-hide="contentView.composite">
+              <a ui-sref="content-views.details.repositories.file.list" translate>
+                File Repositories
+              </a>
+            </li>
+
+            <li ng-class="{active: stateIncludes('content-views.details.puppet-modules')}"
+                ng-hide="contentView.composite">
+              <a ui-sref="content-views.details.puppet-modules.list" translate>
+                Puppet Modules
+              </a>
+            </li>
+
+            <li ng-class="{active: stateIncludes('content-views.details.repositories.docker')}"
+                ng-hide="contentView.composite">
+              <a ui-sref="content-views.details.repositories.docker.list" translate>
+                Docker Content
+              </a>
+            </li>
+
+            <li ng-class="{active: stateIncludes('content-views.details.repositories.ostree')}"
+                ng-hide="contentView.composite">
+              <a ui-sref="content-views.details.repositories.ostree.list" translate>
+                OSTree Content
+              </a>
+            </li>
+
+            <li ng-class="{active: isState('content-views.details.history')}">
+              <a ui-sref="content-views.details.history" translate>
+                History
+              </a>
+            </li>
+
+            <li ng-class="{active: isState('content-views.details.info') || isState('content-views.details.deletion')}">
+              <a ui-sref="content-views.details.info" translate>
+                Details
+              </a>
+            </li>
+            <li ng-class="{active: stateIncludes('content-views.details.tasks')}">
+              <a translate
+                 ui-sref="content-views.details.tasks.index({contentViewId: contentView.id})">
+                Tasks
               </a>
             </li>
           </ul>
-        </li>
-
-        <li ng-class="{active: stateIncludes('content-views.details.puppet-modules')}"
-            ng-hide="contentView.composite">
-          <a ui-sref="content-views.details.puppet-modules.list" translate>
-            Puppet Modules
-          </a>
-        </li>
-
-        <li ng-class="{active: stateIncludes('content-views.details.repositories.docker')}"
-            ng-hide="contentView.composite">
-          <a ui-sref="content-views.details.repositories.docker.list" translate>
-            Docker Content
-          </a>
-        </li>
-
-        <li ng-class="{active: stateIncludes('content-views.details.repositories.ostree')}"
-            ng-hide="contentView.composite">
-          <a ui-sref="content-views.details.repositories.ostree.list" translate>
-            OSTree Content
-          </a>
-        </li>
-
-        <li ng-class="{active: isState('content-views.details.history')}">
-          <a ui-sref="content-views.details.history" translate>
-            History
-          </a>
-        </li>
-
-        <li ng-class="{active: isState('content-views.details.info') || isState('content-views.details.deletion')}">
-          <a ui-sref="content-views.details.info" translate>
-            Details
-          </a>
-        </li>
-        <li ng-class="{active: stateIncludes('content-views.details.tasks')}">
-          <a translate
-             ui-sref="content-views.details.tasks.index({contentViewId: contentView.id})">
-            Tasks
-          </a>
-        </li>
-      </ul>
-    </nav>
-
-    <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-    <div ui-view></div>
+        </nav>
+
+        <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+        <div ui-view></div>
+      </div>
+    </section>
   </div>
-</section>
+</div>