From 03e7bcfb7cc24624518b50d33b41e1452250b9db Mon Sep 17 00:00:00 2001
From: emeric <emeric.poupon@laposte.net>
Date: Sun, 13 Feb 2022 20:23:30 +0100
Subject: [PATCH] Restored users view

---
 approot/admin-scannercontroller.xml | 61 ++++++++++++++---------------
 approot/admin-users.xml             | 10 ++---
 docroot/css/lms.css                 | 25 ------------
 3 files changed, 35 insertions(+), 61 deletions(-)

diff --git a/approot/admin-scannercontroller.xml b/approot/admin-scannercontroller.xml
index 484fc64a..8ca535ab 100644
--- a/approot/admin-scannercontroller.xml
+++ b/approot/admin-scannercontroller.xml
@@ -2,42 +2,41 @@
 <messages xmlns:if="Wt.WTemplate.conditions">
 
 <message id="Lms.Admin.ScannerController.template">
-	<div class="panel panel-info">
-		<div class="panel-heading">${tr:Lms.Admin.ScannerController.scanner}</div>
-		<div class="panel-body">
-			<div class="form-horizontal">
-				<div class="form-group">
-					<label class="col-lg-3 control-label">
-						${tr:Lms.Admin.ScannerController.status}
-					</label>
-					<div class="col-lg-9">
-						<div class="well well-sm">
-							${status}
-							<div>${step-status}</div>
-						</div>
-					</div>
+	<div class="card">
+		<h5 class="card-header">${tr:Lms.Admin.ScannerController.scanner}</h5>
+		<div class="card-body">
+			<div class="mb-3 row">
+				<label class="col-sm-2 col-form-label" for="status">
+					${tr:Lms.Admin.ScannerController.status}
+				</label>
+				<div class="col-sm-10">
+					<input type="text" readonly="readonly" class="form-control" id="status" value="${status}"/>
 				</div>
-				<div class="form-group">
-					<label class="col-lg-3 control-label">
-						${tr:Lms.Admin.ScannerController.last-scan}
-					</label>
-					<div class="col-lg-9">
-						<div class="well well-sm">
-							${last-scan}
-						</div>
-					</div>
+			</div>
+			<div class="mb-3 row">
+				<label class="col-sm-2 col-form-label" for="step-status">
+					${tr:Lms.Admin.ScannerController.step-status}
+				</label>
+				<div class="col-sm-10">
+					<input type="text" readonly="readonly" class="form-control" id="step-status" value="${step-status}"/>
 				</div>
-				<div class="form-group">
-					<div class="col-lg-offset-3 col-lg-9">
-							${btn-report class="btn btn-xs"}
-					</div>
+			</div>
+			<div class="mb-3 row">
+				<label class="col-sm-2 col-form-label" for="last-scan">
+					${tr:Lms.Admin.ScannerController.last-scan}
+				</label>
+				<div class="col-sm-10">
+					<input type="text" readonly="readonly" class="form-control" id="last-scan" value="${last-scan}"/>
 				</div>
-				<div class="form-group">
-					<div class="col-lg-offset-3 col-lg-9">
-						${btn-action}
-					</div>
+			</div>
+			<div class="mb-3 row">
+				<div class="offset-sm-2">
+					${btn-report class="btn btn-sm"}
 				</div>
 			</div>
+			<div class="col-12">
+				${btn-action}
+			</div>
 		</div>
 	</div>
 </message>
diff --git a/approot/admin-users.xml b/approot/admin-users.xml
index 0e8da5ce..c8d42d6f 100644
--- a/approot/admin-users.xml
+++ b/approot/admin-users.xml
@@ -12,12 +12,12 @@
 </message>
 
 <message id="Lms.Admin.Users.template.entry">
-	<div class="row Lms-admin-users-entry Lms-vertical-align">
-		<div class="col-md-5 col-xs-8 Lms-vertical-align">
-			${name}${<if-tag>}<span class="label label-info Lms-admin-users-entry-role">${tag}</span>${</if-tag>}
+	<div class="row align-items-center mb-3">
+		<div class="col-auto me-auto">
+			${name}${<if-tag>} <span class="badge bg-info">${tag}</span>${</if-tag>}
 		</div>
-		<div class="col-md-3 col-xs-4 Lms-horizontal-center">
-			${<if-edit>}${edit-btn class="btn-warning btn-sm Lms-admin-users-entry-btn"}${del-btn class="btn-danger btn-sm Lms-admin-users-entry-btn"}${</if-edit>}
+		<div class="col-auto">
+			${<if-edit>}${edit-btn class="btn-warning btn-sm"} ${del-btn class="btn-danger btn-sm"}${</if-edit>}
 		</div>
 	</div>
 </message>
diff --git a/docroot/css/lms.css b/docroot/css/lms.css
index cf818f88..e0db40dc 100644
--- a/docroot/css/lms.css
+++ b/docroot/css/lms.css
@@ -8,31 +8,11 @@ body {
 	padding-bottom: 78px;
 }
 
-.Lms-vertical-align {
-	display: flex;
-	align-items: center;
-}
-
-.Lms-admin-users-entry {
-	min-height: 48px;
-	padding-top: 8px;
-	padding-bottom: 8px;
-	margin: 0;
-}
-
 .Lms-admin-users-add-btn {
 	margin-top: 8px;
 	margin-bottom: 8px;
 }
 
-.Lms-admin-users-entry-role {
-	margin-left: 8px;
-}
-
-.Lms-admin-users-entry-btn {
-	margin-right: 8px;
-}
-
 .Lms-artistname {
 	color: var(--body-color);
 }
@@ -263,11 +243,6 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
 	margin-bottom: 20px;
 }
 
-.Lms-horizontal-center {
-	display: flex;
-	justify-content: center;
-}
-
 .Lms-loading-indicator {
 	margin-top: 8px;
 	margin-bottom: 8px;