Attachment 118739 Details for Bug 27846 – Bug 27846: (follow-up) Indentation corrections

[patch] Bug 27846: (follow-up) Indentation corrections

Bug-27846-follow-up-Indentation-corrections.patch (text/plain), 43.00 KB, created by Owen Leonard on 2021-03-24 12:13:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2021-03-24 12:13:30 UTC

Size: 43.00 KB

patch

obsolete

>From 956a1e8fe974cb3d4824df13bc41398c2dfb8c70 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 23 Mar 2021 12:01:06 +0000
>Subject: [PATCH] Bug 27846: (follow-up) Indentation corrections
>
>This patch makes some indentation changes to make things (in my opinion)
>more consistent. Diffing while ignoring whitespace should show no
>changes except to acqui/basket.tt where some lines were broken up.
>---
> .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |  20 ++--
> .../prog/en/modules/acqui/basketheader.tt          |  28 ++---
> .../prog/en/modules/acqui/neworderempty.tt         |  26 ++---
> .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |  28 ++---
> .../prog/en/modules/acqui/supplier.tt              |  44 ++++----
> .../prog/en/modules/acqui/uncertainprice.tt        |  28 ++---
> .../prog/en/modules/acqui/z3950_search.tt          |  32 +++---
> .../prog/en/modules/admin/additional-fields.tt     |  56 +++++-----
> .../prog/en/modules/admin/aqbudgetperiods.tt       | 122 ++++++++++-----------
> .../prog/en/modules/admin/aqcontract.tt            |  96 ++++++++--------
> .../en/modules/admin/auth_subfields_structure.tt   |  76 ++++++-------
> .../prog/en/modules/admin/auth_tag_structure.tt    | 120 ++++++++++----------
> .../prog/en/modules/admin/authorised_values.tt     |  64 +++++------
> .../prog/en/modules/admin/authtypes.tt             |  56 +++++-----
> .../prog/en/modules/admin/biblio_framework.tt      |  50 ++++-----
> .../prog/en/modules/catalogue/MARCdetail.tt        |  32 +++---
> .../prog/en/modules/circ/view_holdsqueue.tt        |  26 ++---
> 17 files changed, 454 insertions(+), 450 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>index f37c5fdd99..7b9989f648 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
>@@ -46,14 +46,18 @@
>         </li>
>         <li>
>             <a href="#" aria-current="page">
>-    [% UNLESS ( basketno ) %]
>-        [% IF ( delete_confirmed ) %]
>-        Deleted [% ELSE %]
>-        New [% END %]
>-    [% END %]
>-    Basket [% basketname | html %] [% IF ( basketno ) %]
>-        ([% basketno | html %])
>-    [% END %] for [% booksellername | html %]
>+                [% UNLESS ( basketno ) %]
>+                    [% IF ( delete_confirmed ) %]
>+                        Deleted
>+                    [% ELSE %]
>+                        New
>+                    [% END %]
>+                [% END %]
>+                Basket [% basketname | html %]
>+                [% IF ( basketno ) %]
>+                    ([% basketno | html %])
>+                [% END %]
>+                for [% booksellername | html %]
>             </a>
>         </li>
>     </ol>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
>index ed48579c11..775a524f0e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt
>@@ -29,21 +29,21 @@
>         <li>
>             <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
>         </li>
>-    [% IF ( add_form ) %]
>-        [% IF ( basketno ) %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Edit basket '[% basketname | html %]'
>-            </a>
>-        </li>
>-        [% ELSE %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Add a basket to [% booksellername | html %]
>-            </a>
>-        </li>
>+        [% IF ( add_form ) %]
>+            [% IF ( basketno ) %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Edit basket '[% basketname | html %]'
>+                    </a>
>+                </li>
>+            [% ELSE %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Add a basket to [% booksellername | html %]
>+                    </a>
>+                </li>
>+            [% END %]
>         [% END %]
>-    [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>index 861db56f2a..a114d30ccc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
>@@ -30,19 +30,19 @@
>             <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
>         </li>
> 
>-    [% IF ( ordernumber ) %]
>-    <li>
>-        <a href="#" aria-current="page">
>-            Modify order details (line #[% ordernumber | html %])
>-        </a>
>-    </li>
>-    [% ELSE %]
>-    <li>
>-        <a href="#" aria-current="page">
>-            New order
>-        </a>
>-    </li>
>-    [% END %]
>+        [% IF ( ordernumber ) %]
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Modify order details (line #[% ordernumber | html %])
>+                </a>
>+            </li>
>+        [% ELSE %]
>+            <li>
>+                <a href="#" aria-current="page">
>+                    New order
>+                </a>
>+            </li>
>+        [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>index 2e28931f56..b45ef9f952 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -30,21 +30,21 @@
>         <li>
>             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
>         </li>
>-    [% IF invoiceclosedate %]
>-        <li>
>-        Receipt summary for <em>[% name | html %]</em>
>-        [% IF ( invoice ) %]
>-            <em>[ [% invoice | html %] ]</em>
>+        [% IF invoiceclosedate %]
>+            <li>
>+                Receipt summary for <em>[% name | html %]</em>
>+                [% IF ( invoice ) %]
>+                    <em>[ [% invoice | html %] ]</em>
>+                [% END %]
>+            </li>
>+        [% ELSE %]
>+            <li>
>+                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
>+            </li>
>+            <li>
>+                Receive orders from [% name | html %]
>+            </li>
>         [% END %]
>-        </li>
>-    [% ELSE %]
>-        <li>
>-        <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
>-        </li>
>-        <li>
>-        Receive orders from [% name | html %]
>-        </li>
>-    [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>index 1531e3c7dd..aa89f2ed24 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
>@@ -105,30 +105,30 @@
>         <li>
>             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
>         </li>
>-    [% IF ( enter ) %]
>-        [% IF ( booksellerid ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Update: [% name | html %]
>-            </a>
>-        </li>
>+        [% IF ( enter ) %]
>+            [% IF ( booksellerid ) %]
>+                <li>
>+                    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% name | html %]</a>
>+                </li>
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Update: [% name | html %]
>+                    </a>
>+                </li>
>+            [% ELSE %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Add vendor
>+                    </a>
>+                </li>
>+            [% END %]
>         [% ELSE %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Add vendor
>-            </a>
>-        </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    [% name | html %]
>+                </a>
>+            </li>
>         [% END %]
>-    [% ELSE %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                [% name | html %]
>-            </a>
>-        </li>
>-    [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>index cd16eafc1d..6a786d875c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
>@@ -20,21 +20,21 @@
>         <li>
>             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
>         </li>
>-    [% IF ( booksellername ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Uncertain prices for vendor [% booksellername | html %]
>-            </a>
>-        </li>
>+        [% IF ( booksellername ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Uncertain prices for vendor [% booksellername | html %]
>+                </a>
>+            </li>
>         [% ELSE %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Uncertain prices
>-            </a>
>-        </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Uncertain prices
>+                </a>
>+            </li>
>         [% END %]
>     </ol>
> </nav>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>index 55477b6b86..36d81d414e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
>@@ -30,22 +30,22 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
>         <li>
>             <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | uri %]">Basket [% basketno | html %]</a>
>         </li>
>-    [% IF ( opsearch ) %]
>-    <li>
>-        <a href="#" aria-current="page">
>-            Order from external source
>-        </a>
>-    </li>
>-    [% ELSE %]
>-    <li>
>-        <a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order from external source</a>
>-    </li>
>-    <li>
>-        <a href="#" aria-current="page">
>-            Search results
>-        </a>
>-    </li>
>-    [% END %]
>+        [% IF ( opsearch ) %]
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Order from external source
>+                </a>
>+            </li>
>+        [% ELSE %]
>+            <li>
>+                <a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order from external source</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Search results
>+                </a>
>+            </li>
>+        [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>index 611d7017b0..c5848b96a5 100755
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>@@ -25,43 +25,43 @@
>             <li>
>                 <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>             </li>
>-        [% SWITCH op %]
>-            [% CASE 'add_form' %]
>-            <li>
>-                <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
>-            </li>
>-                [% IF field %]
>+            [% SWITCH op %]
>+                [% CASE 'add_form' %]
>+                    <li>
>+                        <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
>+                    </li>
>+                    [% IF field %]
>+                        <li>
>+                            <a href="#" aria-current="page">
>+                                Modify field '[% field.name | html %]'
>+                            </a>
>+                        </li>
>+                    [% ELSE %]
>+                        <li>
>+                            <a href="#" aria-current="page">
>+                                Add field
>+                            </a>
>+                        </li>
>+                    [% END %]
>+
>+                [% CASE 'list' %]
>+                    <li>
>+                        <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
>+                    </li>
>                     <li>
>                         <a href="#" aria-current="page">
>-                            Modify field '[% field.name | html %]'
>+                            Modify fields for '[% tablename | html %]'
>                         </a>
>                     </li>
>-                [% ELSE %]
>+
>+                [% CASE %]
>                     <li>
>                         <a href="#" aria-current="page">
>-                            Add field
>+                            Manage additional fields
>                         </a>
>                     </li>
>-                [% END %]
> 
>-            [% CASE 'list' %]
>-            <li>
>-                <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Modify fields for '[% tablename | html %]'
>-                </a>
>-            </li>
>-
>-            [% CASE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Manage additional fields
>-                </a>
>-            </li>
>-
>-        [% END %]
>+            [% END %]
>         </ol>
>     </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>index d6ace89e3c..006357a658 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -86,84 +86,84 @@
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>         </li>
> 
>-    [% IF ( add_form ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-        </li>
>-        [% IF ( budget_period_id ) %]
>+        [% IF ( add_form ) %]
>             <li>
>-                <a href="#" aria-current="page">
>-                    Modify budget '[% budget_period_description | html %]'
>-                </a>
>+                <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>+            </li>
>+            [% IF ( budget_period_id ) %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Modify budget '[% budget_period_description | html %]'
>+                    </a>
>+                </li>
>+            [% ELSE %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Add budget
>+                    </a>
>+                </li>
>+            [% END %]
>+        [% END %]
>+
>+        [% IF ( delete_confirm ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>+            </li>
>+            [% IF ( total || funds_exist ) %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Cannot delete budget '[% budget_period_description | html %]'
>+                    </a>
>+                </li>
>+            [% ELSE %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Delete budget '[% budget_period_description | html %]'?
>+                    </a>
>+                </li>
>+            [% END %]
>+        [% END %]
>+
>+            [% IF ( duplicate_form ) %]
>+                <li>
>+                    <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>+                </li>
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Duplicate budget
>+                    </a>
>+                </li>
>+            [% END %]
>+
>+        [% IF close_form %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>             </li>
>-        [% ELSE %]
>             <li>
>                 <a href="#" aria-current="page">
>-                    Add budget
>+                    Close budget [% budget_period_description | html %]
>                 </a>
>             </li>
>         [% END %]
>-    [% END %]
> 
>-    [% IF ( delete_confirm ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-        </li>
>-        [% IF ( total || funds_exist ) %]
>+        [% IF closed %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>+            </li>
>             <li>
>                 <a href="#" aria-current="page">
>-                    Cannot delete budget '[% budget_period_description | html %]'
>+                    Budget [% budget_period_description | html %] closed
>                 </a>
>             </li>
>-        [% ELSE %]
>+        [% END %]
>+
>+        [% IF ( else ) %]
>             <li>
>                 <a href="#" aria-current="page">
>-                    Delete budget '[% budget_period_description | html %]'?
>+                    Budgets administration
>                 </a>
>             </li>
>         [% END %]
>-    [% END %]
>-
>-    [% IF ( duplicate_form ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Duplicate budget
>-            </a>
>-        </li>
>-    [% END %]
>-
>-    [% IF close_form %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Close budget [% budget_period_description | html %]
>-            </a>
>-        </li>
>-    [% END %]
>-
>-    [% IF closed %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Budget [% budget_period_description | html %] closed
>-            </a>
>-        </li>
>-    [% END %]
>-
>-    [% IF ( else ) %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Budgets administration
>-            </a>
>-        </li>
>-    [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>index 745a0d8c30..a66877bf14 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>@@ -31,65 +31,65 @@
>             <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
>         </li>
> 
>-    [% IF ( add_form ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>-        </li>
>-        [% IF ( contractnumber ) %]
>+        [% IF ( add_form ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>+            </li>
>+            [% IF ( contractnumber ) %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Modify contract '[% contractname | html %]'
>+                    </a>
>+                </li>
>+            [% ELSE %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        New contract
>+                    </a>
>+                </li>
>+            [% END %]
>+        [% END %]
>+
>+        [% IF ( add_validate ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>+            </li>
>             <li>
>                 <a href="#" aria-current="page">
>-                    Modify contract '[% contractname | html %]'
>+                    Data recorded
>                 </a>
>             </li>
>-        [% ELSE %]
>+        [% END %]
>+
>+        [% IF ( delete_confirm ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>+            </li>
>             <li>
>                 <a href="#" aria-current="page">
>-                    New contract
>+                    Confirm deletion of contract [% contractnumber | html %]
>                 </a>
>             </li>
>         [% END %]
>-    [% END %]
>-
>-    [% IF ( add_validate ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Data recorded
>-            </a>
>-        </li>
>-    [% END %]
> 
>-    [% IF ( delete_confirm ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Confirm deletion of contract [% contractnumber | html %]
>-            </a>
>-        </li>
>-    [% END %]
>-
>-    [% IF ( delete_confirmed ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Contract deleted
>-            </a>
>-        </li>
>-    [% END %]
>+        [% IF ( delete_confirmed ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Contract deleted
>+                </a>
>+            </li>
>+        [% END %]
> 
>-    [% IF ( else ) %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Contracts
>-            </a>
>-        </li>
>-    [% END %]
>+        [% IF ( else ) %]
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Contracts
>+                </a>
>+            </li>
>+        [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>index c39c6a0a66..9df9788aa2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>@@ -22,53 +22,53 @@
>             <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a>
>         </li>
> 
>-    [% IF ( authtypecode ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri%]">[% authtypecode | html %] framework</a>
>-        </li>
>-    [% ELSE %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-        </li>
>-    [% END %]
>+        [% IF ( authtypecode ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri%]">[% authtypecode | html %] framework</a>
>+            </li>
>+        [% ELSE %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+            </li>
>+        [% END %]
> 
>-    [% IF ( else ) %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Authority MARC subfield structure for [% tagfield | html %]
>-            </a>
>-        </li>
>-    [% ELSE %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;tagsubfield=[% tagsubfield | uri %]&amp;authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a>
>-        </li>
>-    [% END %]
>+        [% IF ( else ) %]
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Authority MARC subfield structure for [% tagfield | html %]
>+                </a>
>+            </li>
>+        [% ELSE %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;tagsubfield=[% tagsubfield | uri %]&amp;authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a>
>+            </li>
>+        [% END %]
> 
>-    [% IF ( delete_confirm ) %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Confirm deletion of subfield [% tagsubfield | html %]?
>-            </a>
>-        </li>
>-    [% END %]
>+        [% IF ( delete_confirm ) %]
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Confirm deletion of subfield [% tagsubfield | html %]?
>+                </a>
>+            </li>
>+        [% END %]
> 
>-    [% IF ( add_form ) %]
>-        [% IF ( use_heading_flags_p ) %]
>-            [% IF ( heading_edit_subfields_p ) %]
>+        [% IF ( add_form ) %]
>+            [% IF ( use_heading_flags_p ) %]
>+                [% IF ( heading_edit_subfields_p ) %]
>+                    <li>
>+                        <a href="#" aria-current="page">
>+                            Edit MARC subfields constraints
>+                        </a>
>+                    </li>
>+                [% END %]
>+            [% ELSE %]
>                 <li>
>                     <a href="#" aria-current="page">
>-                        Edit MARC subfields constraints
>+                        [% action | html %]
>                     </a>
>                 </li>
>             [% END %]
>-        [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    [% action | html %]
>-                </a>
>-            </li>
>         [% END %]
>-    [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>index 7ce18daae0..c7c6ba8458 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>@@ -27,30 +27,47 @@
>             <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a>
>         </li>
> 
>-    [% IF ( add_form ) %]
>-        [% IF ( use_heading_flags_p ) %]
>+        [% IF ( add_form ) %]
>+            [% IF ( use_heading_flags_p ) %]
> 
>-            [% IF ( heading_modify_tag_p ) %]
>-                [% IF ( authtypecode ) %]
>+                [% IF ( heading_modify_tag_p ) %]
>+                    [% IF ( authtypecode ) %]
>+                        <li>
>+                            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
>+                        </li>
>+                    [% ELSE %]
>+                        <li>
>+                            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+                        </li>
>+                    [% END %]
>                     <li>
>-                        <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
>+                        <a href="#" aria-current="page">
>+                            Modify tag
>+                        </a>
>                     </li>
>-                [% ELSE %]
>+                [% END %]
>+
>+                [% IF ( heading_add_tag_p ) %]
>+                    [% IF ( authtypecode ) %]
>+                        <li>
>+                            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
>+                        </li>
>+                    [% ELSE %]
>+                        <li>
>+                            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+                        </li>
>+                    [% END %]
>                     <li>
>-                        <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+                        <a href="#" aria-current="page">
>+                            New tag
>+                        </a>
>                     </li>
>                 [% END %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Modify tag
>-                    </a>
>-                </li>
>-            [% END %]
> 
>-            [% IF ( heading_add_tag_p ) %]
>+            [% ELSE %]
>                 [% IF ( authtypecode ) %]
>                     <li>
>-                        <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
>+                        <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
>                     </li>
>                 [% ELSE %]
>                     <li>
>@@ -59,46 +76,13 @@
>                 [% END %]
>                 <li>
>                     <a href="#" aria-current="page">
>-                        New tag
>+                        [% action | html %]
>                     </a>
>                 </li>
>             [% END %]
> 
>         [% ELSE %]
>-            [% IF ( authtypecode ) %]
>-                <li>
>-                    <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
>-                </li>
>-            [% ELSE %]
>-                <li>
>-                    <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                </li>
>-            [% END %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    [% action | html %]
>-                </a>
>-            </li>
>-        [% END %]
>-
>-    [% ELSE %]
>-        [% IF ( delete_confirm ) %]
>-            [% IF ( authtypecode ) %]
>-                <li>
>-                    <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
>-                </li>
>-            [% ELSE %]
>-                <li>
>-                    <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                </li>
>-            [% END %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Confirm deletion
>-                </a>
>-            </li>
>-        [% ELSE %]
>-            [% IF ( delete_confirmed ) %]
>+            [% IF ( delete_confirm ) %]
>                 [% IF ( authtypecode ) %]
>                     <li>
>                         <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
>@@ -110,27 +94,43 @@
>                 [% END %]
>                 <li>
>                     <a href="#" aria-current="page">
>-                        Data deleted
>+                        Confirm deletion
>                     </a>
>                 </li>
>             [% ELSE %]
>-                [% IF ( authtypecode ) %]
>+                [% IF ( delete_confirmed ) %]
>+                    [% IF ( authtypecode ) %]
>+                        <li>
>+                            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
>+                        </li>
>+                    [% ELSE %]
>+                        <li>
>+                            <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>+                        </li>
>+                    [% END %]
>                     <li>
>                         <a href="#" aria-current="page">
>-                            [% authtypecode | html %] Framework
>+                            Data deleted
>                         </a>
>                     </li>
>                 [% ELSE %]
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            Default framework
>-                        </a>
>-                    </li>
>+                    [% IF ( authtypecode ) %]
>+                        <li>
>+                            <a href="#" aria-current="page">
>+                                [% authtypecode | html %] Framework
>+                            </a>
>+                        </li>
>+                    [% ELSE %]
>+                        <li>
>+                            <a href="#" aria-current="page">
>+                                Default framework
>+                            </a>
>+                        </li>
>+                    [% END %]
>                 [% END %]
>-            [% END %]
> 
>+            [% END %]
>         [% END %]
>-    [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>index f5eaadcfa4..dc8308997b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt
>@@ -32,49 +32,49 @@
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>         </li>
> 
>-    [% IF op == 'add_form' %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a>
>-        </li>
>-        [% IF ( action_modify ) %]
>+        [% IF op == 'add_form' %]
>             <li>
>-                <a href="#" aria-current="page">
>-                    Modify authorized value
>-                </a>
>+                <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a>
>+            </li>
>+            [% IF ( action_modify ) %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Modify authorized value
>+                    </a>
>+                </li>
>+            [% END %]
>+            [% IF ( action_add_value ) %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        New authorized value
>+                    </a>
>+                </li>
>+            [% END %]
>+            [% IF ( action_add_category ) %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        New category
>+                    </a>
>+                </li>
>+            [% END %]
>+
>+        [% ELSIF ( loop ) %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a>
>             </li>
>-        [% END %]
>-        [% IF ( action_add_value ) %]
>             <li>
>                 <a href="#" aria-current="page">
>-                    New authorized value
>+                    Authorized values for category [% category_name | html %]
>                 </a>
>             </li>
>-        [% END %]
>-        [% IF ( action_add_category ) %]
>+
>+        [% ELSE %]
>             <li>
>                 <a href="#" aria-current="page">
>-                    New category
>+                    Authorized values
>                 </a>
>             </li>
>         [% END %]
>-
>-    [% ELSIF ( loop ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Authorized values for category [% category_name | html %]
>-            </a>
>-        </li>
>-
>-    [% ELSE %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Authorized values
>-            </a>
>-        </li>
>-    [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>index a443b2a61e..7033c9df50 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>@@ -25,35 +25,35 @@
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>         </li>
> 
>-    [% IF op == 'add_form' %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                [% IF authority_type.authtypecode.defined %]
>-                    Modify
>-                [% ELSE %]
>-                    New
>-                [% END %] Authority type
>-            </a>
>-        </li>
>-
>-    [% ELSIF op == 'delete_confirm' %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Confirm deletion of authority type
>-            </a>
>-        </li>
>+        [% IF op == 'add_form' %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    [% IF authority_type.authtypecode.defined %]
>+                        Modify
>+                    [% ELSE %]
>+                        New
>+                    [% END %] Authority type
>+                </a>
>+            </li>
>+
>+        [% ELSIF op == 'delete_confirm' %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Confirm deletion of authority type
>+                </a>
>+            </li>
> 
>-    [% ELSE %]
>-        <li>
>-            <a href="#" aria-current="page">Authority types</a>
>-        </li>
>-    [% END %]
>+        [% ELSE %]
>+            <li>
>+                <a href="#" aria-current="page">Authority types</a>
>+            </li>
>+        [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>index f084e0e785..13494ce43d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>@@ -25,41 +25,41 @@
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>         </li>
> 
>-    [% IF op == 'add_form' %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
>-        </li>
>-        [% IF framework %]
>+        [% IF op == 'add_form' %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
>+            </li>
>+            [% IF framework %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Modify framework text
>+                    </a>
>+                </li>
>+            [% ELSE %]
>+                <li>
>+                    <a href="#" aria-current="page">
>+                        Add framework
>+                    </a>
>+                </li>
>+            [% END %]
>+
>+        [% ELSIF op == 'delete_confirm' %]
>+            <li>
>+                <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
>+            </li>
>             <li>
>                 <a href="#" aria-current="page">
>-                    Modify framework text
>+                    Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?
>                 </a>
>             </li>
>+
>         [% ELSE %]
>             <li>
>                 <a href="#" aria-current="page">
>-                    Add framework
>+                    MARC frameworks
>                 </a>
>             </li>
>         [% END %]
>-
>-    [% ELSIF op == 'delete_confirm' %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?
>-            </a>
>-        </li>
>-
>-    [% ELSE %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                MARC frameworks
>-            </a>
>-        </li>
>-    [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>index 5549d1f8b9..6598a6b8d9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt
>@@ -27,22 +27,22 @@
>             <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a>
>         </li>
> 
>-    [% IF ( unknownbiblionumber ) %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Unknown record
>-            </a>
>-        </li>
>-    [% ELSE %]
>-        <li>
>-            [% INCLUDE 'biblio-title.inc' link = 1 %]
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                MARC details
>-            </a>
>-        </li>
>-    [% END %]
>+        [% IF ( unknownbiblionumber ) %]
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Unknown record
>+                </a>
>+            </li>
>+        [% ELSE %]
>+            <li>
>+                [% INCLUDE 'biblio-title.inc' link = 1 %]
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    MARC details
>+                </a>
>+            </li>
>+        [% END %]
>     </ol>
> </nav>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>index d1ec367101..e86d3e1ed3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
>@@ -28,21 +28,21 @@
>         </li>
> 
>         [% IF ( run_report ) %]
>-        <li>
>-            <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Results
>-            </a>
>-        </li>
>+            <li>
>+                <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a>
>+            </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Results
>+                </a>
>+            </li>
> 
>         [% ELSE %]
>-        <li>
>-            <a href="#" aria-current="page">
>-                Holds queue
>-            </a>
>-        </li>
>+            <li>
>+                <a href="#" aria-current="page">
>+                    Holds queue
>+                </a>
>+            </li>
>         [% END %]
>     </ol>
> </nav>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 27846: 118016 | 118569 | 118570 | 118571 | 118573 | 118576 | 118626 | 118627 | 118628 | 118630 | 118631 | 118632 | 118633 | 118636 | 118637 | 118638 | 118639 | 118640 | 118641 | 118642 | 118643 | 118717 | 118718 | 118719 | 118720 | 118721 | 118722 | 118723 | 118724 | 118725 | 118726 | 118727 | 118728 | 118729 | 118730 | 118731 | 118732 | 118738 | 118739 | 118740 | 118744 | 118745 | 118746 | 118747 | 118748 | 118749 | 118750 | 118751 | 118752 | 118753 | 118754 | 118755 | 118756 | 118757 | 118758 | 118759 | 118760 | 118761 | 118767 | 118770