Attachment 154962 Details for Bug 34616 – Bug 34616: Move default server info outside the <fieldset>

[patch] Bug 34616: Move default server info outside the <fieldset>

Bug-34616-Move-default-server-info-outside-the-fie.patch (text/plain), 4.18 KB, created by Jonathan Druart on 2023-08-30 13:55:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2023-08-30 13:55:55 UTC

Size: 4.18 KB

patch

obsolete

>From 249130c17b172001b8de863fed3f953f1ffce778 Mon Sep 17 00:00:00 2001
>From: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>Date: Fri, 25 Aug 2023 16:41:12 +0000
>Subject: [PATCH] Bug 34616: Move default server info outside the <fieldset>
>
>Also DRY current default information dialog block
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/modules/admin/smtp_servers.tt     | 42 ++++++++-----------
> 1 file changed, 18 insertions(+), 24 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
>index 779434cb1b8..1c692657912 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
>@@ -146,6 +146,9 @@
> 
> [% IF op == 'edit_form' %]
>     <h1>Edit SMTP server</h1>
>+    [% UNLESS smtp_server.is_default %]
>+        [% PROCESS default_server_info %]
>+    [% END %]
>     <form action="/cgi-bin/koha/admin/smtp_servers.pl" id="edit_save" name="edit_save" class="validated" method="post">
>         <input type="hidden" name="op" value="edit_save" />
>         <input type="hidden" name="smtp_server_id" value="[%- smtp_server.id | html -%]" />
>@@ -226,19 +229,6 @@
>                     [% END %]
>                     <span>Sets this SMTP server as the default SMTP server.</span>
>                 </li>
>-                [% UNLESS smtp_server.is_default %]
>-                    <div class="dialog message" id="default_server_message">
>-                        <p>Current default configuration:</p>
>-
>-                        <ul>
>-                            <li><strong>Host</strong>: [%- default_config.host | html -%]</li>
>-                            <li><strong>Port</strong>: [%- default_config.port | html -%]</li>
>-                            <li><strong>Timeout (secs)</strong>: [%- default_config.timeout | html -%]</li>
>-                            <li><strong>SSL</strong>: [%- IF default_config.ssl_mode == 'disabled' -%]<span>Disabled</span>[%- ELSIF default_config.ssl_mode == 'ssl' -%]<span>SSL</span>[%- ELSE -%]<span>STARTTLS</span>[%- END -%]</li>
>-                            <li><strong>Debug mode</strong>: [%- IF default_config.debug -%]Yes[%- ELSE -%]No[%- END -%]</li>
>-                        </ul>
>-                    </div>
>-                [% END %]
>             </ol>
>         </fieldset>
>         <fieldset class="action">
>@@ -256,17 +246,7 @@
> 
>     <h1>SMTP servers</h1>
> 
>-    <div class="dialog message" id="default_server_message">
>-        <p>Default configuration:</p>
>-
>-        <ul>
>-            <li><strong>Host</strong>: [%- default_config.host | html -%]</li>
>-            <li><strong>Port</strong>: [%- default_config.port | html -%]</li>
>-            <li><strong>Timeout (secs)</strong>: [%- default_config.timeout | html -%]</li>
>-            <li><strong>SSL</strong>: [%- IF default_config.ssl_mode == 'disabled' -%]<span>Disabled</span>[%- ELSIF default_config.ssl_mode == 'ssl' -%]<span>SSL</span>[%- ELSE -%]<span>STARTTLS</span>[%- END -%]</li>
>-            <li><strong>Debug mode</strong>: [%- IF default_config.debug -%]Yes[%- ELSE -%]No[%- END -%]</li>
>-        </ul>
>-    </div>
>+    [% PROCESS default_server_info %]
> 
>     [% IF servers_count > 0 %]
>         <div class="page-section">
>@@ -489,4 +469,18 @@
>     </script>
> [% END %]
> 
>+[% BLOCK default_server_info %]
>+    <div class="dialog message" id="default_server_message">
>+        <p>Current default configuration:</p>
>+
>+        <ul>
>+            <li><strong>Host</strong>: [%- default_config.host | html -%]</li>
>+            <li><strong>Port</strong>: [%- default_config.port | html -%]</li>
>+            <li><strong>Timeout (secs)</strong>: [%- default_config.timeout | html -%]</li>
>+            <li><strong>SSL</strong>: [%- IF default_config.ssl_mode == 'disabled' -%]<span>Disabled</span>[%- ELSIF default_config.ssl_mode == 'ssl' -%]<span>SSL</span>[%- ELSE -%]<span>STARTTLS</span>[%- END -%]</li>
>+            <li><strong>Debug mode</strong>: [%- IF default_config.debug -%]Yes[%- ELSE -%]No[%- END -%]</li>
>+        </ul>
>+    </div>
>+[% END %]
>+
> [% INCLUDE 'intranet-bottom.inc' %]
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 34616: 154814 | 154838 | 154839 | 154840 | 154844 | 154845 | 154846 | 154960 | 154961 | 154962