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-file-repositories.html

@@ -1,121 +1,89 @@
 <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>File Repositories</h3>
+</header>
 
-  <h3 translate>
-    Repository Selection
-  </h3>
-
-  <nav>
-    <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
-      <li ng-class="{active: isState('content-views.details.repositories.file.list')}">
-        <a ui-sref="content-views.details.repositories.file.list">
-          <span translate>
-            List/Remove
-          </span>
-        </a>
-      </li>
-
-      <li ng-class="{active: isState('content-views.details.repositories.file.available')}" ng-show="!contentView.permissions.editable">
-        <a ui-sref="content-views.details.repositories.file.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 data-block="navigation">
+  <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
+    <li ng-class="{active: isState('content-view.repositories.file.list')}">
+      <a ui-sref="content-view.repositories.file.list">
+        <span translate>
+          List/Remove
         </span>
+      </a>
+    </li>
 
-        <input type="text"
-               class="form-control filter-input"
-               placeholder="{{ 'Filter' | translate }}"
-               ng-model="repositorySearch"/>
+    <li ng-class="{active: isState('content-view.repositories.file.available')}" ng-show="!contentView.permissions.editable">
+      <a ui-sref="content-view.repositories.file.available" translate>
+        Add
+      </a>
+    </li>
+  </ul>
+</nav>
 
-      </div>
-    </div>
-
-    <div class="col-sm-4">
-      <button class="btn btn-primary fr"
-              ng-disabled="repositoriesTable.numSelected === 0"
-              ng-show="isState('content-views.details.repositories.file.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.file.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.file.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.file.available') && permitted('edit_content_views', contentView)"
+            ng-click="addRepositories(contentView)">
+      <span translate>Add Repositories</span>
+    </button>
   </div>
 
-  <div bst-table="repositoriesTable" class="nutupane">
-
-    <div ng-show="repositoriesTable.rows.length === 0 && !repositoriesTable.working">
-      <p bst-alert="info" ng-show="isState('content-views.details.repositories.file.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.file.available')">
-        <span translate>There are currently no repositories to add to this Content View,</span>
-        <a ui-sref="products.index" translate>add some repositories.</a>
-      </p>
-    </div>
-
-    <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>
-        </tr>
-      </thead>
+  <span data-block="no-rows-message">
+    <span ng-show="isState('content-view.repositories.file.list')" translate>
+      There are currently no File 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.file.available')">
+      <span translate>There are currently no File Repositories to add to this Content View,</span>
+      <a ui-sref="products" translate>add some repositories.</a>
+    </span>
+  </span>
 
-      <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="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>
-        </tr>
-      </tbody>
-    </table>
-  </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>
+      </tr>
+    </thead>
 
+    <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>
+      </tr>
+    </tbody>
+  </table>
 </div>

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

@@ -1,48 +1,41 @@
 <span page-title ng-model="contentView">{{ 'Details for Content View:' | translate }} {{ contentView.name }}</span>
+<header data-block="sub-header">
+  <h3 translate>Details for {{ contentView.name }}</h3>
+</header>
 
-<div class="details">
-
-  <div class="detail">
-    <span class="info-label" translate>Name</span>
-    <span class="info-value"
-          bst-edit-text="contentView.name"
+<div class="row">
+  <div class="col-sm-6">
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Name</dt>
+      <dd bst-edit-text="contentView.name"
           on-save="save(contentView)"
           readonly="denied('edit_content_views', contentView)">
-    </span>
-  </div>
+      </dd>
 
-  <div class="detail">
-    <span class="info-label" translate>Label</span>
-    <span class="info-value">{{ contentView.label }}</span>
-  </div>
+      <dt translate>Label</dt>
+      <dd>{{ contentView.label }}</dd>
 
-  <div class="detail">
-    <span class="info-label" translate>Description</span>
-    <span class="info-value"
-          bst-edit-textarea="contentView.description"
+      <dt translate>Description</dt>
+      <dd bst-edit-textarea="contentView.description"
           on-save="save(contentView)"
           readonly="denied('edit_content_views', contentView)">
-    </span>
-  </div>
+      </dd>
 
-  <div class="detail">
-    <span class="info-label" translate>Composite?</span>
-    <span class="info-value" ng-show="contentView.composite" translate>Yes</span>
-    <span class="info-value" ng-hide="contentView.composite" translate>No</span>
-  </div>
+      <dt translate>Composite?</dt>
+      <dd ng-show="contentView.composite" translate>Yes</dd>
+      <dd ng-hide="contentView.composite" translate>No</dd>
 
-  <div class="detail">
-    <span class="info-label" translate>
-      Force Puppet Environment
-    </span>
-    <span class="info-value"
-          bst-edit-checkbox="contentView.force_puppet_environment"
-          formatter="booleanToYesNo"
-          on-save="save(contentView)"
-          readonly="denied('edit_content_views', contentView)">
-    </span>
+      <dt translate>Force Puppet Environment</dt>
+      <dd>
+        <div bst-edit-checkbox="contentView.force_puppet_environment"
+             formatter="booleanToYesNo"
+             on-save="save(contentView)"
+             readonly="denied('edit_content_views', contentView)">
+        </div>
+        <p class="help-text">
+          With this option selected, a puppet environment will be created during publish and promote even if no puppet modules have been added to the Content View
+        </p>
+      </dd>
+    </dl>
   </div>
-  <h6 translate>
-    With this option selected, a puppet environment will be created during publish and promote even if no puppet modules have been added to the Content View
-  </h6>
 </div>

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

@@ -1,121 +1,89 @@
 <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>OSTree Repositories</h3>
+</header>
 
-  <h3 translate>
-    Repository Selection
-  </h3>
-
-  <nav>
-    <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
-      <li ng-class="{active: isState('content-views.details.repositories.ostree.list')}">
-        <a ui-sref="content-views.details.repositories.ostree.list">
-          <span translate>
-            List/Remove
-          </span>
-        </a>
-      </li>
-
-      <li ng-class="{active: isState('content-views.details.repositories.ostree.available')}" ng-show="!contentView.permissions.editable">
-        <a ui-sref="content-views.details.repositories.ostree.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 data-block="navigation">
+  <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
+    <li ng-class="{active: isState('content-view.repositories.ostree.list')}">
+      <a ui-sref="content-view.repositories.ostree.list">
+        <span translate>
+          List/Remove
         </span>
+      </a>
+    </li>
 
-        <input type="text"
-               class="form-control filter-input"
-               placeholder="{{ 'Filter' | translate }}"
-               ng-model="repositorySearch"/>
+    <li ng-class="{active: isState('content-view.repositories.ostree.available')}" ng-show="!contentView.permissions.editable">
+      <a ui-sref="content-view.repositories.ostree.available" translate>
+        Add
+      </a>
+    </li>
+  </ul>
+</nav>
 
-      </div>
-    </div>
-
-    <div class="col-sm-4">
-      <button class="btn btn-primary fr"
-              ng-disabled="repositoriesTable.numSelected === 0"
-              ng-show="isState('content-views.details.repositories.ostree.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.ostree.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.ostree.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.ostree.available') && permitted('edit_content_views', contentView)"
+            ng-click="addRepositories(contentView)">
+      <span translate>Add Repositories</span>
+    </button>
   </div>
 
-  <div bst-table="repositoriesTable" class="nutupane">
-
-    <div ng-show="repositoriesTable.rows.length === 0 && !repositoriesTable.working">
-      <p bst-alert="info" ng-show="isState('content-views.details.repositories.ostree.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.ostree.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>
-
-    <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>
-        </tr>
-      </thead>
+  <span data-block="no-rows-message">
+    <span ng-show="isState('content-view.repositories.ostree.list')" translate>
+      There are currently no OSTree 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.ostree.available')">
+      <span translate>There are currently no OSTree Repositories to add to this Content View,</span>
+      <a ui-sref="products" translate>add some repositories.</a>
+    </span>
+  </span>
 
-      <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 }}
-            </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>
-        </tr>
-      </tbody>
-    </table>
-  </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>
+      </tr>
+    </thead>
 
+    <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>
+      </tr>
+    </tbody>
+  </table>
 </div>