katello 4.10.0.rc2 → 4.11.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-copy.controller.js

@@ -7,8 +7,11 @@
      *
      * @description
      *   For copying a host collection.
+     *
+     *  @requires translate
+     *
      */
-    function ActivationKeyCopyController($scope, ActivationKey, Notification) {
+    function ActivationKeyCopyController($scope, ActivationKey, Notification, translate) {
         $scope.copy = function (newName) {
             ActivationKey.copy({id: $scope.activationKey.id, 'new_name': newName}, function (response) {
                 $scope.transitionTo('activation-key.info', {activationKeyId: response.id});
@@ -16,12 +19,14 @@
                 Notification.setErrorMessage(response.data.displayMessage);
             });
         };
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Create Copy');
     }
 
     angular
         .module('Bastion.activation-keys')
         .controller('ActivationKeyCopyController', ActivationKeyCopyController);
 
-    ActivationKeyCopyController.$inject = ['$scope', 'ActivationKey', 'Notification'];
+    ActivationKeyCopyController.$inject = ['$scope', 'ActivationKey', 'Notification', 'translate'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-host-collections.controller.js

@@ -26,6 +26,9 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyHostCollectio
             'full_result': true
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('List Host Collections');
+
         hostCollectionsPane = new Nutupane(ActivationKey, params, 'hostCollections');
         $scope.controllerName = 'katello_host_collections';
         $scope.table = hostCollectionsPane.table;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js

@@ -18,6 +18,9 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
     function ($scope, translate, Nutupane, ActivationKey, RepositorySet, ContentOverrideHelper, Notification) {
         var params, saveContentOverride, success, error;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Repository Sets');
+
         params = {
             'activation_key_id': $scope.$stateParams.activationKeyId,
             'content_access_mode_all': $scope.simpleContentAccessEnabled,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js

@@ -25,6 +25,9 @@ angular.module('Bastion.activation-keys').controller('ActivationKeySubscriptions
             'paged': true
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('List Subscriptions');
+
         $scope.contentNutupane = new Nutupane(ActivationKey, params, "subscriptions");
         $scope.controllerName = 'katello_subscriptions';
         $scope.table = $scope.contentNutupane.table;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/new/new-activation-key.controller.js

@@ -9,18 +9,22 @@
  * @requires Organization
  * @requires CurrentOrganization
  * @requires ContentView
+ * @requires translate
  *
  * @description
  *   Controls the creation of an empty ActivationKey object for use by sub-controllers.
  */
 angular.module('Bastion.activation-keys').controller('NewActivationKeyController',
-    ['$scope', '$q', 'FormUtils', 'ActivationKey', 'Organization', 'CurrentOrganization', 'ContentView',
-    function ($scope, $q, FormUtils, ActivationKey, Organization, CurrentOrganization, ContentView) {
+    ['$scope', '$q', 'FormUtils', 'ActivationKey', 'Organization', 'CurrentOrganization', 'ContentView', 'translate',
+    function ($scope, $q, FormUtils, ActivationKey, Organization, CurrentOrganization, ContentView, translate) {
 
         function success() {
             $scope.transitionTo('activation-key.info', {activationKeyId: $scope.activationKey.id});
         }
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('New Activation Key');
+
         function error(response) {
             $scope.working = false;
             angular.forEach(response.data.errors, function (errors, field) {

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

@@ -111,12 +111,27 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
                         }
                         Notification.setErrorMessage(translate('Last sync failed: ') + errorMessage);
                     }
+                } else if (syncStatus['last_failed_reclaim_tasks'].length > 0) {
+                    activeOrFailedTask = pickLastTask(syncStatus['last_failed_reclaim_tasks']);
+                    $scope.syncTask = activeOrFailedTask;
+                    errorCount = $scope.syncTask.humanized.errors.length;
+
+                    if (errorCount > 0) {
+                        errorMessage = $scope.syncTask.humanized.errors[0];
+                        if (errorCount > 2) {
+                            errorMessage += " " + translate("Plus %y more errors").replace("%y", errorCount - 1);
+                        } else if (errorCount > 1) {
+                            errorMessage += " " + translate("Plus 1 more error");
+                        }
+                        Notification.setErrorMessage(translate('Last reclaim failed: ') + errorMessage);
+                    }
                 }
                 $scope.syncState.set(stateFromTask(activeOrFailedTask));
             }, function (response) {
                 $scope.syncStatus = {
                     'active_sync_tasks': [],
-                    'last_failed_sync_tasks': []
+                    'last_failed_sync_tasks': [],
+                    'last_failed_reclaim_tasks': []
                 };
                 processError(response, translate('Last sync failed: '));
             });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/rhel-lifecycle-notice.html

@@ -0,0 +1,5 @@
+<div id="lifecycle-expire-soon-banner" bst-alert="warning" ng-if="host.rhelLifecycleExpireSoon()" close>
+  <span translate>
+    {{ host.rhel_lifecycle_status_label }}
+  </span>
+</div>

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

@@ -7,6 +7,7 @@
  * @requires Nutupane
  * @requires ContentCredential
  * @requires CurrentOrganization
+ * @requires translate
  *
  * @description
  *   Provides the functionality specific to ContentCredentials for use with the Nutupane UI pattern.
@@ -14,8 +15,8 @@
  *   within the table.
  */
 angular.module('Bastion.content-credentials').controller('ContentCredentialsController',
-    ['$scope', '$location', 'Nutupane', 'ContentCredential', 'CurrentOrganization',
-    function ($scope, $location, Nutupane, ContentCredential, CurrentOrganization) {
+    ['$scope', '$location', 'Nutupane', 'ContentCredential', 'CurrentOrganization', 'translate',
+    function ($scope, $location, Nutupane, ContentCredential, CurrentOrganization, translate) {
         var params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -25,6 +26,10 @@ angular.module('Bastion.content-credentials').controller('ContentCredentialsCont
         };
 
         var nutupane = new Nutupane(ContentCredential, params);
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Content Credential');
+
         $scope.controllerName = 'katello_content_credentials';
         $scope.table = nutupane.table;
         $scope.panel = {loading: false};

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-acs.controller.js

@@ -6,16 +6,21 @@
  * @requires Nutupane
  * @requires ContentCredential
  * @requires ApiErrorHandler
+ * @requires translate
  *
  * @description
  *   Page for Content Credential acs
  */
 (function () {
-    function ContentCredentialACSController($scope, Nutupane, ContentCredential, ApiErrorHandler) {
+    function ContentCredentialACSController($scope, Nutupane, ContentCredential, ApiErrorHandler, translate) {
       var nutupane = new Nutupane(ContentCredential, {
           id: $scope.$stateParams.contentCredentialId
       }, 'acs');
       $scope.controllerName = 'katello_content_credentials';
+
+      // Labels so breadcrumb strings can be translated
+      $scope.label = translate('Alternate Content Sources');
+
       nutupane.primaryOnly = true;
 
       $scope.panel = $scope.panel || {error: false, loading: false};
@@ -32,5 +37,5 @@
   }
 
     angular.module('Bastion.content-credentials').controller('ContentCredentialACSController', ContentCredentialACSController);
-    ContentCredentialACSController.$inject = ['$scope', 'Nutupane', 'ContentCredential', 'ApiErrorHandler'];
+    ContentCredentialACSController.$inject = ['$scope', 'Nutupane', 'ContentCredential', 'ApiErrorHandler', 'translate'];
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-products.controller.js

@@ -6,16 +6,21 @@
  * @requires Nutupane
  * @requires ContentCredential
  * @requires ApiErrorHandler
+ * @requires translate
  *
  * @description
  *   Page for Content Credential products
  */
 (function () {
-    function ContentCredentialProductsController($scope, Nutupane, ContentCredential, ApiErrorHandler) {
+    function ContentCredentialProductsController($scope, Nutupane, ContentCredential, ApiErrorHandler, translate) {
         var nutupane = new Nutupane(ContentCredential, {
             id: $scope.$stateParams.contentCredentialId
         }, 'products');
         $scope.controllerName = 'katello_content_credentials';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Products');
+
         nutupane.primaryOnly = true;
 
         $scope.panel = $scope.panel || {error: false, loading: false};
@@ -32,5 +37,5 @@
     }
 
     angular.module('Bastion.content-credentials').controller('ContentCredentialProductsController', ContentCredentialProductsController);
-    ContentCredentialProductsController.$inject = ['$scope', 'Nutupane', 'ContentCredential', 'ApiErrorHandler'];
+    ContentCredentialProductsController.$inject = ['$scope', 'Nutupane', 'ContentCredential', 'ApiErrorHandler', 'translate'];
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-repositories.controller.js

@@ -1,5 +1,5 @@
 (function () {
-    function ContentCredentialRepositoriesController($scope, Nutupane, ContentCredential, ApiErrorHandler) {
+    function ContentCredentialRepositoriesController($scope, Nutupane, ContentCredential, ApiErrorHandler, translate) {
         /**
          * @ngdoc object
          * @name  Bastion.content-credentials.controller:ContentCredentialRepositoriesController
@@ -8,6 +8,7 @@
          * @requires Nutupane
          * @requires ContentCredential
          * @requires ApiErrorHandler
+         * @requires translate
          *
          * @description
          *   Page for Content Credential repositories
@@ -16,6 +17,10 @@
             id: $scope.$stateParams.contentCredentialId
         }, 'repositories');
         $scope.controllerName = 'katello_content_credentials';
+
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Repositories');
+
         nutupane.primaryOnly = true;
 
         $scope.panel = $scope.panel || {error: false, loading: false};
@@ -32,5 +37,5 @@
     }
 
     angular.module('Bastion.content-credentials').controller('ContentCredentialRepositoriesController', ContentCredentialRepositoriesController);
-    ContentCredentialRepositoriesController.$inject = ['$scope', 'Nutupane', 'ContentCredential', 'ApiErrorHandler'];
+    ContentCredentialRepositoriesController.$inject = ['$scope', 'Nutupane', 'ContentCredential', 'ApiErrorHandler', 'translate'];
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/new/new-content-credential.controller.js

@@ -21,6 +21,9 @@ angular.module('Bastion.content-credentials').controller('NewContentCredentialCo
         $scope.progress = {uploading: false};
         $scope.uploadURL = 'katello/api/v2/content_credentials?organization_id=' + CurrentOrganization;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('New Content Credential');
+
         $scope.uploadContent = function (response) {
             if (response) {
                 if (angular.isUndefined(response.errors)) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js

@@ -79,7 +79,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         };
 
         $scope.selectedErrataIds = function () {
-            return $scope.table.getSelected();
+            return $scope.nutupane.getAllSelectedResults('errata_id');
         };
 
         $scope.installErrataViaRemoteExecution = function(customize) {
@@ -88,6 +88,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
             $scope.errataActionFormValues.remoteAction = 'errata_install';
             $scope.errataActionFormValues.bulkErrataIds = angular.toJson(errataIds);
             $scope.errataActionFormValues.customize = customize;
+
+            $timeout(function () {
+                angular.element('#errataActionForm').submit();
+            }, 0);
         };
 
         $scope.ok = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-debs-actions.controller.js

@@ -3,12 +3,16 @@
  * @name  Bastion.content-hosts.controller:ContentHostDebsActionsController
  *
  * @requires $scope
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the content host deb package actions.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDebsActionsController',
-    ['$scope', function ($scope) {
+    ['$scope', 'translate', function ($scope, translate) {
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Deb Package Actions');
+
         $scope.packageAction = {actionType: 'packageInstall'};  // default to packageInstall
     }
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-debs-applicable.controller.js

@@ -18,6 +18,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostDebsApplicableCon
     function ($scope, $timeout, $window, Deb, HostDeb, translate, Nutupane) {
         var debsNutupane, openEventInfo;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Applicable Deb Packages');
+
         $scope.getSelectedDebs = function () {
             var selected = $scope.table.getSelected();
             selected = _.map(selected, function(pkg) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-debs-installed.controller.js

@@ -17,6 +17,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostDebsInstalledCont
     function ($scope, $timeout, $window, HostDeb, translate, Nutupane) {
         var debsNutupane;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Installed Deb Packages');
+
         $scope.removeSelectedDebs = function () {
             var selected;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-errata.controller.js

@@ -8,6 +8,7 @@
  * @requires HostErratum
  * @requires Nutupane
  * @requires BastionConfig
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the content host package list and actions.
@@ -23,6 +24,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
             'id': $scope.$stateParams.hostId
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Errata');
+
         function loadErratum(errataId) {
             $scope.erratum = HostErratum.get({'id': $scope.host.id,
                 'errata_id': errataId});

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-module-streams.controller.js

@@ -18,6 +18,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostModuleStreamsCont
     function ($scope, $timeout, $window, HostModuleStream, Nutupane, BastionConfig, ModuleStreamActions, translate) {
         $scope.moduleStreamActions = ModuleStreamActions.getActions();
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Module Streams');
+
         $scope.working = false;
 
         $scope.nutupaneParams = { id: $scope.$stateParams.hostId };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-applicable.controller.js

@@ -19,6 +19,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesApplicabl
     function ($scope, $timeout, $window, Package, HostPackage, translate, Nutupane, BastionConfig) {
         var packagesNutupane, openEventInfo;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Applicable Packages');
+
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js

@@ -21,6 +21,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesInstalled
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Installed Packages');
+
         $scope.removeSelectedPackages = function () {
             var selected = _.map($scope.table.getSelected(), 'name');
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js

@@ -27,6 +27,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
             $scope.working = false;
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Package Actions');
+
         $scope.errorHandler = function (response) {
             angular.forEach(response.data.errors, function (responseError) {
                 Notification.setErrorMessage(responseError);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-traces.controller.js

@@ -5,6 +5,7 @@
  * @requires $scope
  * @resource $timeout
  * @resource $window
+ * @requires translate
  * @requires HostTraces
  * @requires Nutupane
  * @requires BastionConfig
@@ -21,6 +22,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostTracesController'
             'paged': true
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Traces');
+
         tracesNutupane = new Nutupane(HostTraces, params, 'get', {'disableAutoLoad': true});
         tracesNutupane.primaryOnly = true;
         $scope.controllerName = 'katello_host_tracers';

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-actions.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <h4 translate>Package Actions</h4>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-applicable.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Deb Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Deb Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <h3 translate>Applicable Deb Packages</h3>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-installed.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <p bst-alert="info" ng-hide="remoteExecutionPresent">

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

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Errata for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Errata for: ' | translate }} {{ host.display_name }}</span>
 
 <div bst-feature-flag="remote_actions">
   <h3 translate ng-hide="selectedErrataOption === 'current'">Applicable Errata</h3>
@@ -53,8 +53,8 @@
 
     <span data-block="list-actions" ng-hide="contentHost.readonly">
       <div bst-modal="applySelected()" model="host">
-        <div data-block="modal-header" translate>Apply Errata to Content Host "{{host.name}}"?</div>
-        <div data-block="modal-body" translate>Are you sure you want to apply Errata to content host "{{ host.name }}"?</div>
+        <div data-block="modal-header" translate>Apply Errata to Content Host "{{host.display_name}}"?</div>
+        <div data-block="modal-body" translate>Are you sure you want to apply Errata to content host "{{ host.display_name }}"?</div>
         <span data-block="modal-confirm-button">
           <button class="btn btn-primary" ng-click="ok()">
             <span translate>Apply</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-module-streams.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Module Streams for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Module Streams for: ' | translate }} {{ host.display_name }}</span>
 <div bst-feature-flag="remote_actions">
   <h3 translate ng-hide="selectedModuleStreamOption === 'available'">Available Module Streams</h3>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <h4 translate>Package Actions</h4>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <h3 translate>Applicable Packages</h3>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <h3 translate>Installed Packages</h3>
 

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

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Traces for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Traces for: ' | translate }} {{ host.display_name }}</span>
 
 <div ng-hide="host.hasContent()">
   <div data-extend-template="common/views/registration.html"></div>
@@ -39,9 +39,9 @@
   <div data-extend-template="layouts/partials/table.html">
     <span data-block="list-actions" ng-hide="contentHost.readonly">
       <div bst-modal="performViaRemoteExecution(false)" model="host">
-        <div data-block="modal-header" translate>Restart Services on Content Host "{{host.name}}"?</div>
+        <div data-block="modal-header" translate>Restart Services on Content Host "{{host.display_name}}"?</div>
         <div data-block="modal-body">
-          <span translate>Are you sure you want to restart services on content host "{{ host.name }}"?</span>
+          <span translate>Are you sure you want to restart services on content host "{{ host.display_name }}"?</span>
           <span ng-show="host.rebootRequired()">
             <strong translate>Resolving the selected Traces will reboot this host.</strong>
           </span>

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

@@ -39,6 +39,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
             'sort_order': 'ASC'
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Content Hosts');
+        $scope.provisioningLabel = translate('Provisioning');
+        $scope.tasksLabel = translate('Tasks');
+
         $scope.csvQuery = function () {
             return $httpParamSerializer(params);
         };

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

@@ -51,7 +51,7 @@ angular.module('Bastion.content-hosts').config(['$stateProvider', function ($sta
         controller: 'ContentHostDetailsInfoController',
         templateUrl: 'content-hosts/details/views/content-host-info.html',
         ncyBreadcrumb: {
-            label: "{{ host.name }}",
+            label: "{{ host.display_name }}",
             parent: 'content-hosts'
         }
     })

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-host-collections.controller.js

@@ -30,6 +30,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
             'host_id': $scope.$stateParams.hostId
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Add Host Collections');
+
         nutupane = new Nutupane(HostCollection, params);
         $scope.controllerName = 'katello_host_collections';
         nutupane.primaryOnly = true;
@@ -46,7 +49,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
 
             success = function (response) {
                 Notification.setSuccessMessage(translate('Added %x host collections to content host "%y".')
-                    .replace('%x', $scope.table.numSelected).replace('%y', host.name));
+                    .replace('%x', $scope.table.numSelected).replace('%y', host.display_name));
                 $scope.table.working = false;
                 $scope.table.selectAll(false);
                 nutupane.refresh();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-subscriptions.controller.js

@@ -26,6 +26,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
             'host_id': $scope.$stateParams.hostId
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Add Subscriptions');
+
         $scope.nutupane = new Nutupane(Subscription, params);
         $scope.controllerName = 'katello_subscriptions';
         $scope.nutupane.setSearchKey('subscriptionSearch');

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-host-collections.controller.js

@@ -29,6 +29,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
             'host_id': $scope.$stateParams.hostId
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Host Collections');
+
         nutupane = new Nutupane(HostCollection, params);
         $scope.controllerName = 'katello_host_collections';
         nutupane.primaryOnly = true;
@@ -45,7 +48,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
 
             success = function (response) {
                 var message = translate('Removed %x host collections from content host "%y".')
-                    .replace('%x', $scope.table.numSelected).replace('%y', host.name);
+                    .replace('%x', $scope.table.numSelected).replace('%y', host.display_name);
 
                 Notification.setSuccessMessage(message);
                 $scope.table.working = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-repository-sets.controller.js

@@ -25,6 +25,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsCon
             'paged': true
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Products');
+
         $scope.nutupane = new Nutupane(RepositorySet, params);
         $scope.table = $scope.nutupane.table;
         $scope.nutupane.primaryOnly = true;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js

@@ -23,6 +23,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsCont
             'sort_order': 'ASC'
         };
 
+        // Labels so breadcrumb strings can be translated
+        $scope.label = translate('Subscriptions');
+
         $scope.nutupane = new Nutupane(HostSubscription, params);
         $scope.controllerName = 'katello_subscriptions';
         $scope.nutupane.table.initialLoad = false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-add-subscriptions.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Add Subscriptions for Content Host:' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Add Subscriptions for Content Host:' | translate }} {{ host.display_name }}</span>
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">

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

@@ -1,8 +1,8 @@
-<span page-title ng-model="host">{{ 'Content Host:' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Content Host:' | translate }} {{ host.display_name }}</span>
 
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
   <header data-block="header" translate>
-    {{ host.name }}
+    {{ host.display_name }}
   </header>
 
   <nav data-block="item-actions">
@@ -15,7 +15,7 @@
 
     <div bst-modal="unregisterContentHost(host)" model="host">
       <div data-block="modal-header" translate>
-        Unregister Host "{{host.name}}"?
+        Unregister Host "{{host.display_name}}"?
       </div>
       <div data-block="modal-body">
         <p translate>
@@ -54,6 +54,7 @@
 
   <nav data-block="navigation">
     <div content-access-mode-banner></div>
+    <div data-extend-template="common/views/rhel-lifecycle-notice.html"></div>
     <ul class="nav nav-tabs">
       <li ng-class="{active: isState('content-host.info')}">
         <a translate