Lines 203-217
Link Here
|
203 |
<dt><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share your usage statistics</a></dt> |
203 |
<dt><a href="/cgi-bin/koha/admin/usage_statistics.pl">Share your usage statistics</a></dt> |
204 |
<dd>Share with the Koha community the usage statistics of your Koha installation.</dd> |
204 |
<dd>Share with the Koha community the usage statistics of your Koha installation.</dd> |
205 |
[% END %] |
205 |
[% END %] |
206 |
<<<<<<< HEAD |
|
|
207 |
[% IF ( CAN_user_parameters_manage_mana ) %] |
206 |
[% IF ( CAN_user_parameters_manage_mana ) %] |
208 |
<dt><a href="/cgi-bin/koha/admin/share_content.pl">Share content with Mana KB</a></dt> |
207 |
<dt><a href="/cgi-bin/koha/admin/share_content.pl">Share content with Mana KB</a></dt> |
209 |
<dd>Share content (subscriptions, reports) with the Koha community</dd> |
208 |
<dd>Share content (subscriptions, reports) with the Koha community</dd> |
210 |
[% END %] |
209 |
[% END %] |
211 |
[% IF ( CAN_user_parameters_manage_additional_fields_baskets || CAN_user_parameters_manage_additional_fields_subscriptions ) %] |
|
|
212 |
======= |
213 |
[% IF ( CAN_user_parameters_manage_additional_fields ) %] |
210 |
[% IF ( CAN_user_parameters_manage_additional_fields ) %] |
214 |
>>>>>>> Bug 15774: Add permission for managing additional fields |
|
|
215 |
<dt><a href="/cgi-bin/koha/admin/additional-fields.pl">Additional fields</a></dt> |
211 |
<dt><a href="/cgi-bin/koha/admin/additional-fields.pl">Additional fields</a></dt> |
216 |
<dd>Add additional fields to certain tables</dd> |
212 |
<dd>Add additional fields to certain tables</dd> |
217 |
[% END %] |
213 |
[% END %] |