katello 3.1.0.1 → 3.2.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.module.js

@@ -7,6 +7,9 @@
  */
 angular.module('Bastion.docker-tags', [
     'ngResource',
+    'ui.router',
     'Bastion',
+    'Bastion.i18n',
+    'Bastion.components',
     'Bastion.components.formatters'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/views/docker-tags.html

@@ -13,4 +13,8 @@
     You currently don't have any Docker Tags.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Docker Tags.
+  </span>
+
 </div>

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

@@ -7,6 +7,11 @@
     There are no Content Views that match the criteria.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Content Views.
+  </span>
+
+
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>

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

@@ -14,6 +14,10 @@
     There are no Docker Tags that match the criteria.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Docker Tags.
+  </span>
+
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>

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

@@ -14,6 +14,10 @@
     There are no Errata that match the criteria.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Errata.
+  </span>
+
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>

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

@@ -14,6 +14,10 @@
     There are no OSTree Branches that match the criteria.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero OSTree Branches.
+  </span>
+
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>

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

@@ -14,6 +14,10 @@
     There are no Packages that match the criteria.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Packages.
+  </span>
+
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>

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

@@ -22,6 +22,10 @@
       There are no Puppet Modules that match the criteria.
     </span>
 
+    <span data-block="no-search-results-message">
+      Your search returned zero Puppet Modules.
+    </span>
+
     <tbody>
       <tr bst-table-row ng-repeat="puppetModule in detailsTable.rows">
         <td bst-table-cell>{{ puppetModule.name }}</td>

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

@@ -19,6 +19,10 @@
       There are no Yum Repositories that match the criteria.
     </span>
 
+    <span data-block="no-search-results-message">
+      Your search returned zero Repositories.
+    </span>
+
     <tbody>
       <tr bst-table-row ng-repeat="repository in detailsTable.rows">
         <td bst-table-cell>{{ repository.name }}</td>

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

@@ -9,6 +9,7 @@ angular.module('Bastion.environments', [
     'ngResource',
     'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.utils',
     'Bastion.components',
     'Bastion.errata',

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

@@ -26,7 +26,7 @@ angular.module('Bastion.errata').controller('ErrataContentHostsController',
             'organization_id': CurrentOrganization
         };
 
-        nutupane = new Nutupane(Host, params);
+        nutupane = new Nutupane(Host, params, 'postIndex');
         nutupane.table.closeItem = function () {};
         nutupane.enableSelectAllResults();
 

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

@@ -50,6 +50,10 @@
     No Content Hosts match this Erratum.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Content Hosts.
+  </span>
+
   <div data-block="table">
     <p bst-alert="warning" ng-show="detailsTable.rows.length > 0 && stateIncludes('errata.details.content-hosts.unavailable')">
       <span translate>The Content View or Lifecycle Environment needs to be updated in order to make errata available to these hosts.</span>
@@ -76,8 +80,8 @@
             </a>
           </td>
           <td bst-table-cell>{{ contentHost.operatingsystem_name }}</td>
-          <td bst-table-cell>{{ contentHost.content.lifecycle_environment_name }}</td>
-          <td bst-table-cell>{{ contentHost.content.content_view_name || "" }}</td>
+          <td bst-table-cell>{{ contentHost.content_facet_attributes.lifecycle_environment_name }}</td>
+          <td bst-table-cell>{{ contentHost.content_facet_attributes.content_view_name || "" }}</td>
         </tr>
       </tbody>
     </table>

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

@@ -39,6 +39,10 @@
     No Repositories contain this Erratum.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Erratum.
+  </span>
+
   <div data-block="table">
     <table class="table table-striped table-bordered"
            ng-class="{'table-mask': detailsTable.working}"

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

@@ -1,53 +1,52 @@
 <span page-title ng-model="errata">{{ 'Errata: ' | translate }} {{ errata.title }}</span>
 
-<div class="loading-mask loading-mask-panel" ng-show="panel.loading">
-  <i class="fa fa-spinner fa-spin"></i>
-  {{ "Loading..." | translate }}
-</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>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-  <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+      <div ng-hide="panel.error">
+        <header class="details-header">
+          <h2 class="fl">{{ errata.title }}</h2>
 
-  <div ng-hide="panel.error">
-    <header class="details-header">
-      <h2 class="fl">{{ errata.title }}</h2>
+          <div class="details-actions fr">
+            <button class="btn btn-default" ui-sref="errata.index">
+              <i class="fa fa-remove"></i>
+              {{ "Close" | translate }}
+            </button>
+          </div>
+        </header>
 
-      <div class="details-actions fr">
-        <button class="btn btn-default" ui-sref="errata.index">
-          <i class="fa fa-remove"></i>
-          {{ "Close" | translate }}
-        </button>
-      </div>
-    </header>
-
-    <nav class="details-navigation">
-      <ul>
-        <li ng-class="{active: isState('errata.details.info')}">
-          <a ui-sref="errata.details.info">
-            <span translate>
-              Details
-            </span>
-          </a>
-        </li>
-        <li ng-class="{active: isState('errata.details.content-hosts') || isState('errata.details.apply')}">
-          <a ui-sref="errata.details.content-hosts">
-            <span translate>
-              Content Hosts
-            </span>
-          </a>
-        </li>
-        <li ng-class="{active: isState('errata.details.repositories')}">
-          <a ui-sref="errata.details.repositories">
-            <span translate>
-              Repositories
-            </span>
-          </a>
-        </li>
-      </ul>
-    </nav>
+        <nav class="details-navigation">
+          <ul>
+            <li ng-class="{active: isState('errata.details.info')}">
+              <a ui-sref="errata.details.info">
+                <span translate>
+                  Details
+                </span>
+              </a>
+            </li>
+            <li ng-class="{active: isState('errata.details.content-hosts') || isState('errata.details.apply')}">
+              <a ui-sref="errata.details.content-hosts">
+                <span translate>
+                  Content Hosts
+                </span>
+              </a>
+            </li>
+            <li ng-class="{active: isState('errata.details.repositories')}">
+              <a ui-sref="errata.details.repositories">
+                <span translate>
+                  Repositories
+                </span>
+              </a>
+            </li>
+          </ul>
+        </nav>
 
-    <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+        <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
-    <section ui-view></section>
+        <section ui-view></section>
+      </div>
+    </section>
   </div>
-</section>
+</div>

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

@@ -7,7 +7,9 @@
  */
 angular.module('Bastion.errata', [
     'ngResource',
+    'ui.router',
     'Bastion',
     'Bastion.common',
+    'Bastion.i18n',
     'Bastion.components.formatters'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata.html

@@ -55,4 +55,9 @@
     </span>
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Errata.
+  </span>
+
+
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/gpg-key-details-info.controller.js

@@ -38,5 +38,16 @@ angular.module('Bastion.gpg-keys').controller('GPGKeyDetailsInfoController',
             }
         };
 
+        $scope.uploadError = function (error, content) {
+            if (angular.isString(content) && content.indexOf("Request Entity Too Large")) {
+                error = translate('File too large.');
+            } else {
+                error = content;
+            }
+            $scope.$parent.errorMessages = [translate('Error during upload: ') + error];
+            $scope.uploadStatus = 'error';
+            $scope.progress.uploading = false;
+        };
+
     }]
 );

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

@@ -31,7 +31,7 @@ angular.module('Bastion.gpg-keys').controller('GPGKeyDetailsController',
 
             gpgKey.$update(function (response) {
                 deferred.resolve(response);
-                $scope.successMessages.push(translate('Gpg Key updated'));
+                $scope.successMessages.push(translate('GPG Key updated'));
                 $scope.table.replaceRow(response);
 
             }, function (response) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/views/gpg-key-details.html

@@ -1,50 +1,54 @@
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-  <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
-  <div ng-hide="panel.error">
-    <header class="details-header new-header">
-      <h2 class="fl" translate>
-        GPG Key {{ gpgKey.name }}
-      </h2>
-
-      <div class="details-actions fr">
-        <button class="btn btn-default"
-                ng-click="openModal()"
-                ng-hide="denied('destroy_gpg_keys', gpgKey)"
-                translate>
-          Remove GPG Key
-        </button>
-
-        <button class="btn btn-default" ng-click="table.closeItem()">
-          <i class="fa fa-remove"></i>
-          <span translate>Close</span>
-        </button>
-
-        <div bst-modal="removeGPGKey(gpgKey)" model="gpgKey">
-          <div data-block="modal-header" translate>Remove GPG Key {{ gpgKey.name }}</div>
-          <div data-block="modal-body" translate>Are you sure you want to remove GPG key {{ gpgKey.name }}?</div>
-        </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 ng-hide="panel.error">
+        <header class="details-header new-header">
+          <h2 class="fl" translate>
+            GPG Key {{ gpgKey.name }}
+          </h2>
+
+          <div class="details-actions fr">
+            <button class="btn btn-default"
+                    ng-click="openModal()"
+                    ng-hide="denied('destroy_gpg_keys', gpgKey)"
+                    translate>
+              Remove GPG Key
+            </button>
+
+            <button class="btn btn-default" ng-click="table.closeItem()">
+              <i class="fa fa-remove"></i>
+              <span translate>Close</span>
+            </button>
+
+            <div bst-modal="removeGPGKey(gpgKey)" model="gpgKey">
+              <div data-block="modal-header" translate>Remove GPG Key {{ gpgKey.name }}</div>
+              <div data-block="modal-body" translate>Are you sure you want to remove GPG key {{ gpgKey.name }}?</div>
+            </div>
+
+          </div>
+        </header>
+
+        <nav class="details-navigation">
+          <ul>
+            <li ng-class="{active: isState('gpg-keys.details.info')}">
+              <a ui-sref="gpg-keys.details.info" translate>Details</a>
+            </li>
+
+            <li ng-class="{active: stateIncludes('gpg-keys.details.products')}">
+              <a ui-sref="gpg-keys.details.products" translate>Products</a>
+            </li>
+
+            <li ng-class="{active: stateIncludes('gpg-keys.details.repositories')}">
+              <a ui-sref="gpg-keys.details.repositories" translate>Repositories</a>
+            </li>
+          </ul>
+        </nav>
+        <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+
+        <section class="nutupane-sub-section" ui-view></section>
       </div>
-    </header>
-
-    <nav class="details-navigation">
-      <ul>
-        <li ng-class="{active: isState('gpg-keys.details.info')}">
-          <a ui-sref="gpg-keys.details.info" translate>Details</a>
-        </li>
-
-        <li ng-class="{active: stateIncludes('gpg-keys.details.products')}">
-          <a ui-sref="gpg-keys.details.products" translate>Products</a>
-        </li>
-
-        <li ng-class="{active: stateIncludes('gpg-keys.details.repositories')}">
-          <a ui-sref="gpg-keys.details.repositories" translate>Repositories</a>
-        </li>
-      </ul>
-    </nav>
-    <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
-    <section class="nutupane-sub-section" ui-view></section>
+    </section>
   </div>
-</section>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/views/gpg-key-info.html

@@ -13,6 +13,7 @@
         <form role="form"
               action="{{ uploadURL }}"
               ng-upload="uploadContent(content)"
+              error-catcher="uploadError(error, content)"
               upload-options-enable-controls
               upload-options-enable-rails-csrf>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/views/gpg-key-products.html

@@ -28,5 +28,5 @@
 </section>
 
 <p bst-alert="info" ng-show="gpgKey.products.length === 0">
-  <span translate>You currently don't have any Products associated with this Gpg Key.</span>
+  <span translate>You currently don't have any Products associated with this GPG Key.</span>
 </p>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/details/views/gpg-key-repositories.html

@@ -33,5 +33,5 @@
 </section>
 
 <p bst-alert="info" ng-show="gpgKey.repositories.length === 0">
-  <span translate>You currently don't have any Repositories associated with this Gpg Key.</span>
+  <span translate>You currently don't have any Repositories associated with this GPG Key.</span>
 </p>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/gpg-keys.module.js

@@ -9,6 +9,7 @@ angular.module('Bastion.gpg-keys', [
     'ngResource',
     'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.common',
     'Bastion.components',
     'ngUpload'

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/gpg-keys/new/views/gpg-key-new.html

@@ -1,73 +1,72 @@
-<div class="loading-mask loading-mask-panel fa-3x" ng-show="panel.loading">
-  <i class="fa fa-spinner fa-spin"></i>
-  {{ "Loading..." | translate }}
-</div>
+<div data-extend-template="layouts/panel.html">
+  <div data-block="panel">
+    <section class="nutupane-details" ng-cloak bst-container-scroll>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
+      <header class="new-header details-header">
+        <h2 class="fl" translate>New GPG Key</h2>
+        <div class="fr">
+          <button class="btn btn-default" ui-sref="gpg-keys.index">
+            <i class="fa fa-remove"></i>
+            {{ "Close" | translate }}
+          </button>
+        </div>
+      </header>
+      <div>
+        <div bst-alerts error-messages="errorMessages"></div>
 
-  <header class="new-header details-header">
-    <h2 class="fl" translate>New GPG Key</h2>
-    <div class="fr">
-      <button class="btn btn-default" ui-sref="gpg-keys.index">
-        <i class="fa fa-remove"></i>
-        {{ "Close" | translate }}
-      </button>
-    </div>
-  </header>
-  <div>
-    <div bst-alerts error-messages="errorMessages"></div>
+        <form name="gpgKeyForm" class="form form-horizontal" novalidate role="form"
+              action="{{ uploadURL }}"
+              ng-upload="uploadContent(content)"
+              upload-options-enable-rails-csrf>
 
-    <form name="gpgKeyForm" class="form form-horizontal" novalidate role="form"
-          action="{{ uploadURL }}"
-          ng-upload="uploadContent(content)"
-          upload-options-enable-rails-csrf>
+          <div bst-form-group label="{{ 'Name' | translate }}">
+            <input id="name"
+                   name="name"
+                   ng-model="gpgKey.name"
+                   type="text"
+                   tabindex="1"
+                   autofocus
+                   required/>
+          </div>
 
-      <div bst-form-group label="{{ 'Name' | translate }}">
-        <input id="name"
-               name="name"
-               ng-model="gpgKey.name"
-               type="text"
-               tabindex="1"
-               autofocus
-               required/>
-      </div>
+          <div bst-form-group label="{{ 'Contents' | translate }}">
+            <div>
+              <div class="radio">
+                 <input type="radio"
+                     name="contentFormType"
+                     ng-model="contentFormType"
+                     value="upload"/>
+                  <label translate>Upload GPG Key</label>
+              </div>
+              <input type="file" name="file_path" ng-disabled="contentFormType != 'upload'"/>
+            </div>
 
-      <div bst-form-group label="{{ 'Contents' | translate }}">
-        <div>
-          <div class="radio">
-             <input type="radio"
-                 name="contentFormType"
-                 ng-model="contentFormType"
-                 value="upload"/>
-              <label translate>Upload GPG Key</label>
+            <div>
+              <div class="radio">
+                 <input type="radio"
+                     name="contentFormType"
+                     ng-model="contentFormType"
+                     value="paste"/>
+                  <label translate>Paste GPG Key Contents</label>
+              </div>
+              <textarea id="content"
+                        name="content"
+                        ng-model="gpgKey.content"
+                        tabindex="1"
+                        class="gpg-textarea"
+                        placeholder="{{ 'Paste contents...' | translate }}"
+                        ng-disabled="contentFormType != 'paste'">
+              </textarea>
+            </div>
           </div>
-          <input type="file" name="file_path" ng-disabled="contentFormType != 'upload'"/>
-        </div>
 
-        <div>
-          <div class="radio">
-             <input type="radio"
-                 name="contentFormType"
-                 ng-model="contentFormType"
-                 value="paste"/>
-              <label translate>Paste GPG Key Contents</label>
+          <div bst-form-buttons upload-submit
+               on-cancel="transitionTo('gpg-keys.index')"
+               ng-disabled="gpgKey.name == undefined"
+               working="progress.uploading">
           </div>
-          <textarea id="content"
-                    name="content"
-                    ng-model="gpgKey.content"
-                    tabindex="1"
-                    class="gpg-textarea"
-                    placeholder="{{ 'Paste contents...' | translate }}"
-                    ng-disabled="contentFormType != 'paste'">
-          </textarea>
-        </div>
-      </div>
-
-      <div bst-form-buttons upload-submit
-           on-cancel="transitionTo('gpg-keys.index')"
-           ng-disabled="gpgKey.name == undefined"
-           working="progress.uploading">
+        </form>
       </div>
-    </form>
+    </section>
   </div>
-</section>
+</div>