katello 3.1.0.1 → 3.2.0.rc1

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

@@ -39,6 +39,10 @@
     No Repositories contain this Package.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Repositories.
+  </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/packages/details/views/packages-details.html

@@ -1,60 +1,59 @@
 <span page-title ng-model="package">{{ 'Package: ' | translate }} {{ package.nvra}}</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">{{ package.nvra }}</h2>
 
-  <div ng-hide="panel.error">
-    <header class="details-header">
-      <h2 class="fl">{{ package.nvra }}</h2>
+          <div class="details-actions fr">
+            <button class="btn btn-default" ui-sref="packages.index">
+              <i class="fa fa-remove"></i>
+              {{ "Close" | translate }}
+            </button>
+          </div>
+        </header>
 
-      <div class="details-actions fr">
-        <button class="btn btn-default" ui-sref="packages.index">
-          <i class="fa fa-remove"></i>
-          {{ "Close" | translate }}
-        </button>
-      </div>
-    </header>
-
-    <nav class="details-navigation">
-      <ul>
-        <li ng-class="{active: isState('packages.details.info')}">
-          <a ui-sref="packages.details.info">
-            <span translate>
-              Details
-            </span>
-          </a>
-        </li>
-        <li ng-class="{active: isState('packages.details.files')}">
-          <a ui-sref="packages.details.files">
-            <span translate>
-              Files
-            </span>
-          </a>
-        </li>
-        <li ng-class="{active: isState('packages.details.dependencies')}">
-          <a ui-sref="packages.details.dependencies">
-            <span translate>
-              Dependencies
-            </span>
-          </a>
-        </li>
-        <li ng-class="{active: isState('packages.details.repositories')}">
-          <a ui-sref="packages.details.repositories">
-            <span translate>
-              Repositories
-            </span>
-          </a>
-        </li>
-      </ul>
-    </nav>
+        <nav class="details-navigation">
+          <ul>
+            <li ng-class="{active: isState('packages.details.info')}">
+              <a ui-sref="packages.details.info">
+                <span translate>
+                  Details
+                </span>
+              </a>
+            </li>
+            <li ng-class="{active: isState('packages.details.files')}">
+              <a ui-sref="packages.details.files">
+                <span translate>
+                  Files
+                </span>
+              </a>
+            </li>
+            <li ng-class="{active: isState('packages.details.dependencies')}">
+              <a ui-sref="packages.details.dependencies">
+                <span translate>
+                  Dependencies
+                </span>
+              </a>
+            </li>
+            <li ng-class="{active: isState('packages.details.repositories')}">
+              <a ui-sref="packages.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/packages/packages.module.js

@@ -6,6 +6,9 @@
  *   Module for package related functionality.
  */
 angular.module('Bastion.packages', [
+    'ngResource',
+    'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.common'
 ]);

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

@@ -16,4 +16,9 @@
     There are no Packages in this organization.  Create one or more Products with Packages to view Packages on this page.
   </span>
 
+  <span data-block="no-search-results-message">
+    Your search returned zero Packages.
+  </span>
+
+
 </div>

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

@@ -1,83 +1,82 @@
 <span page-title ng-model="product">{{ 'Details for Product:' | translate }} {{ product.name }}</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" translate>Product {{ product.name }}</h2>
 
-  <div ng-hide="panel.error">
-    <header class="details-header">
-      <h2 class="fl" translate>Product {{ product.name }}</h2>
+          <div class="fr">
 
-      <div class="fr">
+            <div bst-modal="removeProduct(product)" model="product">
+              <div data-block="modal-header" translate>Remove Product "{{ product.name }}"?</div>
+              <div data-block="modal-body" translate>Are you sure you want to remove product "{{ product.name }}"?</div>
+            </div>
 
-        <div bst-modal="removeProduct(product)" model="product">
-          <div data-block="modal-header" translate>Remove Product "{{ product.name }}"?</div>
-          <div data-block="modal-body" translate>Are you sure you want to remove product "{{ product.name }}"?</div>
-        </div>
+            <span ng-switch="getReadOnlyReason(product)" bst-feature-flag="custom_products">
+              <i class="fa fa-question-circle" ng-switch-when="permissions"
+                 tooltip="{{ 'You cannot remove this product because you do not have permission.' | translate }}"
+                 tooltip-animation="false"
+                 tooltip-append-to-body="true">
+              </i>
+              <i class="fa fa-question-circle" ng-switch-when="published"
+                 tooltip="{{ 'You cannot remove this product because it was published to a content view.' | translate }}"
+                 tooltip-animation="false"
+                 tooltip-append-to-body="true">
+              </i>
+              <i class="fa fa-question-circle" ng-switch-when="redhat"
+                 tooltip="{{ 'You cannot remove this product because it is a Red Hat product.' | translate }}"
+                 tooltip-animation="false"
+                 tooltip-append-to-body="true">
+              </i>
+            </span>
 
-        <span ng-switch="getReadOnlyReason(product)" bst-feature-flag="custom_products">
-          <i class="fa fa-question-circle" ng-switch-when="permissions"
-             tooltip="{{ 'You cannot remove this product because you do not have permission.' | translate }}"
-             tooltip-animation="false"
-             tooltip-append-to-body="true">
-          </i>
-          <i class="fa fa-question-circle" ng-switch-when="published"
-             tooltip="{{ 'You cannot remove this product because it was published to a content view.' | translate }}"
-             tooltip-animation="false"
-             tooltip-append-to-body="true">
-          </i>
-          <i class="fa fa-question-circle" ng-switch-when="redhat"
-             tooltip="{{ 'You cannot remove this product because it is a Red Hat product.' | translate }}"
-             tooltip-animation="false"
-             tooltip-append-to-body="true">
-          </i>
-        </span>
+            <button class="btn btn-default" bst-feature-flag="custom_products"
+                    ng-disabled="!productDeletable(product)"
+                    ng-click="openModal()">
+              <i class="fa fa-trash-o"></i>
+              {{ "Remove Product" | translate }}
+            </button>
+            <button class="btn btn-default" ui-sref="products.index">
+              <i class="fa fa-remove"></i>
+              {{ "Close" | translate }}
+            </button>
+          </div>
+        </header>
 
-        <button class="btn btn-default" bst-feature-flag="custom_products"
-                ng-disabled="!productDeletable(product)"
-                ng-click="openModal()">
-          <i class="fa fa-trash-o"></i>
-          {{ "Remove Product" | translate }}
-        </button>
-        <button class="btn btn-default" ui-sref="products.index">
-          <i class="fa fa-remove"></i>
-          {{ "Close" | translate }}
-        </button>
-      </div>
-    </header>
-
-    <nav>
-      <ul class="nav nav-tabs">
-        <li ng-class="{active: stateIncludes('products.details.info')}">
-          <a translate
-             ui-sref="products.details.info({productId: product.id})">
-            Details
-          </a>
-        </li>
-        <li ng-class="{active: stateIncludes('products.details.repositories')}">
-          <a translate
-             ui-sref="products.details.repositories.index({productId: product.id})">
-            Repositories
-          </a>
-        </li>
-        <li ng-class="{active: stateIncludes('products.details.tasks')}">
-          <a translate
-             ui-sref="products.details.tasks.index({productId: product.id})">
-            Tasks
-          </a>
-        </li>
-        <li ng-repeat="menuItem in menuExpander.getMenu('product')">
-          <a href="{{ menuItem.url }}">
-            {{ menuItem.label }}
-          </a>
-        </li>
-      </ul>
-    </nav>
+        <nav>
+          <ul class="nav nav-tabs">
+            <li ng-class="{active: stateIncludes('products.details.info')}">
+              <a translate
+                 ui-sref="products.details.info({productId: product.id})">
+                Details
+              </a>
+            </li>
+            <li ng-class="{active: stateIncludes('products.details.repositories')}">
+              <a translate
+                 ui-sref="products.details.repositories.index({productId: product.id})">
+                Repositories
+              </a>
+            </li>
+            <li ng-class="{active: stateIncludes('products.details.tasks')}">
+              <a translate
+                 ui-sref="products.details.tasks.index({productId: product.id})">
+                Tasks
+              </a>
+            </li>
+            <li ng-repeat="menuItem in menuExpander.getMenu('product')">
+              <a href="{{ menuItem.url }}">
+                {{ menuItem.label }}
+              </a>
+            </li>
+          </ul>
+        </nav>
 
-    <section class="nutupane-sub-section" ui-view></section>
+        <section class="nutupane-sub-section" ui-view></section>
+      </div>
+    </section>
   </div>
-</section>
+</div>

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

@@ -1,6 +1,6 @@
 <span page-title ng-model="product">{{ 'Repositories for Product:' | translate }} {{ product.name }}</span>
 
-<section ng-hide="panel.loading">
+<section>
   <div data-extend-template="layouts/details-nutupane.html">
     <div data-block="header"> {{ 'Repositories' | translate }} </div>
     <div data-block="messages">
@@ -24,15 +24,15 @@
 
     <div data-block="actions">
       <div bst-modal="removeSelectedRepositories()" model="detailsTable">
-        <div data-block="modal-header" 
-             translate 
-             translate-n="detailsTable.numSelected" 
+        <div data-block="modal-header"
+             translate
+             translate-n="detailsTable.numSelected"
              translate-plural="Remove {{ detailsTable.numSelected }} repostories?">
           Remove repository?
         </div>
-        <div data-block="modal-body" 
-             translate 
-             translate-n="detailsTable.numSelected" 
+        <div data-block="modal-body"
+             translate
+             translate-n="detailsTable.numSelected"
              translate-plural="Remove {{ detailsTable.numSelected }} repostories?">
              Are you sure you want to remove {{ detailsTable.getSelected()[0].name }}?
         </div>
@@ -90,6 +90,10 @@
       You currently don't have any Repositories included in this Product, you can add Repositories using the button on the right.
     </span>
 
+    <span data-block="no-search-results-message">
+      Your search returned zero Repositories.
+    </span>
+
     <div data-block="table">
       <table bst-table="detailsTable"
              class="table table-striped"
@@ -168,6 +172,14 @@
                 </div>
               </span>
 
+              <span ng-show="repository.content_type == 'file'">
+                <div>
+                  <span translate>
+                    {{ repository.content_counts.file || 0 }} Files
+                  </span>
+                </div>
+              </span>
+
             </td>
           </tr>
         </tbody>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html

@@ -1,152 +1,151 @@
 <span page-title>{{ 'Create Repositories' | translate }}</span>
 
-<div class="loading-mask loading-mask-panel" ng-show="panel.loading">
-  <i class="fa fa-spinner fa-spin"></i>
-  <span translate>Loading...</span>
-</div>
-
-<a ui-sref="products.discovery.scan">
-  <i class="fa fa-double-angle-left"></i>
-  {{ "Back To Repository Selection" | translate }}
-</a>
-
-<form name="productForm" class="form-horizontal" ng-disabled="creating()" novalidate role="form"> 
-
-  <section>
-    <h4 translate>Create Repositories Within:</h4>
-
-    <div class="form-group">
-      <label class="checkbox-inline">
-        <input type="radio"
-               name="newProduct"
-               value="false"
-               ng-model="createRepoChoices.newProduct"
-               ng-disabled="creating()"/>
-        <span translate>Existing Product</span> 
-      </label>
-
-      <label class="checkbox-inline"> 
-        <input type="radio"
-               name="newProduct"
-               value="true"
-               ng-model="createRepoChoices.newProduct"
-               ng-disabled="creating()"/>
-        <span translate>New Product</span>
-      </label>
-    </div>
-
-    <div class="form-group">
-      <div class="col-md-5" ng-hide="createRepoChoices.newProduct">
-        <select class="form-control" ng-disabled="creating()"
-                ng-model="createRepoChoices.existingProductId"
-                ng-options="product.id as product.name for product in products">
-        </select>
-      </div>
-    </div>  
-    
-    <div ng-show="createRepoChoices.newProduct">
-      
-      <div bst-alerts error-messages="productErrorMessages"></div>
-  
-      <div class="form-group required">
-        <label class="control-label col-sm-1 text-left" translate>Name</label>
-        <div class="col-sm-5 input">
-          <input ng-model="createRepoChoices.product.name"
-                 id="name"
-                 name="name"
-                 type="text"
-                 class="form-control"
-                 tabindex=1
-                 ng-required="createRepoChoices.newProduct === 'true'"/>
-        </div>
-      </div>
-  
-      <div class="form-group required">
-        <label class="control-label col-sm-1" translate>Label</label>
-        <div class="col-sm-5 input">
-          <input ng-model="createRepoChoices.product.label"
-                 id="label"
-                 name="label"
-                 type="text"
-                 class="form-control"
-                 tabindex=2
-                 ng-required="createRepoChoices.newProduct === 'true'"/>
+<div data-extend-template="layouts/panel.html">
+  <div data-block="panel">
+    <a ui-sref="products.discovery.scan">
+      <i class="fa fa-double-angle-left"></i>
+      {{ "Back To Repository Selection" | translate }}
+    </a>
+
+    <form name="productForm" class="form-horizontal" ng-disabled="creating()" novalidate role="form">
+
+      <section>
+        <h4 translate>Create Repositories Within:</h4>
+
+        <div class="form-group">
+          <label class="checkbox-inline">
+            <input type="radio"
+                   name="newProduct"
+                   value="false"
+                   ng-model="createRepoChoices.newProduct"
+                   ng-disabled="creating()"/>
+            <span translate>Existing Product</span>
+          </label>
+
+          <label class="checkbox-inline">
+            <input type="radio"
+                   name="newProduct"
+                   value="true"
+                   ng-model="createRepoChoices.newProduct"
+                   ng-disabled="creating()"/>
+            <span translate>New Product</span>
+          </label>
         </div>
-      </div>
-  
-      <div class="form-group">
-        <label class="control-label col-sm-1" translate>GPG Key</label>
-        <div class="col-sm-5 input">
-          <select class="form-control" ng-model="createRepoChoices.product.gpg_key_id"
-                  ng-options="gpg_key.id as gpg_key.name for gpg_key in gpgKeys">
-          </select>
+
+        <div class="form-group">
+          <div class="col-md-5" ng-hide="createRepoChoices.newProduct">
+            <select class="form-control" ng-disabled="creating()"
+                    ng-model="createRepoChoices.existingProductId"
+                    ng-options="product.id as product.name for product in products">
+            </select>
+          </div>
         </div>
-      </div>
-
-     </div> 
-  </section>
-  
-  <section>
-    <h4 translate>Options:</h4>
-    <div class="checkbox">
-      <label>
-        <input type="checkbox" 
-               id="unprotected" 
-               ng-model="createRepoChoices.unprotected" 
-               ng-disabled="creating()"/>
-        <span translate>Serve via HTTP.</span>
-      </label>
-    </div>
-  </section>
-
-  <section>
-    <h4 ng-show="discovery.selected.length > 0" translate>Selected URLs:</h4>
-  
-    <div ng-repeat="repo in discovery.selected">
-      
-      <div class="col-sm-offset-0 bottom-padding">
-        <i class="fa fa-circle"></i>
-        <span>{{  repo.url }}</span> 
-        <i class="fa fa-check" ng-show="repo.created"></i>
-      </div>
-  
-      <div class="form-group required">
-        <label class="control-label col-sm-1" translate>Name</label>
-        <div class="col-sm-4 input">
-          <input ng-model="repo.name"
-                 ng-disabled="creating() || repo.created"
-                 name="repo_name"    
-                 type="text"
-                 class="form-control"
-                 required/>
+
+        <div ng-show="createRepoChoices.newProduct">
+
+          <div bst-alerts error-messages="productErrorMessages"></div>
+
+          <div class="form-group required">
+            <label class="control-label col-sm-1 text-left" translate>Name</label>
+            <div class="col-sm-5 input">
+              <input ng-model="createRepoChoices.product.name"
+                     id="name"
+                     name="name"
+                     type="text"
+                     class="form-control"
+                     tabindex=1
+                     ng-required="createRepoChoices.newProduct === 'true'"/>
+            </div>
+          </div>
+
+          <div class="form-group required">
+            <label class="control-label col-sm-1" translate>Label</label>
+            <div class="col-sm-5 input">
+              <input ng-model="createRepoChoices.product.label"
+                     id="label"
+                     name="label"
+                     type="text"
+                     class="form-control"
+                     tabindex=2
+                     ng-required="createRepoChoices.newProduct === 'true'"/>
+            </div>
+          </div>
+
+          <div class="form-group">
+            <label class="control-label col-sm-1" translate>GPG Key</label>
+            <div class="col-sm-5 input">
+              <select class="form-control" ng-model="createRepoChoices.product.gpg_key_id"
+                      ng-options="gpg_key.id as gpg_key.name for gpg_key in gpgKeys">
+              </select>
+            </div>
+          </div>
+
+         </div>
+      </section>
+
+      <section>
+        <h4 translate>Options:</h4>
+        <div class="checkbox">
+          <label>
+            <input type="checkbox"
+                   id="unprotected"
+                   ng-model="createRepoChoices.unprotected"
+                   ng-disabled="creating()"/>
+            <span translate>Serve via HTTP.</span>
+          </label>
         </div>
-      </div>
-  
-      <div class="form-group required">
-        <label class="control-label col-sm-1" translate>Label</label>
-        <div class="col-sm-4 input">
-          <input ng-model="repo.label"
-                 ng-disabled="creating() || repo.created"
-                 name="repo_label"
-                 type="text"                 
-                 class="form-control"
-                 required/>
+      </section>
+
+      <section>
+        <h4 ng-show="discovery.selected.length > 0" translate>Selected URLs:</h4>
+
+        <div ng-repeat="repo in discovery.selected">
+
+          <div class="col-sm-offset-0 bottom-padding">
+            <i class="fa fa-circle"></i>
+            <span>{{  repo.url }}</span>
+            <i class="fa fa-check" ng-show="repo.created"></i>
+          </div>
+
+          <div class="form-group required">
+            <label class="control-label col-sm-1" translate>Name</label>
+            <div class="col-sm-4 input">
+              <input ng-model="repo.name"
+                     ng-disabled="creating() || repo.created"
+                     name="repo_name"
+                     type="text"
+                     class="form-control"
+                     required/>
+            </div>
+          </div>
+
+          <div class="form-group required">
+            <label class="control-label col-sm-1" translate>Label</label>
+            <div class="col-sm-4 input">
+              <input ng-model="repo.label"
+                     ng-disabled="creating() || repo.created"
+                     name="repo_label"
+                     type="text"
+                     class="form-control"
+                     required/>
+            </div>
+          </div>
         </div>
-      </div>
-    </div>
-
-    <div class="form"> 
-      <div class="control-group buttons">
-        <div class="input">
-          <button ng-click="createRepos()"
-                  ng-disabled="creating() || !requiredFieldsEnabled()"
-                  translate
-                  class="btn btn-primary btn-large">
-            <i class="fa fa-spinner fa-spin" ng-show="creating()"></i>
-            Create
-          </button>
+
+        <div class="form">
+          <div class="control-group buttons">
+            <div class="input">
+              <button ng-click="createRepos()"
+                      ng-disabled="creating() || !requiredFieldsEnabled()"
+                      translate
+                      class="btn btn-primary btn-large">
+                <i class="fa fa-spinner fa-spin" ng-show="creating()"></i>
+                Create
+              </button>
+            </div>
+          </div>
         </div>
-      </div>  
-    </div>
-  </section>
-</form>
+      </section>
+    </form>
+  </div>
+</div>