From 30ee65e4c35cc4f589ec0029535cea48c8d10c88 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Wed, 2 Nov 2022 11:37:09 +0000
Subject: [PATCH] Bug 31028: (follow-up) Consistently style help-block

This patch updates the opac and staff modals to set the help-block
inside a div instead of a paragraph element allowing for the wysiwyg
edited content to display as prescribed.

We move the scss inside the fieldset definition to ensure we are
specific enough to catch only the intended elements.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Helen Oliver <HOliver@tavi-port.ac.uk>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../intranet-tmpl/prog/css/src/staff-global.scss | 14 ++++++++++++++
 .../en/includes/modals/add_catalog_concern.inc   |  4 +++-
 koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss  | 16 +++++++++-------
 .../en/includes/modals/catalog_concern.inc       |  4 +++-
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index e9840301d4..be6cfdae24 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -885,6 +885,20 @@ fieldset {
             padding: .3em 0;
         }
     }
+
+    div {
+        &.help-block {
+            display: block;
+            margin-top: 5px;
+            margin-bottom: 10px;
+            color: #737373;
+
+            li {
+                list-style-type: unset;
+                list-style-position: inside;
+            }
+        }
+    }
 }
 
 details {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc
index 8f446a1b97..a657e0d211 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc
@@ -25,9 +25,11 @@
                             <label class="required" for="concern_body">Please describe your concern: </label>
                             <textarea class="form-control" id="concern_body" name="concern_body" required="required" rows="15"></textarea>
                             [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%]
+                            <div class="help-block">
                             [%- FOREACH help IN CatalogConcernHelp.content -%]
-                            <p id="helpBlock" class="help-block">[%- help.content | $raw -%]</p>
+                                [%- help.content | $raw -%]
                             [%- END -%]
+                            </div>
                             [%- END -%]
                             <div class="hidden" id="concern_template">
                             [%- IF CatalogConcernTemplate && CatalogConcernTemplate.content && CatalogConcernTemplate.content.count > 0 -%]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index f5a7ec6d89..31d2e3dc3a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -148,13 +148,6 @@ textarea {
     width: 50%;
 }
 
-.help-block {
-    display: block;
-    margin-top: 5px;
-    margin-bottom: 10px;
-    color: #737373;
-}
-
 legend {
     color: #727272;
     font-size: 110%;
@@ -997,6 +990,15 @@ fieldset {
         }
     }
 
+    div {
+        &.help-block {
+            display: block;
+            margin-top: 5px;
+            margin-bottom: 10px;
+            color: #737373;
+        }
+    }
+
     &.action {
         border: 0;
         clear: both;
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc
index cd9bf7b533..5b3d235249 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc
@@ -22,9 +22,11 @@
                         <label for="concern_body">Please describe your concerns: </label>
                         <textarea class="form-control" name="concern_body" id="concern_body" aria-describedby="helpBlock" required="required" rows="15"></textarea>
                         [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%]
+                        <div class="help-block">
                         [%- FOREACH help IN CatalogConcernHelp.content -%]
-                        <p id="helpBlock" class="help-block">[%- help.content | $raw -%]</p>
+                            [%- help.content | $raw -%]
                         [%- END -%]
+                        </div>
                         [%- END -%]
                         <div id="concern_template" style="display: none;">
                         [%- IF CatalogConcernTemplate && CatalogConcernTemplate.content && CatalogConcernTemplate.content.count > 0 -%]
-- 
2.39.5