From b6e61ada682e02cf1362a72d5644c0aef0c95392 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>
---
 .../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 57826a39151..14ceea9cff2 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -875,6 +875,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 41028320be5..beb3758b672 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
@@ -24,9 +24,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 1641ce434d0..eba2a1b1602 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -147,13 +147,6 @@ textarea {
     width: 50%;
 }
 
-.help-block {
-    display: block;
-    margin-top: 5px;
-    margin-bottom: 10px;
-    color: #737373;
-}
-
 legend {
     color: #727272;
     font-size: 110%;
@@ -991,6 +984,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 1f8b5202297..85c8d340ca1 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
@@ -21,9 +21,11 @@
                         <label for="concern_body">Please decribe 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.0