Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

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

Browse source 
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Martin Renvoize 2019-05-03 06:41:44 +01:00 committed by Nick Clemens
parent c07aaf8aca
commit 77e91f34fc
2 changed files with 61 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
View file

@ -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 -%]

7
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
View file

@ -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>