From 20586899d560f0f6106df423fd6ec729d8a0df9b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 25 Aug 2023 15:59:12 +0000
Subject: [PATCH] Bug 34408: Inconsistencies in SMTP servers page titles,
 breadcrumbs, and header

This patch updates the SMTP servers administration page in order to make
the page title, breadcrumb navigation, and page headings consistent with
each other.

The patch also adds a space between the delete button icon and the text.

To test apply the patch and go to Administration -> SMTP servers.

- Confirm that the page header, breadcrumb navigation, and page headings
  are consistent on each view of the page:
  - Main page
  - New SMTP server
  - Edit SMTP server

Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/admin/smtp_servers.tt            | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 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 1c69265791..beefae3859 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
@@ -7,7 +7,7 @@
     [% IF op == 'add_form' %]
         [% t("New SMTP server") | html %] &rsaquo;
     [% ELSIF op == 'edit_form' %]
-        [% t("Edit SMTP server") | html %] &rsaquo;
+        [% tx("Modify SMTP server '{smtp_server}'", { smtp_server = smtp_server.name }) | html %] &rsaquo;
     [% END %]
     [% t("SMTP servers") | html %] &rsaquo;
     [% t("Administration") | html %] &rsaquo;
@@ -35,12 +35,12 @@
 
         [% IF op == 'add_form' %]
             [% WRAPPER breadcrumb_item bc_active= 1 %]
-                <span>New</span>
+                <span>New SMTP server</span>
             [% END %]
 
         [% ELSIF op == 'edit_form' %]
             [% WRAPPER breadcrumb_item bc_active= 1 %]
-                <span>Edit</span>
+                [% tx("Modify SMTP server '{smtp_server}'", { smtp_server = smtp_server.name }) | html %]
             [% END %]
 
         [% ELSE %]
@@ -145,10 +145,12 @@
 [% END %]
 
 [% IF op == 'edit_form' %]
-    <h1>Edit SMTP server</h1>
+    <h1>[% tx("Modify SMTP server '{smtp_server}'", { smtp_server = smtp_server.name }) | html %]</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 -%]" />
@@ -407,7 +409,7 @@
                     {
                         "data": function( row, type, val, meta ) {
                             var result = '<a class="btn btn-default btn-xs" role="button" href="/cgi-bin/koha/admin/smtp_servers.pl?op=edit_form&amp;smtp_server_id='+ encodeURIComponent(row.smtp_server_id) +'"><i class="fa-solid fa-pencil" aria-hidden="true"></i> '+_("Edit")+'</a>'+"\n";
-                            result += '<a class="btn btn-default btn-xs delete_server" role="button" href="#" data-toggle="modal" data-target="#delete_confirm_modal" data-smtp-server-id="'+ encodeURIComponent(row.smtp_server_id) +'" data-smtp-server-name="'+ encodeURIComponent(row.name.escapeHtml()) +'"><i class="fa fa-trash-can" aria-hidden="true"></i>'+_("Delete")+'</a>';
+                            result += '<a class="btn btn-default btn-xs delete_server" role="button" href="#" data-toggle="modal" data-target="#delete_confirm_modal" data-smtp-server-id="'+ encodeURIComponent(row.smtp_server_id) +'" data-smtp-server-name="'+ encodeURIComponent(row.name.escapeHtml()) +'"><i class="fa fa-trash-can" aria-hidden="true"></i> '+_("Delete")+'</a>';
                             return result;
                         },
                         "searchable": false,
-- 
2.39.5