From 5eec40dc445c55290593fef517c682d489782879 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 11 May 2022 20:57:06 +0200 Subject: [PATCH] Still converting to bootstrap 5. Releases update + admin views --- approot/admin-scannercontroller.xml | 65 ++++++++++++----------- approot/admin-users.xml | 12 ++--- approot/messages.xml | 2 +- approot/messages_fr.xml | 2 +- approot/releases.xml | 14 ++--- approot/tracks.xml | 44 +++++++-------- docroot/css/lms.css | 31 +++++++++++ src/lms/ui/admin/ScannerController.cpp | 18 ++----- src/lms/ui/explore/ReleaseListHelpers.cpp | 5 +- 9 files changed, 108 insertions(+), 85 deletions(-) diff --git a/approot/admin-scannercontroller.xml b/approot/admin-scannercontroller.xml index 8ca535ab..85b7932b 100644 --- a/approot/admin-scannercontroller.xml +++ b/approot/admin-scannercontroller.xml @@ -5,38 +5,41 @@
${tr:Lms.Admin.ScannerController.scanner}
-
- -
- +
+
+
+ + +
+
+ + +
+
+ +
+ + ${report-btn class="btn btn-outline-info"} +
+
+
+
+ ${scan-btn class="btn btn-primary"} + +
    +
  • ${full-scan-btn class="dropdown-item"}
    • +
+
+
-
-
- -
- -
-
-
- -
- -
-
-
-
- ${btn-report class="btn btn-sm"} -
-
-
- ${btn-action} -
+
diff --git a/approot/admin-users.xml b/approot/admin-users.xml index 603673df..29c4551c 100644 --- a/approot/admin-users.xml +++ b/approot/admin-users.xml @@ -2,20 +2,20 @@ -

${tr:Lms.Admin.Users.users}

- ${users} +

${tr:Lms.Admin.Users.users}

+ ${users class="d-grid gap-1"} ${} ${add-btn class="btn btn-primary"} ${} -
-
+
+
${name}${}${tag}${}
-
- ${}${edit-btn class="btn btn-sm btn-primary me-1"} ${del-btn class="btn btn-sm btn-danger"}${} +
+ ${}${edit-btn class="btn btn-sm btn-secondary me-1"}${del-btn class="btn btn-sm btn-danger"}${}
diff --git a/approot/messages.xml b/approot/messages.xml index f1830357..5659e0e4 100644 --- a/approot/messages.xml +++ b/approot/messages.xml @@ -99,7 +99,7 @@ User already exists! New user New user created! -Edit user {1} +Edit user '{1}' User updated! diff --git a/approot/messages_fr.xml b/approot/messages_fr.xml index b9089708..b84125ff 100644 --- a/approot/messages_fr.xml +++ b/approot/messages_fr.xml @@ -99,7 +99,7 @@ L'utilisateur existe déjà ! Nouvel utilisateur Nouvel utilisateur créé ! -Utilisateur {1} +Utilisateur '{1}' L'utilisateur a été mis à jour ! diff --git a/approot/releases.xml b/approot/releases.xml index 427eeb19..ccec58eb 100644 --- a/approot/releases.xml +++ b/approot/releases.xml @@ -39,13 +39,13 @@ -
- ${cover class="shadow-sm"} - ${release-name class="text-truncate text-nowrap text-decoration-none link-success"} - ${}${artist-name class=" text-truncate text-nowrap text-decoration-none link-secondary"}${} - ${}
${tr:Lms.Explore.various-artists}
${} - ${}
${year}
${} -
+
+ ${cover class="shadow-sm"} +
+ ${release-name class="d-block text-truncate text-nowrap text-decoration-none link-success"} + ${}${artist-name class="d-block text-truncate text-nowrap text-decoration-none link-secondary"}${} + ${}
${tr:Lms.Explore.various-artists}
${} + ${}
${year}
${} diff --git a/approot/tracks.xml b/approot/tracks.xml index 9cc88ac9..e7b162ab 100644 --- a/approot/tracks.xml +++ b/approot/tracks.xml @@ -40,30 +40,26 @@ -
-
-
- ${cover} -
-
-
-
${name}
- ${}${release class="text-decoration-none link-sucess"}${} -
-
- ${duration} -
-
- ${play-btn class="btn btn-sm btn-outline-secondary border-0"} -
- ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"} -
    -
  • ${play-last class="btn dropdown-item"}
    • -
  • ${star class="btn dropdown-item"}
    • -
  • ${download class="btn dropdown-item"}
    • -
-
-
+
+
+ ${cover} +
+
+
${name}
+ ${}${release class="text-decoration-none link-success"}${} +
+
+ ${duration} +
+
+ ${play-btn class="btn btn-sm btn-outline-secondary border-0"} +
+ ${more-btn data-bs-toggle="dropdown" aria-expanded="false" class="btn btn-sm btn-outline-secondary border-0"} +
    +
  • ${play-last class="btn dropdown-item"}
    • +
  • ${star class="btn dropdown-item"}
    • +
  • ${download class="btn dropdown-item"}
    • +
diff --git a/docroot/css/lms.css b/docroot/css/lms.css index 5a8de238..bcbe8394 100644 --- a/docroot/css/lms.css +++ b/docroot/css/lms.css @@ -8,6 +8,11 @@ body { padding-bottom: 78px; } +.Lms-cover-small { + width: 72px; + min-width: 72px; +} + .Lms-notification-container { position: fixed; bottom: 78px; @@ -22,3 +27,29 @@ body { z-index: 999; } +.Lms-cover { + max-height: 100%; + max-width: 100%; + width: auto; + height: auto; + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + margin: auto; +} + +.Lms-cover-container { + position: relative; +} + +.Lms-responsive-square { + width: 100%; +} + +.Lms-responsive-square:after { + content: ""; + display: block; + padding-bottom: 100%; +} diff --git a/src/lms/ui/admin/ScannerController.cpp b/src/lms/ui/admin/ScannerController.cpp index e42e2e9b..90bcb580 100644 --- a/src/lms/ui/admin/ScannerController.cpp +++ b/src/lms/ui/admin/ScannerController.cpp @@ -23,10 +23,8 @@ #include #include -#include #include #include -#include #include "services/database/Session.hpp" #include "services/database/Track.hpp" @@ -156,25 +154,19 @@ ScannerController::refreshContents() { using namespace Scanner; - Wt::WPushButton* reportBtn {bindNew("btn-report", Wt::WString::tr("Lms.Admin.ScannerController.get-report"))}; + Wt::WPushButton* reportBtn {bindNew("report-btn", Wt::WString::tr("Lms.Admin.ScannerController.get-report"))}; - Wt::WSplitButton* actionBtn {bindNew("btn-action")}; - actionBtn->actionButton()->addStyleClass("btn-primary"); - actionBtn->actionButton()->setText(Wt::WString::tr("Lms.Admin.ScannerController.scan-now")); - actionBtn->actionButton()->clicked().connect([] + Wt::WPushButton* scanBtn {bindNew("scan-btn", Wt::WString::tr("Lms.Admin.ScannerController.scan-now"))}; + scanBtn->clicked().connect([] { Service::get()->requestImmediateScan(false); }); - auto popup = std::make_unique(); - popup->addItem(Wt::WString::tr("Lms.Admin.ScannerController.force-scan-now")); - popup->itemSelected().connect([] + Wt::WPushButton* fullScanBtn {bindNew("full-scan-btn", Wt::WString::tr("Lms.Admin.ScannerController.force-scan-now"))}; + fullScanBtn->clicked().connect([] { Service::get()->requestImmediateScan(true); }); - actionBtn->dropDownButton()->setMenu(std::move(popup)); - actionBtn->dropDownButton()->addStyleClass("btn-primary"); - const IScannerService::Status status {Service::get()->getStatus()}; if (status.lastCompleteScanStats) diff --git a/src/lms/ui/explore/ReleaseListHelpers.cpp b/src/lms/ui/explore/ReleaseListHelpers.cpp index b648c785..296c4b42 100644 --- a/src/lms/ui/explore/ReleaseListHelpers.cpp +++ b/src/lms/ui/explore/ReleaseListHelpers.cpp @@ -45,7 +45,7 @@ namespace UserInterface::ReleaseListHelpers Wt::WAnchor* anchor = entry->bindWidget("cover", LmsApplication::createReleaseAnchor(release, false)); auto cover = std::make_unique(); cover->setImageLink(LmsApp->getCoverResource()->getReleaseUrl(release->getId(), CoverResource::Size::Large)); - cover->setStyleClass("img-fluid rounded"); + cover->setStyleClass("Lms-cover rounded"); cover->setAttributeValue("onload", LmsApp->javaScriptClass() + ".onLoadCover(this)"); anchor->setImage(std::move(cover)); @@ -83,7 +83,8 @@ namespace UserInterface::ReleaseListHelpers } } - entry->setStyleClass("col-6 col-md-4 col-lg-3 col-xl-2"); + // hack + entry->setStyleClass("p-2 Lms-bg-dark-hover rounded col-6 col-md-4 col-lg-3 col-xl-2"); return entry; }