Attachment 161738 Details for Bug 35882 – Bug 35882: Use template wrapper for accordions: Notices

[patch] Bug 35882: Use template wrapper for accordions: Notices

Bug-35882-Use-template-wrapper-for-accordions-Noti.patch (text/plain), 15.37 KB, created by David Nind on 2024-02-04 22:29:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2024-02-04 22:29:36 UTC

Size: 15.37 KB

patch

obsolete

>From ac3cd654eba4b8bf060f6a4fbc08bc92898f1932 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 23 Jan 2024 19:32:03 +0000
>Subject: [PATCH] Bug 35882: Use template wrapper for accordions: Notices
>
>This patch updates the notices template so that Bootstrap
>accordion markup for the notice edit view is generated by WRAPPERs.
>
>To test, apply the patch and go to Tools -> Notices.
>
>- Edit any notice.
>- The list of message transport types (Email, Print, SMS) should be
>  displayed as before: Collapsible panels where clicking the transport
>  type heading expands the corresponding information.
>- Confirm that changes to notices are correctly saved.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../prog/en/modules/tools/letter.tt           | 166 +++++++++---------
> 1 file changed, 80 insertions(+), 86 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>index 3dea27a8a5..c7193c8e06 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -563,102 +563,96 @@
>     [% END %]
> 
> [% BLOCK message_templates %]
>-    <div class="panel-group" id="group_[% lang | html %]" role="tablist" aria-multiselectable="true">
>+    [% WRAPPER accordion id="group_${lang}" %]
>         [% FOR mtt IN letters.$lang.templates.keys.sort %]
>             [% SET letter = letters.$lang.templates.$mtt %]
>             [% NEXT IF letter.message_transport_type == "itiva" && !Koha.Preference('TalkingTechItivaPhoneNotification') %]
>             [% NEXT IF letter.message_transport_type == "phone" && !Koha.Preference('PhoneNotification') %]
>-            <div class="panel panel-default">
>-                <div class="panel-heading" role="tab" id="[% letter.message_transport_type | html %]_[% lang | html %]Heading">
>-                    <h3 class="panel-title">
>-                        <a role="button" class="collapsed" data-toggle="collapse" data-parent="#group_[% lang | html %]" href="#[% letter.message_transport_type | html %]_[% lang | html %]" aria-expanded="false" aria-controls="[% letter.message_transport_type | html %]_[% lang | html %]">
>-                            [% SWITCH letter.message_transport_type %]
>-                                [% CASE 'email' %]<span>Email</span>
>-                                [% CASE 'print' %]<span>[% tp('Message transport type', 'Print') | html %]</span>
>-                                [% CASE 'sms' %]<span>SMS</span>
>-                                [% CASE 'feed' %]<span>Feed</span>
>-                                [% CASE 'itiva' %]<span>Phone (i-tiva)</span>
>-                                [% CASE 'phone' %]<span>Phone</span>
>-                                [% CASE %]<span>[% letter.message_transport_type | html %]</span>
>-                            [% END %]
>-                        </a>
>-                    </h3>
>-                </div> 
>-                <div id="[% letter.message_transport_type | html %]_[% lang | html %]" class="panel-collapse collapse" role="tabpanel" aria-labelledby="[% letter.message_transport_type | html %]_[% lang | html %]Heading">
>-                    <div class="panel-body">
>-                        [% IF letter.message_transport_type == "sms" and not Koha.Preference("SMSSendDriver") %]
>-                            <fieldset class="rows mtt" disabled="disabled">
>-                                <div class="dialog message">You should enable the SMSSendDriver preference to use the SMS templates.</div>
>-                        [% ELSE %]
>-                            <fieldset class="rows mtt">
>-                        [% END %]
>-                            <input type="hidden" name="message_transport_type" value="[% letter.message_transport_type | html %]" />
>-                            <input type="hidden" name="lang" value="[% lang | html %]" />
>-                            <ol>
>-                                [% IF ( letter.tt_error ) %]
>-                                    <li class="template_toolkit_error">
>-                                        <span class="label error">Template Toolkit error:</span>
>-                                        [% letter.tt_error | html %]
>-                                    </li>
>-                                [% END %]
>-                                [% IF ( letter.updated_on ) %]
>-                                    <li>
>-                                        <span class="label">Last updated:</span>
>-                                        [% letter.updated_on | $KohaDates with_hours = 1 %]
>-                                    </li>
>-                                [% END %]
>-                                <li>
>-                                    <label for="is_html_[% letter.message_transport_type | html %]_[% lang | html %]">HTML message:</label>
>-                                    [% IF letter.is_html %]
>-                                        <input type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" checked="checked" />
>-                                    [% ELSE %]
>-                                        <input type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" />
>-                                    [% END %]
>+            [% WRAPPER accordion_item %]
>+                [% WRAPPER accordion_heading panel_id="${letter.message_transport_type}_${lang}" %]
>+                    [% SWITCH letter.message_transport_type %]
>+                        [% CASE 'email' %]<span>Email</span>
>+                        [% CASE 'print' %]<span>[% tp('Message transport type', 'Print') | html %]</span>
>+                        [% CASE 'sms' %]<span>SMS</span>
>+                        [% CASE 'feed' %]<span>Feed</span>
>+                        [% CASE 'itiva' %]<span>Phone (i-tiva)</span>
>+                        [% CASE 'phone' %]<span>Phone</span>
>+                        [% CASE %]<span>[% letter.message_transport_type | html %]</span>
>+                    [% END %]
>+                [% END %]
>+                [% WRAPPER accordion_panel panel_id="${letter.message_transport_type}_${lang}" %]
>+                    [% IF letter.message_transport_type == "sms" and not Koha.Preference("SMSSendDriver") %]
>+                        <fieldset class="rows mtt" disabled="disabled">
>+                            <div class="dialog message">You should enable the SMSSendDriver preference to use the SMS templates.</div>
>+                    [% ELSE %]
>+                        <fieldset class="rows mtt">
>+                    [% END %]
>+                        <input type="hidden" name="message_transport_type" value="[% letter.message_transport_type | html %]" />
>+                        <input type="hidden" name="lang" value="[% lang | html %]" />
>+                        <ol>
>+                            [% IF ( letter.tt_error ) %]
>+                                <li class="template_toolkit_error">
>+                                    <span class="label error">Template Toolkit error:</span>
>+                                    [% letter.tt_error | html %]
>                                 </li>
>+                            [% END %]
>+                            [% IF ( letter.updated_on ) %]
>                                 <li>
>-                                    <label for="title_[% letter.message_transport_type | html %]_[% lang | html %]">Message subject:</label><input type="text" id="title_[% letter.message_transport_type | html %]_[% lang | html %]" name="title" size="60" value="[% letter.title | html %]" />
>+                                    <span class="label">Last updated:</span>
>+                                    [% letter.updated_on | $KohaDates with_hours = 1 %]
>                                 </li>
>+                            [% END %]
>+                            <li>
>+                                <label for="is_html_[% letter.message_transport_type | html %]_[% lang | html %]">HTML message:</label>
>+                                [% IF letter.is_html %]
>+                                    <input type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" checked="checked" />
>+                                [% ELSE %]
>+                                    <input type="checkbox" name="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" id="is_html_[% letter.message_transport_type | html %]_[% lang | html %]" value="1" />
>+                                [% END %]
>+                            </li>
>+                            <li>
>+                                <label for="title_[% letter.message_transport_type | html %]_[% lang | html %]">Message subject:</label><input type="text" id="title_[% letter.message_transport_type | html %]_[% lang | html %]" name="title" size="60" value="[% letter.title | html %]" />
>+                            </li>
>+                            <li>
>+                                <label for="SQLfieldname_[% letter.message_transport_type | html %]_[% lang | html %]">Message body:</label>
>+                                [% IF letter.message_transport_type == 'sms' %]
>+                                    <span class="sms_counter" id="sms_counter_[% lang | html %]">
>+                                        [% IF letter.content && letter.content.length > 0 %]
>+                                            [% tx("{content_length} / 160 characters", {content_length = letter.content.length} ) %]
>+                                        [% ELSE %]
>+                                            [% tx("{content_length} / 160 characters", {content_length = 0} ) %]
>+                                        [% END %]
>+                                    </span>
>+                                [% END %]
>+                                <table>
>+                                    <tr>
>+                                        <td>
>+                                            <select name="SQLfieldname" id="SQLfieldname_[% letter.message_transport_type | html %]_[% lang | html %]" multiple="multiple" size="9">
>+                                                [% FOREACH SQLfieldname IN SQLfieldnames %]
>+                                                    <option value="[% SQLfieldname.value | html %]">[% SQLfieldname.text | html %]</option>
>+                                                [% END %]
>+                                            </select>
>+                                        </td>
>+                                        <td class="actions">
>+                                            <button type="button" data-containerid="[% letter.message_transport_type | html %]_[% lang | html %]" class="btn btn-default btn-sm insert">Insert <i class="fa-solid fa-right-long"></i></button>
>+                                        </td>
>+                                        <td>
>+                                            <textarea name="content" data-lang="[% lang | html %]" class="content_[% letter.message_transport_type | html %]" id="content_[% letter.message_transport_type | html %]_[% lang | html %]" cols="80" rows="15">[% letter.content | html %]</textarea>
>+                                        </td>
>+                                    </tr>
>+                                </table>
>+                            </li>
>+                            [% IF preview_is_available %]
>                                 <li>
>-                                    <label for="SQLfieldname_[% letter.message_transport_type | html %]_[% lang | html %]">Message body:</label>
>-                                    [% IF letter.message_transport_type == 'sms' %]
>-                                        <span class="sms_counter" id="sms_counter_[% lang | html %]">
>-                                            [% IF letter.content && letter.content.length > 0 %]
>-                                                [% tx("{content_length} / 160 characters", {content_length = letter.content.length} ) %]
>-                                            [% ELSE %]
>-                                                [% tx("{content_length} / 160 characters", {content_length = 0} ) %]
>-                                            [% END %]
>-                                        </span>
>-                                    [% END %]
>-                                    <table>
>-                                        <tr>
>-                                            <td>
>-                                                <select name="SQLfieldname" id="SQLfieldname_[% letter.message_transport_type | html %]_[% lang | html %]" multiple="multiple" size="9">
>-                                                    [% FOREACH SQLfieldname IN SQLfieldnames %]
>-                                                        <option value="[% SQLfieldname.value | html %]">[% SQLfieldname.text | html %]</option>
>-                                                    [% END %]
>-                                                </select>
>-                                            </td>
>-                                            <td class="actions">
>-                                                <button type="button" data-containerid="[% letter.message_transport_type | html %]_[% lang | html %]" class="btn btn-default btn-sm insert">Insert <i class="fa-solid fa-right-long"></i></button>
>-                                            </td>
>-                                            <td>
>-                                                <textarea name="content" data-lang="[% lang | html %]" class="content_[% letter.message_transport_type | html %]" id="content_[% letter.message_transport_type | html %]_[% lang | html %]" cols="80" rows="15">[% letter.content | html %]</textarea>
>-                                            </td>
>-                                        </tr>
>-                                    </table>
>+                                    <a href="/cgi-bin/koha/svc/letters/preview" class="preview_template btn btn-default btn-xs" title="Preview this notice template" data-mtt="[% letter.message_transport_type | html %]" data-lang="[% lang | html %]"><i class="fa-solid fa-eye"></i> Preview</a>
>                                 </li>
>-                                [% IF preview_is_available %]
>-                                    <li>
>-                                        <a href="/cgi-bin/koha/svc/letters/preview" class="preview_template btn btn-default btn-xs" title="Preview this notice template" data-mtt="[% letter.message_transport_type | html %]" data-lang="[% lang | html %]"><i class="fa-solid fa-eye"></i> Preview</a>
>-                                    </li>
>-                                [% END %]
>-                            </ol>
>-                        </fieldset> 
>-                    </div> 
>-                </div> 
>-            </div> 
>+                            [% END %]
>+                        </ol>
>+                    </fieldset> 
>+                [% END %]
>+            [% END # /collapse_item %]
>         [% END # /FOR mtt %]
>-    </div> 
>+    [% END # /WRAPPER accordion %]
> [% END %]
> 
> [% MACRO jsinclude BLOCK %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 35882: 161330 | 161738 | 163890 | 163891