From c537538a8c567141b522ae20cbb3b14056ca4564 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 25 May 2021 13:59:31 +0100
Subject: [PATCH] Bug 28442: Fix 'accessibility_advocate' for current release

The accessibility_advocate block was positioned incorrectly so wasn't
appearing properly for the current stable releases, only the
development/maintainter block.

This patch fixes that issue

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 3b427d79d69579d78a6bb2784edacc64aa781934)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit d7b4067d11d2c2301866ec63c0a94a6ce4845384)
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
---
 .../prog/en/includes/about-team.inc           | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
index fcf189b662..f0574958e7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
@@ -46,7 +46,7 @@
 [%- BLOCK team -%]
     <ul>
 
-        [% IF v == 'release' %]
+      [% IF v == 'release' %]
             <p>This is the team who were responsible for the initial release of your currently installed Koha version.</p>
 
             <li><strong>Release manager:</strong>
@@ -67,7 +67,7 @@
             </li>
             [% END %]
 
-        [% ELSE %]
+      [% ELSE %]
             <p>This is the team who are responsible for the next release of Koha and the ongoing maintenance of your
             currently installed Koha version. They will be in these roles up until <strong>[% t.release_date | $KohaDates %]</strong>, when the next
             team will be elected.</p>
@@ -95,7 +95,7 @@
                 [% END %]
               [% END %]
             [% END %]
-        [% END %]
+      [% END %]
 
         [% IF t.qa_manager %]
         <li><strong>Quality assurance manager:</strong>
@@ -197,7 +197,21 @@
         </li>
         [% END %]
 
-        [% IF v != 'release' %]
+        [% IF t.accessibility_advocates %]
+        <li><strong>Accessibility advocates:</strong>
+            <ul>
+                [% FOREACH a IN t.accessibility_advocates %]
+                <li>[% INCLUDE person p=a %]</li>
+                [% END %]
+            </ul>
+        </li>
+        [% ELSIF t.accessibility_advocate %]
+        <li><strong>Accessibility advocate:</strong>
+           [% INCLUDE person p=t.accessibility_advocate %]
+        </li>
+        [% END %]
+
+      [% IF v != 'release' %]
 
         <li><strong>Release manager:</strong>
             [% INCLUDE person p=t.manager %]
@@ -217,22 +231,7 @@
         </li>
         [% END %]
 
-        [% IF t.accessibility_advocate %]
-        <li><strong>Accessibility advocate:</strong>
-           [% INCLUDE person p=t.accessibility_advocate %]
-        </li>
-        [% ELSIF t.accessibility_advocates %]
-        <li><strong>Accessibility advocates:</strong>
-            <ul>
-                [% FOREACH a IN t.accessibility_advocates %]
-                <li>[% INCLUDE person p=a %]</li>
-                [% END %]
-            </ul>
-        </li>
-        [% END %]
-
-
-        [% ELSE %]
+      [% ELSE %]
         <li><strong>Release maintainers:</strong>
             <ul>
                 [% FOREACH m IN t.maintainer %]
@@ -255,6 +254,6 @@
                 [% END %]
             </ul>
         </li>
-        [% END %]
+      [% END %]
     </ul>
 [%- END -%]
-- 
2.20.1