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

Return to bug 21626