@@ -, +, @@
---
.../prog/en/includes/about-team.inc | 75 ++++++++++++++-----
.../intranet-tmpl/prog/en/modules/about.tt | 7 +-
2 files changed, 61 insertions(+), 21 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc
@@ -44,22 +44,41 @@
[%- BLOCK team -%]
- - Release manager:
- [% INCLUDE person p=t.manager %]
-
+ [% IF v == 'release' %]
+ This is the team who were responsible for the initial release of your currently installed Koha version.
- [% IF t.manager_assistants %]
- - Release manager assistants:
-
- [% FOREACH a IN t.assistants %]
- - [% INCLUDE person p=a %]
- [% END %]
-
-
- [% ELSIF t.manager_assistant %]
- - Release manager assistant:
- [% INCLUDE person p=t.manager_assistant %]
-
+ - Release manager:
+ [% INCLUDE person p=t.manager %]
+
+
+ [% IF t.manager_assistants %]
+ - Release manager assistants:
+
+ [% FOREACH a IN t.manager_assistants %]
+ - [% INCLUDE person p=a %]
+ [% END %]
+
+
+ [% ELSIF t.manager_assistant %]
+ - Release manager assistant:
+ [% INCLUDE person p=t.manager_assistant %]
+
+ [% END %]
+
+ [% ELSE %]
+ 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 DATE, when the next
+ team will be elected.
+
+ - Release maintainer:
+
+ [% FOREACH m IN t.maintainer %]
+ [% IF m.version == v %]
+ - [% INCLUDE person p=m %]
+ [% END %]
+ [% END %]
+
+
[% END %]
[% IF t.qa_manager %]
@@ -79,13 +98,13 @@
[% END %]
[% IF t.documentation %]
- - Documentation Manager:
+
- Documentation manager:
[% INCLUDE person p=t.documentation %]
[% END %]
[% IF t.documentation_team %]
- - Documentation Team:
+
- Documentation team:
[% FOREACH doc_member IN t.documentation_team %]
- [% INCLUDE person p=doc_member %]
@@ -122,6 +141,27 @@
[% END %]
+ [% IF v != 'release' %]
+
+ - Release manager:
+ [% INCLUDE person p=t.manager %]
+
+
+ [% IF t.manager_assistants %]
+ - Release manager assistants:
+
+ [% FOREACH a IN t.manager_assistants %]
+ - [% INCLUDE person p=a %]
+ [% END %]
+
+
+ [% ELSIF t.manager_assistant %]
+ - Release manager assistant:
+ [% INCLUDE person p=t.manager_assistant %]
+
+ [% END %]
+
+ [% ELSE %]
- Release maintainers:
[% FOREACH m IN t.maintainer %]
@@ -129,6 +169,7 @@
[% END %]
+ [% END %]
[%- END -%]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -405,14 +405,13 @@
[% IF development_version %]
You are running a development version of Koha
[% ELSE %]
- [% INCLUDE team t=release_team %]
+ [% INCLUDE team t=release_team v='release' %]
[% END %]
-
Current maintainence team
-
- [% INCLUDE team t=maintenance_team %]
+ Current maintenance team
+ [% INCLUDE team t=maintenance_team v=short_version %]
--