Release v2.2.0

src/web/views/signage/canvas-sizes/add.hbs

@@ -30,6 +30,7 @@
       <div class="btn-group" role="group" aria-label="Canvas size actions">
         {{{saveActionButtons formId="canvas-size-form" saveLabel="Save" showSaveAndClose=false showSaveAndNew=false}}}
         <a class="btn btn-warning" href="/canvas-sizes" data-confirm-unsaved="You have unsaved changes. Leave this page?">Cancel</a>
+        <button type="submit" class="btn btn-outline-danger" disabled>Delete</button>
       </div>
     </div>
   </form>

src/web/views/signage/canvas-sizes/edit.hbs

@@ -30,7 +30,11 @@
       <div class="btn-group" role="group" aria-label="Canvas size actions">
         {{{saveActionButtons formId="canvas-size-form" saveLabel="Save" saveAndCloseLabel="Save and Close" saveAndNewLabel="Save and New" saveAndCloseValue="close" saveAndNewValue="new"}}}
         <a class="btn btn-warning" href="/canvas-sizes" data-confirm-unsaved="You have unsaved changes. Leave this page?">Cancel</a>
-        <button type="submit" class="btn btn-danger" form="delete-canvas-size-form">Delete</button>
+        {{#if inUse}}
+          <button type="submit" class="btn btn-outline-danger" form="delete-canvas-size-form" disabled>Delete</button>
+        {{else}}
+          <button type="submit" class="btn btn-danger" form="delete-canvas-size-form">Delete</button>
+        {{/if}}
       </div>
     </div>
   </form>

src/web/views/signage/canvas-sizes/list.hbs

@@ -5,7 +5,7 @@
   </div>
 </div>
 
-<div class="card card-outline card-primary" data-table-search-container>
+<div class="card card-outline card-primary" data-table-search-container data-table-pagination-card>
   <div class="card-header">
     <h3 class="card-title">Saved sizes</h3>
     <div class="card-tools d-flex flex-nowrap align-items-center gap-2">
@@ -34,7 +34,7 @@
           <tr data-table-search-row>
             <td data-label="Name">{{name}}</td>
             <td data-label="Dimensions">{{width}}x{{height}}</td>
-            <td data-label="Templates">{{templateCount}}</td>
+            <td data-label="Templates"><span class="chip">{{templateCount}} template{{#if (gt templateCount 1)}}s{{else}}{{/if}}{{#if (lt templateCount 1)}}s{{/if}}</span></td>
             <td data-label="Actions">
               {{#if (anyPermission ../currentUser 'canvas-sizes.update' 'canvas-sizes.delete')}}
                 <div class="actions">
@@ -43,7 +43,11 @@
                   {{/if}}
                   {{#if (hasPermission ../currentUser 'canvas-sizes.delete')}}
                     <form class="inline-form" method="post" action="/canvas-sizes/{{id}}/delete" data-confirm-message="Delete this canvas size?">
+                    {{#if (gt templateCount 0)}}
+                      <button class="btn btn-sm btn-outline-danger" type="submit" disabled>Delete</button>
+                    {{else}}
                       <button class="btn btn-sm btn-danger" type="submit">Delete</button>
+                    {{/if}}
                     </form>
                   {{/if}}
                 </div>
@@ -58,6 +62,7 @@
       {{/if}}
     </tbody>
   </table>
-  {{> table-pagination pagination=pagination basePath="/canvas-sizes"}}
+  </div>
+  {{> table-pagination pagination=pagination basePath="/canvas-sizes" alwaysShow=true}}
 </div>