View | Details | Raw Unified | Return to bug 21626
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/about-team.inc (-17 / +58 lines)
Lines 41-62 Link Here
41
[%- BLOCK team -%]
41
[%- BLOCK team -%]
42
    <ul>
42
    <ul>
43
43
44
        <li><strong>Release manager:</strong>
44
        [% IF v == 'release' %]
45
            [% INCLUDE person p=t.manager %]
45
            <p>This is the team who were responsible for the initial release of your currently installed Koha version.</p>
46
        </li>
47
46
48
        [% IF t.manager_assistants %]
47
            <li><strong>Release manager:</strong>
49
        <li><strong>Release manager assistants:</strong>
48
                [% INCLUDE person p=t.manager %]
50
            <ul>
49
            </li>
51
                [% FOREACH a IN t.assistants %]
50
52
                <li>[% INCLUDE person p=a %]</li>
51
            [% IF t.manager_assistants %]
53
                [% END %]
52
            <li><strong>Release manager assistants:</strong>
54
            </ul>
53
                <ul>
55
        </li>
54
                    [% FOREACH a IN t.manager_assistants %]
56
        [% ELSIF t.manager_assistant %]
55
                    <li>[% INCLUDE person p=a %]</li>
57
        <li><strong>Release manager assistant:</strong>
56
                    [% END %]
58
            [% INCLUDE person p=t.manager_assistant %]
57
                </ul>
59
        </li>
58
            </li>
59
            [% ELSIF t.manager_assistant %]
60
            <li><strong>Release manager assistant:</strong>
61
                [% INCLUDE person p=t.manager_assistant %]
62
            </li>
63
            [% END %]
64
65
        [% ELSE %]
66
            <p>This is the team who are responsible for the next release of Koha and the ongoing maintenance of your
67
            currently installed Koha version. They will be in these roles up until <strong>DATE</strong>, when the next
68
            team will be elected.</p>
69
70
            <li><strong>Release maintainer:</strong>
71
                <ul>
72
                  [% FOREACH m IN t.maintainer %]
73
                    [% IF m.version == v %]
74
                      <li>[% INCLUDE person p=m %]</li>
75
                    [% END %]
76
                  [% END %]
77
                </ul>
78
            </li>
60
        [% END %]
79
        [% END %]
61
80
62
        [% IF t.qa_manager %]
81
        [% IF t.qa_manager %]
Lines 76-88 Link Here
76
        [% END %]
95
        [% END %]
77
96
78
        [% IF t.documentation %]
97
        [% IF t.documentation %]
79
        <li><strong>Documentation Manager:</strong>
98
        <li><strong>Documentation manager:</strong>
80
            [% INCLUDE person p=t.documentation %]
99
            [% INCLUDE person p=t.documentation %]
81
        </li>
100
        </li>
82
        [% END %]
101
        [% END %]
83
102
84
        [% IF t.documentation_team %]
103
        [% IF t.documentation_team %]
85
        <li><strong>Documentation Team:</strong>
104
        <li><strong>Documentation team:</strong>
86
            <ul>
105
            <ul>
87
                [% FOREACH doc_member IN t.documentation_team %]
106
                [% FOREACH doc_member IN t.documentation_team %]
88
                <li>[% INCLUDE person p=doc_member %]</li>
107
                <li>[% INCLUDE person p=doc_member %]</li>
Lines 119-124 Link Here
119
        </li>
138
        </li>
120
        [% END %]
139
        [% END %]
121
140
141
        [% IF v != 'release' %]
142
143
        <li><strong>Release manager:</strong>
144
            [% INCLUDE person p=t.manager %]
145
        </li>
146
147
        [% IF t.manager_assistants %]
148
        <li><strong>Release manager assistants:</strong>
149
            <ul>
150
                [% FOREACH a IN t.manager_assistants %]
151
                <li>[% INCLUDE person p=a %]</li>
152
                [% END %]
153
            </ul>
154
        </li>
155
        [% ELSIF t.manager_assistant %]
156
        <li><strong>Release manager assistant:</strong>
157
            [% INCLUDE person p=t.manager_assistant %]
158
        </li>
159
        [% END %]
160
161
        [% ELSE %]
122
        <li><strong>Release maintainers:</strong>
162
        <li><strong>Release maintainers:</strong>
123
            <ul>
163
            <ul>
124
                [% FOREACH m IN t.maintainer %]
164
                [% FOREACH m IN t.maintainer %]
Lines 126-131 Link Here
126
                [% END %]
166
                [% END %]
127
            </ul>
167
            </ul>
128
        </li>
168
        </li>
169
        [% END %]
129
170
130
    </ul>
171
    </ul>
131
[%- END -%]
172
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-5 / +3 lines)
Lines 411-424 Link Here
411
                    [% IF development_version %]
411
                    [% IF development_version %]
412
                        <p>You are running a development version of Koha</p>
412
                        <p>You are running a development version of Koha</p>
413
                    [% ELSE %]
413
                    [% ELSE %]
414
                        [% INCLUDE team t=release_team %]
414
                        [% INCLUDE team t=release_team v='release' %]
415
                    [% END %]
415
                    [% END %]
416
                </div>
416
                </div>
417
417
418
                <div class="col-md-6">
418
                <div class="col-md-6">
419
                    <h3>Current maintainence team</h3>
419
                    <h3>Current maintenance team</h3>
420
420
                    [% INCLUDE team t=maintenance_team v=short_version %]
421
                    [% INCLUDE team t=maintenance_team %]
422
                </div>
421
                </div>
423
            </div>
422
            </div>
424
423
425
- 

Return to bug 21626