Attachment 141934 Details for Bug 31775 – Bug 31775: Template cleanup

[patch] Bug 31775: Template cleanup

Bug-31775-Template-cleanup.patch (text/plain), 6.60 KB, created by Katrin Fischer on 2022-10-15 20:49:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2022-10-15 20:49:10 UTC

Size: 6.60 KB

patch

obsolete

>From 6e7c29251e40a093d6bf622319d16a84062bdb6f Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Thu, 13 Oct 2022 14:12:07 +0000
>Subject: [PATCH] Bug 31775: Template cleanup
>
>Removing unused parts.
>
>Test plan:
>See first test plan. Confirm that it still works.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../bootstrap/en/modules/opac-library.tt      | 90 +++++++------------
> 1 file changed, 31 insertions(+), 59 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>index 480f09948f..4a5fef45c7 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-library.tt
>@@ -90,70 +90,42 @@
>                 <div class="col order-first order-md-first order-lg-2">
>             [% END %]
> 
>-                [% IF ( library ) %]
>-
>-                    <div id="library_info" class="maincontent" vocab="http://schema.org/" typeof="Library">
>-                        <h1 property="name">[% library.branchname | html %]</h1>
>-
>-                        <div class="row">
>-                            <div class="col-lg-8">
>-                                [% PROCESS library_info %]
>-                                [% IF ( OpacLibraryInfo ) %]
>-                                    <div class="library_description">
>-                                        <hr />
>-                                        [% PROCESS library_description %]
>-                                    </div>
>-                                [% END %]
>-                            </div>
>-                            <div class="col-lg-4">
>-                                [% IF ( libraries.count > 1 ) %]
>-                                    <nav class="libraries">
>-                                        <ul class="fa-ul">
>-                                            [% FOREACH library IN libraries %]
>-                                                [% IF ( branchcode == library.branchcode ) %]
>-                                                    <li id="menu_[% library.branchcode| html %]" class="current">
>-                                                        <a href="/cgi-bin/koha/opac-library.pl?branchcode=[% library.branchcode | url %]">
>-                                                            <i class="fa fa-li fa-map-pin" aria-hidden="true"></i> [% library.branchname | html %]
>-                                                        </a>
>-                                                    </li>
>-                                                [% ELSE %]
>-                                                    <li id="menu_[% library.branchcode| html %]">
>-                                                        <a href="/cgi-bin/koha/opac-library.pl?branchcode=[% library.branchcode | url %]">
>-                                                            <i class="fa fa-li" aria-hidden="true"></i> [% library.branchname | html %]
>-                                                        </a>
>-                                                    </li>
>-                                                [% END %]
>-                                            [% END %]
>-                                        </ul>
>-                                    </nav>
>-                                [% END # /IF libraries.count > 1 %]
>-                            </div> 
>-                        </div> 
>-                    </div> 
>-
>-                [% ELSE %]
>-                    <div id="library_info" class="maincontent">
>-                        <h1>[% IF ( singleBranchMode ) %]<span>Library</span>[% ELSE %]<span>Libraries</span>[% END %]</h1>
>-
>-                        [% FOREACH library IN libraries %]
>-                            <div class="section_library" id="section_[% library.branchcode | html %]">
>-                                <h2 property="name">
>-                                    [% IF ( libraries.count > 1 ) %]
>-                                        <a href="/cgi-bin/koha/opac-library.pl?branchcode=[% library.branchcode | url %]">[% library.branchname | html %]</a>
>-                                    [% ELSE %]
>-                                        [% library.branchname | html %]
>-                                    [% END %]
>-                                </h2>
>-                                [% PROCESS library_info %]
>-                            </div>
>-                            [% IF ( libraries.count == 1 ) %]
>+            [% IF ( library ) %]
>+                <div id="library_info" class="maincontent" vocab="http://schema.org/" typeof="Library">
>+                    <h1 property="name">[% library.branchname | html %]</h1>
>+                    <div class="row">
>+                        <div class="col-lg-8">
>+                            [% PROCESS library_info %]
>+                            [% IF ( OpacLibraryInfo ) %]
>                                 <div class="library_description">
>+                                    <hr />
>                                     [% PROCESS library_description %]
>                                 </div>
>                             [% END %]
>+                        </div>
>+                    </div>
>+                </div> 
>+
>+            [% ELSE %]
>+                <div id="library_info" class="maincontent">
>+                    <h1>Libraries</h1>
>+                    [% FOREACH library IN libraries %]
>+                        [% IF ( branchcode == library.branchcode ) %]
>+                            <div class="section_library" id="section_[% library.branchcode | html %]" class="current">
>+                        [% ELSE %]
>+                            <div class="section_library" id="section_[% library.branchcode | html %]" class="">
>                         [% END %]
>-                    </div> 
>-                [% END # /IF library %]
>+                        <h2 property="name">
>+                            <a href="/cgi-bin/koha/opac-library.pl?branchcode=[% library.branchcode | url %]">
>+                                [% library.branchname | html %]
>+                            </a>
>+                        </h2>
>+                        [% PROCESS library_info %]
>+                        </div>
>+                    [% END %]
>+                </div> 
>+            [% END # /IF library %]
>+
>             </div> 
>         </div> 
>     </div> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31775: 141824 | 141825 | 141871 | 141872 | 141933 | 141934