katello 3.3.0.rc1.1 → 3.3.0.rc2

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

@@ -1,12 +1,6 @@
 <span page-title ng-model="contentView">{{ 'Promote Content View:' | translate }} {{ contentView.name }}</span>
 
 <div>
-
-  <a ui-sref="content-views.details.versions({contentViewId: contentView.id})" >
-    <i class="fa fa-double-angle-left"></i>
-    {{ "Back to Version List" | translate }}
-  </a>
-
   <h3 translate>Promote Version {{ version.version }}</h3>
 
   <p class="details" translate>
@@ -47,7 +41,7 @@
       Promote Version
     </button>
 
-    <a ui-sref="content-views.details.versions" class="btn btn-default btn-lg"  translate role="button">
+    <a ui-sref="content-view.versions" class="btn btn-default btn-lg"  translate role="button">
       Cancel
     </a>
 

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

@@ -1,38 +1,34 @@
 <span page-title ng-model="contentView">{{ 'Publish Content View:' | translate }} {{ contentView.name }}</span>
 
-<div class="details details-full">
-
-  <h3 translate>Publish New Version</h3>
-
-  <p translate>
-    A new version of {{ contentView.name }} will be created and promoted to the Library environment.
-    It can be promoted to other environments from the Versions tab of this Content View.
-  </p>
-
-  <header class="details-header">
-    <h3 translate>Version Details</h3>
-  </header>
-
-  <form name="versionForm" class="col-sm-5" role="form" novalidate>
-
-    <div bst-form-group label="{{ 'Version' | translate }}">
-      <span>{{ contentView['next_version'] }}</span>
-    </div>
-
-    <div bst-form-group label="{{ 'Description' | translate }}">
-      <textarea id="description"
-                name="description"
-                ng-model="version.description"
-                rows="10"
-                tabindex="1">
-      </textarea>
-    </div>
-
-    <div bst-form-buttons
-         on-cancel="transitionTo('content-views.details.versions', {contentViewId: contentView.id})"
-         on-save="publish(contentView)"
-         working="working">
-    </div>
-  </form>
-
-</div>
+<h3 translate>Publish New Version</h3>
+
+<p translate>
+  A new version of {{ contentView.name }} will be created and promoted to the Library environment.
+  It can be promoted to other environments from the Versions tab of this Content View.
+</p>
+
+<header class="details-header">
+  <h3 translate>Version Details</h3>
+</header>
+
+<form name="versionForm" class="col-sm-5" role="form" novalidate>
+
+  <div bst-form-group label="{{ 'Version' | translate }}">
+    <span>{{ contentView['next_version'] }}</span>
+  </div>
+
+  <div bst-form-group label="{{ 'Description' | translate }}">
+    <textarea id="description"
+              name="description"
+              ng-model="version.description"
+              rows="10"
+              tabindex="1">
+    </textarea>
+  </div>
+
+  <div bst-form-buttons
+       on-cancel="transitionTo('content-view.versions', {contentViewId: contentView.id})"
+       on-save="publish(contentView)"
+       working="working">
+  </div>
+</form>

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

@@ -1,138 +1,108 @@
 <span page-title ng-model="contentView">{{ 'Repositories for Content View:' | translate }} {{ contentView.name }}</span>
 
-<div class="details details-full">
-
+<header data-block="sub-header">
   <h3 translate>
     Repository Selection
   </h3>
+</header>
 
-  <nav>
-    <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
-      <li ng-class="{active: isState('content-views.details.repositories.yum.list')}">
-        <a ui-sref="content-views.details.repositories.yum.list">
-          <span translate>
-            List/Remove
-          </span>
-        </a>
-      </li>
-
-      <li ng-class="{active: isState('content-views.details.repositories.yum.available')}" ng-show="!contentView.permissions.editable">
-        <a ui-sref="content-views.details.repositories.yum.available" translate>
-          Add
-        </a>
-      </li>
-    </ul>
-  </nav>
-
-  <div class="details-header 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>
+<nav>
+  <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
+    <li ng-class="{active: isState('content-view.repositories.yum.list')}">
+      <a ui-sref="content-view.repositories.yum.list">
+        <span translate>
+          List/Remove
         </span>
+      </a>
+    </li>
 
-        <input type="text"
-               class="form-control filter-input"
-               placeholder="{{ 'Filter' | translate }}"
-               ng-model="repositorySearch"/>
-
-      </div>
-    </div>
+    <li ng-class="{active: isState('content-view.repositories.yum.available')}" ng-show="!contentView.permissions.editable">
+      <a ui-sref="content-view.repositories.yum.available" translate>
+        Add
+      </a>
+    </li>
+  </ul>
+</nav>
 
-    <div class="col-sm-4">
-      <button class="btn btn-primary fr"
-              ng-disabled="repositoriesTable.numSelected === 0"
-              ng-show="isState('content-views.details.repositories.yum.list') && permitted('edit_content_views', contentView)"
-              ng-click="removeRepositories(contentView)">
-        <i class="fa fa-trash-o"></i>
-        <span translate>Remove Repositories</span>
-      </button>
-      <button class="btn btn-primary fr"
-              ng-disabled="repositoriesTable.numSelected === 0"
-              ng-show="isState('content-views.details.repositories.yum.available') && permitted('edit_content_views', contentView)"
-              ng-click="addRepositories(contentView)">
-        <i class="fa fa-plus"></i>
-        <span translate>Add Repositories</span>
-      </button>
-    </div>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="list-actions">
+    <button class="btn btn-primary"
+            ng-disabled="table.numSelected === 0"
+            ng-show="isState('content-view.repositories.yum.list') && permitted('edit_content_views', contentView)"
+            ng-click="removeRepositories(contentView)">
+      <span translate>Remove Repositories</span>
+    </button>
+    <button class="btn btn-primary"
+            ng-disabled="table.numSelected === 0"
+            ng-show="isState('content-view.repositories.yum.available') && permitted('edit_content_views', contentView)"
+            ng-click="addRepositories(contentView)">
+      <span translate>Add Repositories</span>
+    </button>
   </div>
 
-  <div bst-table="repositoriesTable" class="nutupane">
+  <span data-block="no-rows-message">
+    <span ng-show="isState('content-view.repositories.yum.list')" translate>
+      There are currently no repositories associated with this Content View, you can add some by clicking on the "Add" tab above.
+    </span>
+    <span ng-show="isState('content-view.repositories.yum.available')">
+      <span translate>There are currently no repositories to add to this Content View,</span>
+      <a ui-sref="products" translate>add some repositories.</a>
+    </span>
+  </span>
 
-    <div ng-show="repositoriesTable.rows.length === 0 && !repositoriesTable.working">
-      <p bst-alert="info" ng-show="isState('content-views.details.repositories.yum.list')">
-        <span translate>
-          There are currently no repositories associated with this Content View, you can add some by clicking on the "Add" tab above.
-        </span>
-      </p>
-      <p bst-alert="info" ng-show="isState('content-views.details.repositories.yum.available')">
-        <span translate>There are currently no repositories to add to this Content View,</span>
-        <a ui-sref="products" translate>add some repositories.</a>
-      </p>
-    </div>
+  <table data-block="table" class="table table-bordered table-striped">
+    <thead>
+      <tr bst-table-head row-select>
+        <th bst-table-column translate>Name</th>
+        <th bst-table-column translate>Product</th>
+        <th bst-table-column translate>Last Sync</th>
+        <th bst-table-column translate>Sync State</th>
+        <th bst-table-column translate>Content</th>
+      </tr>
+    </thead>
 
-    <div class="loading-mask loading-mask-panel" ng-show="repositoriesTable.working">
-      <i class="fa fa-spinner fa-spin"></i>
-      {{ "Loading..." | translate }}
-    </div>
-
-    <table ng-show="repositoriesTable.rows.length > 0"  class="table table-bordered table-striped">
-      <thead>
-        <tr bst-table-head row-select>
-          <th bst-table-column translate>Name</th>
-          <th bst-table-column translate>Product</th>
-          <th bst-table-column translate>Last Sync</th>
-          <th bst-table-column translate>Sync State</th>
-          <th bst-table-column translate>Content</th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <tr bst-table-row
-            row-select="repository"
-            ng-repeat="repository in repositoriesTable.rows | filter:repositorySearch | filter:repositoryFilter as filteredItems">
-          <td bst-table-cell>
-            <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.id})">
-              {{ repository.name }}
+    <tbody>
+      <tr bst-table-row
+          row-select="repository"
+          ng-repeat="repository in table.rows | filter:repositorySearch | filter:repositoryFilter as filteredItems">
+        <td bst-table-cell>
+          <a ui-sref="products.details.repositories.info({productId: repository.product.id, repositoryId: repository.id})">
+            {{ repository.name }}
+          </a>
+        </td>
+        <td bst-table-cell>{{ repository.product.name }}</td>
+        <td bst-table-cell>
+          <span ng-show="repository.url && repository.last_sync == null" translate>
+            Not Synced
+          </span>
+          <span ng-show="repository.url">
+            {{ repository.last_sync.ended_at | date:"short" }}
+          </span>
+          <span ng-hide="repository.url" translate>N/A</span>
+        </td>
+        <td bst-table-cell>
+          <span ng-show="repository.url">
+            <a href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize }}</a>
+          </span>
+          <span ng-hide="repository.url" translate>N/A</span>
+        </td>
+        <td bst-table-cell>
+          <div>
+            <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>
-          </td>
-          <td bst-table-cell>{{ repository.product.name }}</td>
-          <td bst-table-cell>
-            <span ng-show="repository.url && repository.last_sync == null" translate>
-              Not Synced
-            </span>
-            <span ng-show="repository.url">
-              {{ repository.last_sync.ended_at | date:"short" }}
-            </span>
-            <span ng-hide="repository.url" translate>N/A</span>
-          </td>
-          <td bst-table-cell>
-            <span ng-show="repository.url">
-              <a href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize }}</a>
-            </span>
-            <span ng-hide="repository.url" translate>N/A</span>
-          </td>
-          <td bst-table-cell>
-            <div>
-              <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
-              </a>
-            </div>
-            <div>
-              <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>
+          <div>
+            <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>

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

@@ -1,8 +1,6 @@
 <span page-title ng-model="contentView">{{ 'Versions for Content View:' | translate }} {{ contentView.name }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
-  <div data-block="messages"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>
     This Content View does not have any versions, create your first Content View Version by using the "Publish New Version" button on the right.
   </span>
@@ -10,9 +8,9 @@
   <span data-block="no-search-results-message" translate>
     Your search returned zero Content View.
   </span>
-
+  
   <div data-block="table">
-    <table class="table table-striped table-bordered" ng-show="detailsTable.rows.length > 0" bst-table="table">
+    <table class="table table-striped table-bordered" bst-table="table">
       <thead>
         <tr bst-table-head>
           <th bst-table-column><span translate>Version</span></th>
@@ -25,80 +23,78 @@
       </thead>
 
       <tbody>
-      <tr bst-table-row ng-repeat="version in detailsTable.rows | filter:filterTerm">
-        <td bst-table-cell translate>
-          <a ui-sref="content-views.details.version.details({versionId: version.id})" >Version {{ version.version }}</a>
-        </td>
-        <td bst-table-cell >
-          <a ng-href="/foreman_tasks/tasks/{{ version.last_event.task.id }}"
-             ng-hide="hideProgress(version)">
+        <tr bst-table-row ng-repeat="version in table.rows">
+          <td bst-table-cell translate>
+            <a ui-sref="content-view.version.details({versionId: version.id})" >Version {{ version.version }}</a>
+          </td>
+          <td bst-table-cell >
+            <a ng-href="/foreman_tasks/tasks/{{ version.last_event.task.id }}"
+               ng-hide="hideProgress(version)">
 
-            <div ng-class="{ active: taskInProgress(version) }"
-              class="progress progress-striped">
-              <span uib-progressbar animate="false" value="version.task.progressbar.value" type="{{version.task.progressbar.type}}"></span>
-            </div>
+              <div ng-class="{ active: taskInProgress(version) }"
+                class="progress progress-striped">
+                <span uib-progressbar animate="false" value="version.task.progressbar.value" type="{{version.task.progressbar.type}}"></span>
+              </div>
 
-            {{ status(version) }}
-          </a>
+              {{ status(version) }}
+            </a>
 
-          <span ng-show="hideProgress(version)">
-            {{ historyText(version) }}
-            ({{ version.last_event.created_at | date:'short' }})
-          </span>
-        </td>
-        <td bst-table-cell>
-          <ul>
-            <li ng-repeat="environment in version.environments" ng-if="environment.permissions.readable">
-              {{ environment.name }}
-            </li>
-          </ul>
-        </td>
-        <td bst-table-cell>
-          <div translate ng-if="version.package_count && version.package_count > 0">
-            {{ version.package_count }} Packages
-          </div>
-          <div  ng-if="version.errata_counts.total && version.errata_counts.total > 0">
-            <span translate>{{ version.errata_counts.total }} Errata</span>
-            (<span errata-counts="version.errata_counts"></span>)
-          </div>
-          <div translate ng-if="version.puppet_module_count && version.puppet_module_count > 0">
-            {{ version.puppet_module_count }} Puppet Modules
-          </div>
-          <div translate ng-if="version.docker_manifest_count && version.docker_manifest_count > 0">
-            {{ version.docker_manifest_count }} Docker Manifests
-          </div>
-          <div translate ng-if="version.docker_tag_count && version.docker_tag_count > 0">
-            {{ version.docker_tag_count }} Docker Tags
-          </div>
-          <div translate ng-if="version.ostree_branch_count && version.ostree_branch_count > 0">
-            {{ version.ostree_branch_count }} OSTree Branches
-          </div>
-          <div translate ng-if="version.file_count && version.file_count > 0">
-            {{ version.file_count }} Files
-          </div>
-        </td>
-        <td bst-table-cell class="preserve-newlines">{{ version.description }}</td>
-        <td class="col-sm-2">
-          <button class="btn btn-default"
-            ng-click="$state.go('content-views.details.promotion', {contentViewId: contentView.id, versionId: version.id})"
-            ng-hide="denied('promote_or_remove_content_views', contentView)"
-            ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask">
-            <i class="fa fa-share-alt"></i>
-            <span translate>
-              Promote
+            <span ng-show="hideProgress(version)">
+              {{ historyText(version) }}
+              ({{ version.last_event.created_at | date:'short' }})
             </span>
-          </button>
-          <button class="btn btn-default"
-            ng-click="$state.go('content-views.details.version-deletion.environments', {contentViewId: contentView.id, versionId: version.id})"
-            ng-hide="denied('promote_or_remove_content_views', contentView)"
-            ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask">
-            <i class="fa fa-trash-o"></i>
-            <span translate>
-              Remove
-            </span>
-          </button>
-        </td>
-      </tr>
+          </td>
+          <td bst-table-cell>
+            <ul class="list-unstyled">
+              <li ng-repeat="environment in version.environments" ng-if="environment.permissions.readable">
+                {{ environment.name }}
+              </li>
+            </ul>
+          </td>
+          <td bst-table-cell>
+            <div translate ng-if="version.package_count && version.package_count > 0">
+              {{ version.package_count }} Packages
+            </div>
+            <div  ng-if="version.errata_counts.total && version.errata_counts.total > 0">
+              <span translate>{{ version.errata_counts.total }} Errata</span>
+              (<span errata-counts="version.errata_counts"></span>)
+            </div>
+            <div translate ng-if="version.puppet_module_count && version.puppet_module_count > 0">
+              {{ version.puppet_module_count }} Puppet Modules
+            </div>
+            <div translate ng-if="version.docker_manifest_count && version.docker_manifest_count > 0">
+              {{ version.docker_manifest_count }} Docker Manifests
+            </div>
+            <div translate ng-if="version.docker_tag_count && version.docker_tag_count > 0">
+              {{ version.docker_tag_count }} Docker Tags
+            </div>
+            <div translate ng-if="version.ostree_branch_count && version.ostree_branch_count > 0">
+              {{ version.ostree_branch_count }} OSTree Branches
+            </div>
+            <div translate ng-if="version.file_count && version.file_count > 0">
+              {{ version.file_count }} Files
+            </div>
+          </td>
+          <td bst-table-cell class="preserve-newlines">{{ version.description }}</td>
+          <td class="col-sm-2">
+            <button class="btn btn-default"
+              ng-click="$state.go('content-view.promotion', {contentViewId: contentView.id, versionId: version.id})"
+              ng-hide="denied('promote_or_remove_content_views', contentView)"
+              ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask">
+              <span translate>
+                Promote
+              </span>
+            </button>
+            <button class="btn btn-default"
+              ng-click="$state.go('content-view.version-deletion.environments', {contentViewId: contentView.id, versionId: version.id})"
+              ng-hide="denied('promote_or_remove_content_views', contentView)"
+              ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask">
+              <span translate>
+                Remove
+              </span>
+            </button>
+          </td>
+        </tr>
       </tbody>
     </table>