Release v2.2.0

src/web/views/signage/screens/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">Existing screens</h3>
     <div class="card-tools d-flex flex-nowrap align-items-center gap-2">
@@ -25,7 +25,7 @@
         <th data-table-sort-key="name">Name</th>
         <th data-table-sort-key="url">Player URL</th>
         <th data-table-sort-key="playlist">Playlist</th>
-        <th>Connected clients</th>
+        <th data-table-sort-key="player_connection_count">Connected</th>
         <th>Actions</th>
       </tr>
     </thead>
@@ -34,11 +34,17 @@
         {{#each screens}}
           <tr data-table-search-row>
             <td data-label="Name">{{name}}</td>
-            <td data-label="Player URL"><a href="{{playerUrl slug}}" target="_blank">{{playerUrl slug}}</a></td>
+            <td data-label="Player URL">
+              {{#if player_url}}
+                <a href="{{player_url}}" target="_blank">{{player_url}}</a>
+              {{else}}
+                <span class="empty">Not available</span>
+              {{/if}}
+            </td>
             <td data-label="Playlist">{{playlist_name}}</td>
             <td data-label="Connected clients">
-              {{#if player_connection_count}}
-                <div class="connection-count">{{player_connection_count}} connected</div>
+              {{#if (gt player_connection_count 0)}}
+                <div class="connection-count"><span class="chip">{{player_connection_count}} clients{{#if (gt player_connection_count 1)}}s{{else}}{{/if}}{{#if (lt player_connection_count 1)}}s{{/if}}</span></div>
               {{else}}
                 <span class="empty">No clients connected.</span>
               {{/if}}
@@ -51,7 +57,11 @@
                   {{/if}}
                   {{#if (hasPermission ../currentUser 'screens.delete')}}
                     <form class="inline-form" method="post" action="/screens/{{id}}/delete" data-confirm-message="Delete this screen?">
+                    {{#if (gt player_connection_count 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>
@@ -67,6 +77,6 @@
     </tbody>
   </table>
   </div>
-  {{> table-pagination pagination=pagination basePath="/screens"}}
+  {{> table-pagination pagination=pagination basePath="/screens" alwaysShow=true}}
 </div>