From 6d5a2fae6acbd9aa10e4e9987c85575d9ec8277d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Thu, 9 Mar 2023 14:24:49 +0800
Subject: [PATCH] Applied the accounting-toolbar class to the base account
 list, account list, and currency list.

---
 .../templates/accounting/account/list.html    | 24 +++++--------------
 .../accounting/base-account/list.html         |  8 +++----
 .../templates/accounting/currency/list.html   | 24 +++++--------------
 3 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/src/accounting/templates/accounting/account/list.html b/src/accounting/templates/accounting/account/list.html
index fa48f06..1375652 100644
--- a/src/accounting/templates/accounting/account/list.html
+++ b/src/accounting/templates/accounting/account/list.html
@@ -25,31 +25,19 @@ First written: 2023/1/30
 
 {% block content %}
 
-<div class="btn-group mb-2 d-none d-md-inline-flex">
+<div class="mb-2 accounting-toolbar">
   {% if accounting_can_edit() %}
-    <a class="btn btn-primary text-nowrap" href="{{ url_for("accounting.account.create")|accounting_append_next }}">
+    <a class="btn btn-primary text-nowrap d-none d-md-block" href="{{ url_for("accounting.account.create")|accounting_append_next }}">
       <i class="fa-solid fa-plus"></i>
       {{ A_("New") }}
     </a>
   {% endif %}
-  <form class="btn btn-primary d-flex input-group accounting-search-desktop-form" action="{{ url_for("accounting.account.list") }}" method="get" role="search" aria-label="{{ A_("Search for Desktop") }}">
-    <input id="accounting-search-desktop" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
-    <label for="accounting-search-desktop" class="accounting-search-label">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.account.list") }}" method="get" role="search" aria-labelledby="accounting-search-label">
+    <input id="accounting-search" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
+    <label id="accounting-search-label" for="accounting-search" class="input-group-text accounting-search-label">
       <button type="submit">
         <i class="fa-solid fa-magnifying-glass"></i>
-        {{ A_("Search") }}
-      </button>
-    </label>
-  </form>
-</div>
-
-<div class="btn-group mb-2 d-md-none">
-  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.account.list") }}" method="get" role="search" aria-label="{{ A_("Search for Mobile") }}">
-    <input id="accounting-search-mobile" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
-    <label for="accounting-search-mobile" class="accounting-search-label">
-      <button type="submit">
-        <i class="fa-solid fa-magnifying-glass"></i>
-        {{ A_("Search") }}
+        <span class="d-none d-md-inline">{{ A_("Search") }}</span>
       </button>
     </label>
   </form>
diff --git a/src/accounting/templates/accounting/base-account/list.html b/src/accounting/templates/accounting/base-account/list.html
index 8841f1d..29988d5 100644
--- a/src/accounting/templates/accounting/base-account/list.html
+++ b/src/accounting/templates/accounting/base-account/list.html
@@ -25,13 +25,13 @@ First written: 2023/1/26
 
 {% block content %}
 
-<div class="btn-group mb-2">
-  <form class="btn btn-primary d-flex input-group accounting-search-desktop-form" action="{{ url_for("accounting.base-account.list") }}" method="get" role="search" aria-label="{{ A_("Search") }}">
+<div class="mb-2 accounting-toolbar">
+  <form class="btn btn-primary d-flex input-group accounting-search-form" action="{{ url_for("accounting.base-account.list") }}" method="get" role="search" aria-labelledby="accounting-search-label">
     <input id="accounting-search" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
-    <label for="accounting-search" class="accounting-search-label">
+    <label id="accounting-search-label" for="accounting-search" class="input-group-text accounting-search-label">
       <button type="submit">
         <i class="fa-solid fa-magnifying-glass"></i>
-        {{ A_("Search") }}
+        <span class="d-none d-md-inline">{{ A_("Search") }}</span>
       </button>
     </label>
   </form>
diff --git a/src/accounting/templates/accounting/currency/list.html b/src/accounting/templates/accounting/currency/list.html
index 007e1dd..7196924 100644
--- a/src/accounting/templates/accounting/currency/list.html
+++ b/src/accounting/templates/accounting/currency/list.html
@@ -25,31 +25,19 @@ First written: 2023/2/6
 
 {% block content %}
 
-<div class="btn-group mb-2 d-none d-md-inline-flex">
+<div class="mb-2 accounting-toolbar">
   {% if accounting_can_edit() %}
-    <a class="btn btn-primary text-nowrap" href="{{ url_for("accounting.currency.create")|accounting_append_next }}">
+    <a class="btn btn-primary text-nowrap d-none d-md-block" href="{{ url_for("accounting.currency.create")|accounting_append_next }}">
       <i class="fa-solid fa-plus"></i>
       {{ A_("New") }}
     </a>
   {% endif %}
-  <form class="btn btn-primary d-flex input-group accounting-search-desktop-form" action="{{ url_for("accounting.currency.list") }}" method="get" role="search" aria-label="{{ A_("Search for Desktop") }}">
-    <input id="accounting-search-desktop" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
-    <label for="accounting-search-desktop" class="accounting-search-label">
+  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.currency.list") }}" method="get" role="search" aria-labelledby="accounting-search-label">
+    <input id="accounting-search" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
+    <label id="accounting-search-label" for="accounting-search" class="input-group-text accounting-search-label">
       <button type="submit">
         <i class="fa-solid fa-magnifying-glass"></i>
-        {{ A_("Search") }}
-      </button>
-    </label>
-  </form>
-</div>
-
-<div class="btn-group mb-2 d-md-none">
-  <form class="btn btn-primary d-flex input-group" action="{{ url_for("accounting.currency.list") }}" method="get" role="search" aria-label="{{ A_("Search for Mobile") }}">
-    <input id="accounting-search-mobile" class="form-control form-control-sm accounting-search-input" type="search" name="q" value="{{ request.args.q }}" placeholder=" " required="required">
-    <label for="accounting-search-mobile" class="accounting-search-label">
-      <button type="submit">
-        <i class="fa-solid fa-magnifying-glass"></i>
-        {{ A_("Search") }}
+        <span class="d-none d-md-inline">{{ A_("Search") }}</span>
       </button>
     </label>
   </form>