Attachment 89715 Details for Bug 21626 – Bug 21626: (follow-up) Changes based on feedback

[patch] Bug 21626: (follow-up) Changes based on feedback

Bug-21626-follow-up-Changes-based-on-feedback.patch (text/plain), 5.25 KB, created by Katrin Fischer on 2019-05-13 21:36:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2019-05-13 21:36:06 UTC

Size: 5.25 KB

patch

obsolete

>From 7da435412805d0eda05d81037a65d3e9526e11c9 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 3 May 2019 06:41:44 +0100
>Subject: [PATCH] Bug 21626: (follow-up) Changes based on feedback
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../intranet-tmpl/prog/en/includes/about-team.inc  | 75 +++++++++++++++++-----
> koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |  7 +-
> 2 files changed, 61 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 e61d334ef8..b80182b649 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
>@@ -41,22 +41,41 @@
> [%- BLOCK team -%]
>     <ul>
> 
>-        <li><strong>Release manager:</strong>
>-            [% INCLUDE person p=t.manager %]
>-        </li>
>+        [% IF v == 'release' %]
>+            <p>This is the team who were responsible for the initial release of your currently installed Koha version.</p>
> 
>-        [% IF t.manager_assistants %]
>-        <li><strong>Release manager assistants:</strong>
>-            <ul>
>-                [% FOREACH a IN t.assistants %]
>-                <li>[% INCLUDE person p=a %]</li>
>-                [% END %]
>-            </ul>
>-        </li>
>-        [% ELSIF t.manager_assistant %]
>-        <li><strong>Release manager assistant:</strong>
>-            [% INCLUDE person p=t.manager_assistant %]
>-        </li>
>+            <li><strong>Release manager:</strong>
>+                [% INCLUDE person p=t.manager %]
>+            </li>
>+
>+            [% IF t.manager_assistants %]
>+            <li><strong>Release manager assistants:</strong>
>+                <ul>
>+                    [% FOREACH a IN t.manager_assistants %]
>+                    <li>[% INCLUDE person p=a %]</li>
>+                    [% END %]
>+                </ul>
>+            </li>
>+            [% ELSIF t.manager_assistant %]
>+            <li><strong>Release manager assistant:</strong>
>+                [% INCLUDE person p=t.manager_assistant %]
>+            </li>
>+            [% END %]
>+
>+        [% 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>DATE</strong>, when the next
>+            team will be elected.</p>
>+
>+            <li><strong>Release maintainer:</strong>
>+                <ul>
>+                  [% FOREACH m IN t.maintainer %]
>+                    [% IF m.version == v %]
>+                      <li>[% INCLUDE person p=m %]</li>
>+                    [% END %]
>+                  [% END %]
>+                </ul>
>+            </li>
>         [% END %]
> 
>         [% IF t.qa_manager %]
>@@ -76,13 +95,13 @@
>         [% END %]
> 
>         [% IF t.documentation %]
>-        <li><strong>Documentation Manager:</strong>
>+        <li><strong>Documentation manager:</strong>
>             [% INCLUDE person p=t.documentation %]
>         </li>
>         [% END %]
> 
>         [% IF t.documentation_team %]
>-        <li><strong>Documentation Team:</strong>
>+        <li><strong>Documentation team:</strong>
>             <ul>
>                 [% FOREACH doc_member IN t.documentation_team %]
>                 <li>[% INCLUDE person p=doc_member %]</li>
>@@ -119,6 +138,27 @@
>         </li>
>         [% END %]
> 
>+        [% IF v != 'release' %]
>+
>+        <li><strong>Release manager:</strong>
>+            [% INCLUDE person p=t.manager %]
>+        </li>
>+
>+        [% IF t.manager_assistants %]
>+        <li><strong>Release manager assistants:</strong>
>+            <ul>
>+                [% FOREACH a IN t.manager_assistants %]
>+                <li>[% INCLUDE person p=a %]</li>
>+                [% END %]
>+            </ul>
>+        </li>
>+        [% ELSIF t.manager_assistant %]
>+        <li><strong>Release manager assistant:</strong>
>+            [% INCLUDE person p=t.manager_assistant %]
>+        </li>
>+        [% END %]
>+
>+        [% ELSE %]
>         <li><strong>Release maintainers:</strong>
>             <ul>
>                 [% FOREACH m IN t.maintainer %]
>@@ -126,6 +166,7 @@
>                 [% END %]
>             </ul>
>         </li>
>+        [% END %]
> 
>     </ul>
> [%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>index 83dcfa27ad..ff235b589c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
>@@ -411,14 +411,13 @@
>                     [% IF development_version %]
>                         <p>You are running a development version of Koha</p>
>                     [% ELSE %]
>-                        [% INCLUDE team t=release_team %]
>+                        [% INCLUDE team t=release_team v='release' %]
>                     [% END %]
>                 </div>
> 
>                 <div class="col-md-6">
>-                    <h3>Current maintainence team</h3>
>-
>-                    [% INCLUDE team t=maintenance_team %]
>+                    <h3>Current maintenance team</h3>
>+                    [% INCLUDE team t=maintenance_team v=short_version %]
>                 </div>
>             </div>
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 21626: 80968 | 87776 | 87777 | 88483 | 88484 | 88880 | 88881 | 88882 | 88883 | 88884 | 88885 | 88886 | 88890 | 88891 | 89185 | 89186 | 89206 | 89207 | 89216 | 89217 | 89253 | 89281 | 89282 | 89283 | 89295 | 89296 | 89297 | 89298 | 89299 | 89307 | 89308 | 89309 | 89310 | 89311 | 89552 | 89553 | 89554 | 89555 | 89556 | 89557 | 89681 | 89682 | 89683 | 89684 | 89685 | 89686 | 89687 | 89690 | 89691 | 89692 | 89693 | 89694 | 89695 | 89696 | 89697 | 89698 | 89699 | 89700 | 89701 | 89702 | 89703 | 89704 | 89705 | 89713 | 89714 | 89715 | 89716 | 89717 | 89718 | 89719 | 89720 | 89750 | 89751 | 89752 | 89753 | 89754 | 89755 | 89756 | 89757 | 89758 | 89759 | 89771 | 89772 | 89773 | 89774 | 89775 | 89776 | 89777 | 89778 | 89779 | 89780