From d372e4501572b87d88631f05b4425e09515038a9 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 30 Jun 2023 19:48:04 +0000
Subject: [PATCH] Bug 29825: (follow-up) Some style fixes and modal correction

This patch makes a few coding style changes to the new JavaScript and
updates the Bootstrap modal markup to be in line with current standards.

The previous patches lacked a trigger for the preview modal, so I added
that. Since the content of the modal uses spaces for formatting I added
monospace formatting to the modal body.

Signed-off-by: Phil Ringnalda <phil@chetcolibrary.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../modals/edit_authority_preview.inc         | 12 ++-
 .../en/modules/authorities/authorities.tt     | 79 ++++++++++---------
 2 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/edit_authority_preview.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/edit_authority_preview.inc
index c4f9aae3fc..75742999ea 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/edit_authority_preview.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/edit_authority_preview.inc
@@ -1,11 +1,15 @@
-<div id="auEditPreview" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="auEditPreview" aria-hidden="true">
-    <div class="modal-dialog">
+<div class="modal" id="auEditPreview" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog modal-wide" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3 id="avCreateLabel">Preview based on MARC structure</h3>
+                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span
+                        aria-hidden="true">&times;</span></button>
+                <h3 class="modal-title" id="avCreateLabel">Preview based on MARC structure</h3>
             </div>
             <div class="modal-body" id="auloadpreview"></div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+            </div>
         </div> <!-- /.modal-content -->
     </div> <!-- /.modal-dialog -->
 </div> <!-- /#auEditPreview -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index c6d6f14605..41a7ecb333 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -126,56 +126,59 @@
             Sticky.hcSticky('refresh');
         });
 
-        $('#preview').click(function (){
-            var content="<h3>Authority #: [% authid %]</h3><hr>";
-            content+="<div style='color:#004d99;'>";
-            var line=1;
-            var has_input=0;
-            var sf_has_input=0;
-            $("#authoritytabs").find("[id^=tag_]").each(function(){
+        $("#preview").click(function () {
+            var content = "<h3>Authority #: [% authid | html %]</h3><hr>";
+            content += "<div style=\"color:#004d99;\">";
+            var line = 1;
+            var has_input = 0;
+            var sf_has_input = 0;
+            $("#authoritytabs").find("[id^=tag_]").each(function () {
                 //check if tag has content
-                has_input=0;
-                $(this).find(".input_marceditor").each(function(){
-                    if($(this).val()) has_input=1;
+                has_input = 0;
+                $(this).find(".input_marceditor").each(function () {
+                    if ($(this).val()) has_input = 1;
                 });
 
-                if(has_input){
-                    line=1;
+                if (has_input) {
+                    line = 1;
                     //tag
                     var $tag = $(this).find(".tagnum").text();
-                    content += $tag.replace("*",") +"&nbsp;&nbsp;";
+                    content += $tag.replace("*", "") + "&nbsp;&nbsp;";
                     //indicators
-                    $(this).find(".indicator").each(function(){
-                        if( $(this).val() ) content += $(this).val();
+                    $(this).find(".indicator").each(function () {
+                        if ($(this).val()) content += $(this).val();
                         else content += "_";
                     });
                     content += "&nbsp;&nbsp;";
                     //subfields
-                    $(this).find(".subfield_line").each(function(){
+                    $(this).find(".subfield_line").each(function () {
                         //check if subfield has content
-                        sf_has_input=0;
-                        $(this).find(".input_marceditor").each(function(){
-                            if($(this).val()) sf_has_input=1;
-                    });
-                    if(sf_has_input){
-                        if(line>1) content += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-                        //code
-                        $(this).find(".subfieldcode").each(function(){
-                            $(this).find(".flat").each(function(){
-                                if($(this).val()!="00")
-                                    content += "\$"+$(this).val()+"&nbsp;&nbsp;";
-                            });
-                        });
-                        //value
-                        $(this).find(".input_marceditor").each(function(){
-                            content += "<span style='color:#000;'>"+$(this).val()+"</span>";
+                        sf_has_input = 0;
+                        $(this).find(".input_marceditor").each(function () {
+                            if ($(this).val()) sf_has_input = 1;
                         });
-                        content+="</br>";
-                        line+=1;
-                    }
+                        if (sf_has_input) {
+                            if (line > 1) content += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
+                            //code
+                            $(this).find(".subfieldcode").each(function () {
+                                $(this).find(".flat").each(function () {
+                                    if ($(this).val() != "00")
+                                        content += "\$" + $(this).val() + "&nbsp;&nbsp;";
+                                });
+                            });
+                            //value
+                            $(this).find(".input_marceditor").each(function () {
+                                content += "<span style=\"color:#000;\">" + $(this).val() + "</span>";
+                            });
+                            content += "</br>";
+                            line += 1;
+                        }
+                    });
                 }
             });
-         });
+            $("#auloadpreview").html( content );
+            $("#auEditPreview").modal();
+        });
     });
 
     function selectTab( tablink ){
@@ -420,7 +423,9 @@
     });
 </script>
 [% Asset.css("css/addbiblio.css") | $raw %]
-
+<style>
+    #auloadpreview { font-family: monospace; }
+</style>
 </head>
 <body id="auth_authorities" class="auth">
 
-- 
2.39.5