From 8833506e04ba0a6e4224586fd30207541f9bbd41 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Sat, 16 Dec 2023 03:07:16 +0100
Subject: [PATCH] Cleanup template  styles

---
 resources/views/layouts/maintenance.html      |  2 +-
 resources/views/layouts/parts/footer.twig     |  2 +-
 resources/views/macros/form.twig              | 22 ++++++++++++++-----
 .../views/pages/messages/conversation.twig    |  7 ++++--
 resources/views/pages/user-shifts.html        | 13 ++++++-----
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/resources/views/layouts/maintenance.html b/resources/views/layouts/maintenance.html
index 023b0e67..305dbb03 100644
--- a/resources/views/layouts/maintenance.html
+++ b/resources/views/layouts/maintenance.html
@@ -47,7 +47,7 @@
         <p>This may be due to</p>
 
         <ul>
-            <li>Archangels closing the gates of heaven.</li>
+            <li>The gates of heaven were closed.</li>
             <li>Someone tried to do a simple maintenance task which did not go as planned.</li>
             <li>DHCP decided to give me another ip address.</li>
             <li>Somebody's stolen the power chord and now the battery is empty.</li>
diff --git a/resources/views/layouts/parts/footer.twig b/resources/views/layouts/parts/footer.twig
index a266af5f..a5e6580b 100644
--- a/resources/views/layouts/parts/footer.twig
+++ b/resources/views/layouts/parts/footer.twig
@@ -2,7 +2,7 @@
 
 <div class="col-md-12">
     <hr/>
-    <div class="text-center footer" style="margin-bottom: 10px;">
+    <div class="text-center footer mb-3">
         {% block eventinfo %}
             {% if config('name') %}
                 {% if config('event_start') and config('event_end') %}
diff --git a/resources/views/macros/form.twig b/resources/views/macros/form.twig
index c55b1c57..eaa0c83a 100644
--- a/resources/views/macros/form.twig
+++ b/resources/views/macros/form.twig
@@ -133,11 +133,19 @@ Also adds buttons to increment / decrement the value.
 @param {bool} [opt.required] - Whether to add the "required" attribute. Defaults to false.
 @param {int} [opt.rows=0] - Optional value of the "rows" attriute. Defaults to 0.
 @param {string} [opt.value=""] - Optional value to set. Defaults to empty string.
+@param {string} [opt.label_hidden=true] - Optionaly hide the label. Defaults to false.
+@param {string} [opt.no_div=false] - Optionaly don't add a div. Defaults to false.
 #}
 {% macro textarea(name, label, opt) %}
-    <div class="mb-3">
-        {% if label  -%}
-            <label class="form-label" for="{{ name }}">{{ label }}</label>
+    {% if not opt.no_div|default(false) -%}
+        <div class="mb-3">
+    {% endif -%}
+        {% if label -%}
+            <label class="form-label
+                    {%- if opt.label_hidden|default(false) %} visually-hidden{% endif -%}
+                " for="{{ name }}">
+                {{ label }}
+            </label>
             {% if opt.required_icon|default(false) %}
                 {{ _self.entry_required() }}
             {% endif %}
@@ -146,10 +154,12 @@ Also adds buttons to increment / decrement the value.
             {% endif %}
         {%- endif %}
         <textarea class="form-control" id="{{ name }}" name="{{ name }}"
-            {%- if opt.required|default(false) %} required{%- endif -%}
+                    {%- if opt.required|default(false) %} required{%- endif -%}
             {%- if opt.rows|default(0) %} rows="{{ opt.rows }}"{%- endif -%}
-        >{{ opt.value|default('') }}</textarea>
-    </div>
+                >{{ opt.value|default('') }}</textarea>
+    {% if not opt.no_div|default(false) -%}
+        </div>
+    {%- endif %}
 {%- endmacro %}
 
 {#
diff --git a/resources/views/pages/messages/conversation.twig b/resources/views/pages/messages/conversation.twig
index 23c9f736..e7e5a90f 100644
--- a/resources/views/pages/messages/conversation.twig
+++ b/resources/views/pages/messages/conversation.twig
@@ -48,8 +48,11 @@
                     {{ csrf() }}
 
                     <div class="input-group">
-                        <label for="message" class="visually-hidden">{{ __('message.message') }}</label>
-                        <textarea class="form-control" id="message" name="text" required="" rows="3"></textarea>
+                        {{ f.textarea(
+                            'text',
+                            __('message.message'),
+                            {'required': true, 'rows': 3, 'label_hidden': true, 'no_div': true}
+                        ) }}
                         {{ f.submit(m.icon('send-fill')) }}
                     </div>
                 </form>
diff --git a/resources/views/pages/user-shifts.html b/resources/views/pages/user-shifts.html
index 00cb53f3..39f31ea4 100644
--- a/resources/views/pages/user-shifts.html
+++ b/resources/views/pages/user-shifts.html
@@ -34,7 +34,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group d-print-none" style="margin-top: .5em">
+            <div class="form-group d-print-none mt-2">
                 <div class="btn-group mb-1" role="group">
                     <button type="button" class="btn btn-secondary set-date" data-days="-1">%set_yesterday%</button>
                     <button type="button" class="btn btn-secondary set-date" data-days="0">%set_today%</button>
@@ -55,7 +55,7 @@
             </div>
             <div class="row d-print-none">
                 <div class="col-md-12">
-                    <button class="btn btn-primary" type="submit" style="width:100%; margin: 1em 0">%filter%</button>
+                    <button class="btn btn-primary mt-3 mb-3 w-100" type="submit">%filter%</button>
                 </div>
             </div>
         </div>
@@ -73,12 +73,13 @@
                     <div class="col col-12 col-sm-5 col-md-12 col-lg-7 col-xl-5 col-xxl-4">%type_select%</div>
                     <div class="col col-12 col-sm-3 col-md-12 col-lg-5 col-xl-3 col-xxl-4">%filled_select%</div>
                 </div>
+                <div class="row">
+                    <div class="col-md-12 d-print-none d-md-none">
+                        <button class="btn btn-primary mb-3 w-100" type="submit">%filter%</button>
+                    </div>
+                </div>
             </div>
         </div>
-
-        <div class="col-md-12 d-print-none d-md-none">
-            <button class="btn btn-primary" type="submit" style="width:100%; margin: 1em 0">%filter%</button>
-        </div>
     </div>
 </form>