katello 3.3.0.rc1.1 → 3.3.0.rc2

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

@@ -5,43 +5,43 @@
   <nav>
     <ul class="nav nav-tabs">
 
-      <li ng-class="{active: isState('content-views.details.filters.details.erratum.edit')}">
-        <a ui-sref="content-views.details.filters.details.erratum.edit">
+      <li ng-class="{active: isState('content-view.filter.erratum.edit')}">
+        <a ui-sref="content-view.filter.erratum.edit">
         <span translate>
 	  Details
         </span>
         </a>
       </li>
 
-      <li ng-if="!filter.rules[0].types" ng-class="{active: isState('content-views.details.filters.details.erratum.list')}">
-        <a ui-sref="content-views.details.filters.details.erratum.list({filterId: filter.id})">
+      <li ng-if="!filter.rules[0].types" ng-class="{active: isState('content-view.filter.erratum.list')}">
+        <a ui-sref="content-view.filter.erratum.list({filterId: filter.id})">
         <span translate>
           List/Remove
         </span>
         </a>
       </li>
 
-      <li ng-if="!filter.rules[0].types" ng-class="{active: isState('content-views.details.filters.details.erratum.available')}"
+      <li ng-if="!filter.rules[0].types" ng-class="{active: isState('content-view.filter.erratum.available')}"
           ng-show="permitted('edit_content_views', contentView)">
-        <a ui-sref="content-views.details.filters.details.erratum.available({filterId: filter.id})">
+        <a ui-sref="content-view.filter.erratum.available({filterId: filter.id})">
         <span translate>
           Add
         </span>
         </a>
       </li>
 
-      <li ng-if="filter.rules[0].types" ng-class="{active: isState('content-views.details.filters.details.erratum.dateType')}"
+      <li ng-if="filter.rules[0].types" ng-class="{active: isState('content-view.filter.erratum.dateType')}"
           ng-show="permitted('edit_content_views', contentView)">
-        <a ui-sref="content-views.details.filters.details.erratum.dateType({filterId: filter.id})">
+        <a ui-sref="content-view.filter.erratum.dateType({filterId: filter.id})">
         <span translate>
           Erratum Date Range
         </span>
         </a>
       </li>
 
-      <li ng-class="{active: isState('content-views.details.filters.details.erratum.repositories')}"
+      <li ng-class="{active: isState('content-view.filter.erratum.repositories')}"
           ng-show="permitted('edit_content_views', contentView)">
-        <a ui-sref="content-views.details.filters.details.erratum.repositories({filterId: filter.id})"
+        <a ui-sref="content-view.filter.erratum.repositories({filterId: filter.id})"
            ng-include="'content-views/details/filters/views/partials/filter-repositories-count.html'">
         </a>
       </li>

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

@@ -1,48 +1,8 @@
 <span page-title ng-model="filter">{{ 'Filter:' | translate }} {{ filter.name }}</span>
 
-<div class="loading-mask loading-mask-panel fa-3x" ng-show="filter.id === undefined">
-    <i class="fa fa-spinner fa-spin"></i>
-    {{ "Loading..." | translate }}
-</div>
+<header class="details-header">
+  <h3>{{ filter.name }}</h3>
+  <small translate>Type: {{ filter.inclusion | filterType }} {{ filter.type | filterContentType }}</small>
+</header>
 
-<div class="details details-full" ng-show="filter.id !== undefined">
-
-  <ol class="breadcrumb">
-    <li ng-class="{active: isState('content-views.details.filters.list')}">
-      <a ui-sref="content-views.details.filters.list" translate>Filters</a>
-    </li>
-    
-    <li ng-if="filter.type === 'erratum'" 
-        ng-class="{active: stateIncludes('content-views.details.filters.details.erratum')}">
-      <a ng-if="!filter.rules[0].types"
-         ui-sref="content-views.details.filters.details.erratum.list({filterId: filter.id})">
-        {{ filter.name }}
-      </a>
-      <a ng-if="filter.rules[0].types"
-         ui-sref="content-views.details.filters.details.erratum.dateType({filterId: filter.id})">
-        {{ filter.name }}
-      </a>
-    </li>
-    
-    <li ng-if="filter.type === 'rpm'"
-        ng-class="{active: stateIncludes('content-views.details.filters.details.rpm')}">
-      <a ui-sref="content-views.details.filters.details.rpm({filterId: filter.id})">
-        {{ filter.name }}
-      </a>
-    </li>
-    
-    <li ng-if="filter.type === 'package_group'"
-        ng-class="{active: stateIncludes('content-views.details.filters.details.package_group')}">
-    <a ui-sref="content-views.details.filters.details.package_group.list({filterId: filter.id})">
-        {{ filter.name }}
-      </a>
-    </li>
-  </ol>
-
-  <header class="details-header">
-    <h3>{{ filter.name }} ({{ filter.inclusion | filterType }} {{ filter.type | filterContentType }})</h3>
-  </header>
-
-  <div ui-view></div>
-
-</div>
+<div ui-view></div>

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

@@ -1,123 +1,117 @@
 <span page-title ng-model="filter">{{ 'Repositories for Filter:' | translate }} {{ filter.name }}</span>
 
-<div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
-
-<section class="details details-full">
-
-  <div class="details-header">
-    <div class="well col-sm-8">
-      <div class="radio">
-        <label>
-          <input type="radio"
-                 ng-value="false"
-                 ng-model="showRepos"
-                 ng-hide="denied('edit_content_views', contentView)"
-                 ng-click="selectAllRepositories()"/>
-          <span translate>This filter applies to all repositories in the content view (current and future).</span>
-        </label>
-      </div>
-      <div class="radio">
-        <label>
-          <input type="radio"
-                 ng-value="true"
-                 ng-hide="denied('edit_content_views', contentView)"
-                 ng-model="showRepos"/>
-          <span translate>This filter applies only to a subset of repositories in the content view.</span>
-        </label>
-      </div>
+<div class="row">
+  <div class="well col-sm-8">
+    <div class="radio">
+      <label>
+        <input type="radio"
+               ng-value="false"
+               ng-model="showRepos"
+               ng-hide="denied('edit_content_views', contentView)"
+               ng-click="selectAllRepositories()"/>
+        <span translate>This filter applies to all repositories in the content view (current and future).</span>
+      </label>
+    </div>
+    <div class="radio">
+      <label>
+        <input type="radio"
+               ng-value="true"
+               ng-hide="denied('edit_content_views', contentView)"
+               ng-model="showRepos"/>
+        <span translate>This filter applies only to a subset of repositories in the content view.</span>
+      </label>
     </div>
   </div>
+</div>
 
-  <div ng-class="{'table-mask': !showRepos}">
-    <span class="pull-right">
-      <button class="btn btn-primary"
+<div ng-class="{'table-mask': !showRepos}">
+  <div data-extend-template="layouts/partials/table.html">
+    <div data-block="list-actions">
+      <button class="btn btn-default"
               translate
               ng-hide="denied('edit_content_views', contentView)"
-              ng-disabled="!showRepos || repositoriesTable.numSelected === 0"
+              ng-disabled="!showRepos || table.numSelected === 0"
               ng-click="updateRepositories()">
         Update Repositories
       </button>
-    </span>
-
-    <div class="row">
-      <div class="col-sm-8">
-        <div class="input-group">
-
-          <span class="input-group-addon">
-            <select ng-model="product" ng-options="product.name for (id, product) in products">
-            </select>
-          </span>
+    </div>
 
-          <input type="text"
-                 class="form-control filter-input"
-                 placeholder="{{ 'Filter' | translate }}"
-                 ng-model="repositorySearch"/>
+    <div data-block="search" class="col-sm-5">
+      <div class="input-group">
+        <span class="input-group-addon">
+          <select ng-model="product" ng-options="product.name for (id, product) in products"></select>
+        </span>
 
-        </div>
+        <input type="text"
+               class="form-control filter-input"
+               placeholder="{{ 'Filter' | translate }}"
+               ng-model="repositorySearch"/>
       </div>
     </div>
 
-    <table bst-table="repositoriesTable"
-           class="table table-striped"
-           ng-class="{'table-mask': repositoriesTable.working}">
-      <thead>
-        <tr bst-table-head>
-          <th bst-table-column="affectedRepos">Affected?</th>
-          <th bst-table-column="name" translate>Name</th>
-          <th bst-table-column="product" translate>Product</th>
-          <th bst-table-column="type" translate>Type</th>
-          <th bst-table-column="sync-status" translate>Sync Status</th>
-          <th bst-table-column="content" translate>Content</th>
-        </tr>
-      </thead>
+    <div data-block="table">
+      <table bst-table="table"
+             class="table table-striped"
+             ng-class="{'table-mask': table.working}">
+        <thead>
+          <tr bst-table-head row-select>
+            <th bst-table-column="affectedRepos">Affected?</th>
+            <th bst-table-column="name" translate>Name</th>
+            <th bst-table-column="product" translate>Product</th>
+            <th bst-table-column="type" translate>Type</th>
+            <th bst-table-column="sync-status" translate>Sync Status</th>
+            <th bst-table-column="content" translate>Content</th>
+          </tr>
+        </thead>
 
-      <tbody>
-        <tr bst-table-row
-            row-select="repository"
-            ng-hide="denied('edit_content_views', contentView)"
-            ng-disabled="!showRepos"
-            ng-repeat="repository in repositoriesTable.rows | filter:repositorySearch | filter:repositoryFilter">
-          <td bst-table-cell>
-            <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.id})">
-              {{ repository.name }}
-            </a>
-          </td>
-          <td bst-table-cell>
-            <a ui-sref="product.info({productId: repository.product.id})">
-              {{ repository.product.name }}
-            </a>
-          </td>
-          <td bst-table-cell>{{ repository.content_type }}</td>
-          <td bst-table-cell>
-              <span ng-show="repository.url">
-                <span ng-show="repository.last_sync == null" translate>
-                  Not Synced
-                </span>
-                <span ng-hide="repository.last_sync == null">
-                  <a href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize}}</a>
-                  ({{ repository.last_sync.ended_at | date:"short" }})
-                </span>
-              </span>
-            <span ng-hide="repository.url" translate>N/A</span>
-          </td>
-          <td bst-table-cell>
-            <div ng-if="repository.content_counts.rpm && repository.content_counts.rpm > 0">
-              <a ui-sref="product.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})"
-                 ng-show="repository.content_type == 'yum'"
-                 translate>
-                {{ repository.content_counts.rpm }} Packages
+        <tbody>
+          <tr bst-table-row
+              row-select="repository"
+              ng-hide="denied('edit_content_views', contentView)"
+              ng-disabled="!showRepos"
+              ng-repeat="repository in table.rows | filter:repositorySearch | filter:repositoryFilter">
+            <td bst-table-cell>
+              <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.id})">
+                {{ repository.name }}
               </a>
-            </div>
-            <div ng-if="repository.content_counts.erratum && repository.content_counts.erratum > 0">
-              <a ui-sref="errata.index({repositoryId: repository.id})"
-                 ng-show="repository.content_type == 'yum'"
-                 translate>
-                {{ repository.content_counts.erratum }} Errata
+            </td>
+            <td bst-table-cell>
+              <a ui-sref="product.info({productId: repository.product.id})">
+                {{ repository.product.name }}
               </a>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
+            </td>
+            <td bst-table-cell>{{ repository.content_type }}</td>
+            <td bst-table-cell>
+                <span ng-show="repository.url">
+                  <span ng-show="repository.last_sync == null" translate>
+                    Not Synced
+                  </span>
+                  <span ng-hide="repository.last_sync == null">
+                    <a href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize}}</a>
+                    ({{ repository.last_sync.ended_at | date:"short" }})
+                  </span>
+                </span>
+              <span ng-hide="repository.url" translate>N/A</span>
+            </td>
+            <td bst-table-cell>
+              <div ng-if="repository.content_counts.rpm && repository.content_counts.rpm > 0">
+                <a ui-sref="products.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})"
+                   ng-show="repository.content_type == 'yum'"
+                   translate>
+                  {{ repository.content_counts.rpm }} Packages
+                </a>
+              </div>
+              <div ng-if="repository.content_counts.erratum && repository.content_counts.erratum > 0">
+                <a ui-sref="errata.index({repositoryId: repository.id})"
+                   ng-show="repository.content_type == 'yum'"
+                   translate>
+                  {{ repository.content_counts.erratum }} Errata
+                </a>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
-</section>
+</div>

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

@@ -1,26 +1,17 @@
 <span page-title ng-model="contentView">{{ 'Filters for Content View:' | translate }} {{ contentView.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
-   
-  <div data-block="messages"></div>
-
-  <div data-block="header">
-    <h3 translate>Filters</h3>
-  </div>
-
-  <div data-block="actions">
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="list-actions">
     <button class="btn btn-default"
             ng-hide="denied('edit_content_views', contentView)"
-            ui-sref="content-views.details.filters.new">
-      <i class="fa fa-plus"></i>
+            ui-sref="content-view.filters.new">
       <span translate>New Filter</span>
     </button>
     <button class="btn btn-default"
             ng-hide="denied('edit_content_views', contentView)"
-            ng-disabled="detailsTable.numSelected === 0"
+            ng-disabled="table.numSelected === 0"
             ng-click="removeFilters()">
-      <i class="fa fa-trash-o"></i>
-      <span translate>Remove Filters</span>
+      <span translate>Remove Selected</span>
     </button>
   </div>
 
@@ -33,8 +24,8 @@
   </span>
 
   <div data-block="table">
-    <table class="table table-striped table-bordered" ng-show="detailsTable.rows.length > 0"
-           ng-class="{'table-mask': detailsTable.working}">
+    <table class="table table-striped table-bordered" ng-show="table.rows.length > 0"
+           ng-class="{'table-mask': table.working}">
 
       <thead>
         <tr bst-table-head row-select>
@@ -47,22 +38,22 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="filter in detailsTable.rows" row-select="filter">
+        <tr bst-table-row ng-repeat="filter in table.rows" row-select="filter">
           <td bst-table-cell>
             <a ng-if="filter.type === 'erratum' && !filter.rules[0].types"
-               ui-sref="content-views.details.filters.details.erratum.list({filterId: filter.id})">
+               ui-sref="content-view.filter.erratum.list({filterId: filter.id})">
               {{ filter.name }}
             </a>
             <a ng-if="filter.type === 'erratum' && filter.rules[0].types"
-               ui-sref="content-views.details.filters.details.erratum.dateType({filterId: filter.id})">
+               ui-sref="content-view.filter.erratum.dateType({filterId: filter.id})">
               {{ filter.name }}
             </a>
             <a ng-if="filter.type === 'rpm'"
-               ui-sref="content-views.details.filters.details.rpm.details({filterId: filter.id})">
+               ui-sref="content-view.filter.rpm.details({filterId: filter.id})">
               {{ filter.name }}
             </a>
             <a ng-if="filter.type === 'package_group'"
-               ui-sref="content-views.details.filters.details.package_group.list({filterId: filter.id})">
+               ui-sref="content-view.filter.package_group.list({filterId: filter.id})">
               {{ filter.name }}
             </a>
           </td>

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

@@ -1,64 +1,55 @@
 <span page-title ng-model="contentView">{{ 'New Filter for Content View:' | translate }} {{ contentView.name }}</span>
 
-<div class="details details-full">
-
-  <a ui-sref="content-views.details.filters.list">
-    <i class="fa fa-double-angle-left"></i>
-    <span translate>Filters List</span>
-  </a>
-
-  <header class="details-header">
-    <h3 translate>Add New Filter</h3>
-  </header>
-
-  <form name="filterForm" class="col-sm-5" role="form" novalidate>
-    <div bst-form-group label="{{ 'Name' | translate }}">
-      <input id="name"
-             name="name"
-             ng-model="filter.name"
-             type="text"
-             tabindex="1"
-             autofocus
-             required/>
-    </div>
-    
-    <div bst-form-group label="{{ 'Content Type' | translate }}">
-      <select id="type"
-              name="type"
-              ng-model="filter.type"
-              tabindex="2"
-              required>
-        <option value="rpm" translate>Package</option>
-        <option value="package_group" translate>Package Group</option>
-        <option value="erratumId" translate>Erratum - by ID</option>
-        <option value="erratumDateType" translate>Erratum - by Date and Type</option>
-      </select>
-    </div>
-
-    <div bst-form-group label="{{ 'Inclusion Type' | translate }}">
-      <select id="inclusion"
-              name="inclusion"
-              ng-model="filter.inclusion"
-              tabindex="3"
-              required>
-        <option value="true" translate>Include</option>
-        <option value="false" translate>Exclude</option>
-      </select>
-    </div>
-
-    <div bst-form-group label="{{ 'Description' | translate }}">
-      <textarea id="description"
-                name="description"
-                ng-model="filter.description"
-                tabindex="3">
-      </textarea>
-    </div>
-
-    <div bst-form-buttons
-         on-cancel="transitionTo('content-views.details.filters.list', {contentViewId: contentView.id})"
-         on-save="save(filter, contentView)"
-         working="working">
-    </div>
-  </form>
-
-</div>
+<header data-block="sub-header`">
+  <h3 translate>Add New Filter</h3>
+</header>
+
+<form name="filterForm" class="col-sm-5" role="form" novalidate>
+  <div bst-form-group label="{{ 'Name' | translate }}">
+    <input id="name"
+           name="name"
+           ng-model="filter.name"
+           type="text"
+           tabindex="1"
+           autofocus
+           required/>
+  </div>
+
+  <div bst-form-group label="{{ 'Content Type' | translate }}">
+    <select id="type"
+            name="type"
+            ng-model="filter.type"
+            tabindex="2"
+            required>
+      <option value="rpm" translate>Package</option>
+      <option value="package_group" translate>Package Group</option>
+      <option value="erratumId" translate>Erratum - by ID</option>
+      <option value="erratumDateType" translate>Erratum - by Date and Type</option>
+    </select>
+  </div>
+
+  <div bst-form-group label="{{ 'Inclusion Type' | translate }}">
+    <select id="inclusion"
+            name="inclusion"
+            ng-model="filter.inclusion"
+            tabindex="3"
+            required>
+      <option value="true" translate>Include</option>
+      <option value="false" translate>Exclude</option>
+    </select>
+  </div>
+
+  <div bst-form-group label="{{ 'Description' | translate }}">
+    <textarea id="description"
+              name="description"
+              ng-model="filter.description"
+              tabindex="3">
+    </textarea>
+  </div>
+
+  <div bst-form-buttons
+       on-cancel="transitionTo('content-view.filters', {contentViewId: contentView.id})"
+       on-save="save(filter, contentView)"
+       working="working">
+  </div>
+</form>