diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/wrapper-staff-tool-plugin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/wrapper-staff-tool-plugin.inc index 7bdf66083e..4e6461d7e0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/wrapper-staff-tool-plugin.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/wrapper-staff-tool-plugin.inc @@ -53,9 +53,9 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] [% IF ( method == 'tool' ) %] - [% SET 'dynamicaside' = 'tool-menu' %] + [% SET 'dynamicaside' = 'tools-menu' %] [% ELSIF (method == 'report' ) %] - [% SET 'dynamicaside' = 'tool-menu' %] + [% SET 'dynamicaside' = 'reports-menu' %] [% ELSE %] [% SET 'dynamicaside' = 'admin-menu' %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt index 005246cecf..773fe66794 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt @@ -30,6 +30,8 @@ [% WRAPPER breadcrumb_item %] [% IF ( method == 'tool' ) %] Tools + [% ELSIF ( method == 'report' ) %] + Reports [% ELSE %] Administration [% END %] @@ -40,269 +42,252 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -
-
-
-
- [% INCLUDE 'messages.inc' %] -

Plugins

+[% IF ( method == 'tool' ) %] + [% SET 'dynamicaside' = 'tools-menu' %] +[% ELSIF ( method == 'report' ) %] + [% SET 'dynamicaside' = 'reports-menu' %] +[% ELSE %] + [% SET 'dynamicaside' = 'admin-menu' %] +[% END %] +[% WRAPPER 'main-container.inc' aside=dynamicaside %] +

Plugins

-
- [% IF ( CAN_user_plugins_manage ) %] - - [% END %] - - [% IF search_errors %] -

Search errors

-
- [% FOREACH error IN search_errors %] -
Cannot search repository [% error.repo.name | html %]: [% error.error | html %]
- [% END %] -
- [% END %] - - [% IF search_results %] -

Search results

-
- - - - - - - - - - - - [% FOREACH sr IN search_results %] - - - - - - - - [% END %] -
NameDescriptionOrganizationLatest version 
[% sr.result.name | html %][% sr.result.description | html %][% sr.repo.name | html %][% sr.result.tag_name | html %] -
- [% INCLUDE 'csrf-token.inc' %] - - - - -
-
- [% END %] - - [% UNLESS ( plugins ) %] - [% UNLESS ( method ) %] -
No plugins installed
- [% ELSE %] - [% IF method == 'tool' %] -
No plugins that can be used as a tool are installed
- [% ELSIF method == 'report' %] -
No plugins that can create a report are installed
- [% ELSIF method == 'to_marc' %] -
No plugins that can convert files to MARC records are installed
- [% ELSIF method == 'opac_online_payment' %] -
No plugins that can process online payments via the public catalog are installed
- [% ELSIF method == 'intranet_catalog_biblio_enhancements' %] -
No plugins that can enhance the bibliographic records in the staff interface are installed
- [% ELSIF method == 'ill_availability_services' %] -
No plugins that can show ILL availability results are installed
- [% ELSIF method == 'ill_backend' %] -
No ILL backend plugins are installed
- [% ELSE %] -
Unknown plugin type [% method | html %]
- [% END %] - [% END %] - [% ELSE %] -
- - - - - - - - - - - - [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool || CAN_user_plugins_admin ) %] - - [% END %] - - - - [% FOREACH plugin IN plugins %] - - - [% UNLESS plugin.error %] - - [% ELSE %] - - [% END %] - - - - - - - [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] - - [% END %] - - [% END %] -
NameDescriptionAuthorPlugin versionMinimum Koha versionMaximum Koha versionLast updatedStatusActions
- [% UNLESS plugin.error %] - [% plugin.metadata.name | html %] - [% ELSE %] - [% plugin.name | html %] - ERRORS - [% END %] - - [% plugin.metadata.description | html %] - - [% IF ( plugin.metadata.minimum_version && koha_version < plugin.metadata.minimum_version ) %] -
Warning: This plugin was written for a newer version of Koha. Use at your own risk.
- [% END %] - - [% IF ( plugin.metadata.maximum_version && koha_version > plugin.metadata.maximum_version ) %] -
Warning: This plugin was written for an older version of Koha. Use at your own risk.
- [% END %] - 		- Error found whilst attempting to load plugin - [% plugin.metadata.author | html %][% plugin.metadata.version | html %][% plugin.metadata.minimum_version | html %][% plugin.metadata.maximum_version | html %][% plugin.metadata.date_updated | $KohaDates %] - [% IF ( plugin.is_enabled ) %] - Enabled - [% ELSE %] - Disabled - [% END %] - -
- Actions - -
-
- [% END %] -
-
-
- - -
- -
- + +
+ + +
+ + [% IF can_search %] +
+
+
+
+ +
+ +
+
+
+
+
+ [% END %] +
+ [% END %] + + [% IF search_errors %] +

Search errors

+
+ [% FOREACH error IN search_errors %] +
Cannot search repository [% error.repo.name | html %]: [% error.error | html %]
+ [% END %] +
+ [% END %] + + [% IF search_results %] +

Search results

+
+ + + + + + + + + + + + [% FOREACH sr IN search_results %] + + + + + + + + [% END %] +
NameDescriptionOrganizationLatest version 
[% sr.result.name | html %][% sr.result.description | html %][% sr.repo.name | html %][% sr.result.tag_name | html %] +
+ [% INCLUDE 'csrf-token.inc' %] + + + + +
+
+ [% END %] + + [% UNLESS ( plugins ) %] + [% UNLESS ( method ) %] +
No plugins installed
+ [% ELSE %] + [% IF method == 'tool' %] +
No plugins that can be used as a tool are installed
+ [% ELSIF method == 'report' %] +
No plugins that can create a report are installed
+ [% ELSIF method == 'to_marc' %] +
No plugins that can convert files to MARC records are installed
+ [% ELSIF method == 'opac_online_payment' %] +
No plugins that can process online payments via the public catalog are installed
+ [% ELSIF method == 'intranet_catalog_biblio_enhancements' %] +
No plugins that can enhance the bibliographic records in the staff interface are installed
+ [% ELSIF method == 'ill_availability_services' %] +
No plugins that can show ILL availability results are installed
+ [% ELSIF method == 'ill_backend' %] +
No ILL backend plugins are installed
+ [% ELSE %] +
Unknown plugin type [% method | html %]
+ [% END %] + [% END %] + [% ELSE %] +
+ + + + + + + + + + + + [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool || CAN_user_plugins_admin ) %] + + [% END %] + + + + [% FOREACH plugin IN plugins %] + + + [% UNLESS plugin.error %] + + [% ELSE %] + + [% END %] + + + + + + + [% IF ( CAN_user_plugins_configure || CAN_user_plugins_manage || CAN_user_plugins_report || CAN_user_plugins_tool ) %] + + [% END %] + + [% END %] +
NameDescriptionAuthorPlugin versionMinimum Koha versionMaximum Koha versionLast updatedStatusActions
+ [% UNLESS plugin.error %] + [% plugin.metadata.name | html %] + [% ELSE %] + [% plugin.name | html %] + ERRORS + [% END %] + + [% plugin.metadata.description | html %] + + [% IF ( plugin.metadata.minimum_version && koha_version < plugin.metadata.minimum_version ) %] +
Warning: This plugin was written for a newer version of Koha. Use at your own risk.
+ [% END %] + + [% IF ( plugin.metadata.maximum_version && koha_version > plugin.metadata.maximum_version ) %] +
Warning: This plugin was written for an older version of Koha. Use at your own risk.
+ [% END %] + 		+ Error found whilst attempting to load plugin + [% plugin.metadata.author | html %][% plugin.metadata.version | html %][% plugin.metadata.minimum_version | html %][% plugin.metadata.maximum_version | html %][% plugin.metadata.date_updated | $KohaDates %] + [% IF ( plugin.is_enabled ) %] + Enabled + [% ELSE %] + Disabled + [% END %] + +
+ Actions + +
+
+ [% END %]
- - - +[% END %] [% MACRO jsinclude BLOCK %] [% Asset.js("js/tools-menu.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt index 63916b2d6f..302ac2e27d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-upload.tt @@ -1,6 +1,7 @@ [% USE raw %] [% USE Koha %] [% PROCESS 'i18n.inc' %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] [% FILTER collapse %] @@ -9,12 +10,11 @@ [% END %] [% INCLUDE 'doc-head-close.inc' %] -[% INCLUDE 'calendar.inc' %] [% WRAPPER 'header.inc' %] - [% INCLUDE 'circ-search.inc' %] + [% INCLUDE 'prefs-admin-search.inc' %] [% END %] [% WRAPPER 'sub-header.inc' %] @@ -28,62 +28,55 @@ [% END #/ WRAPPER breadcrumbs %] [% END #/ WRAPPER sub-header.inc %] -
-
-
- [% INCLUDE 'messages.inc' %] - -

Upload plugin

- [% IF ( ERRORS ) %] -
- [% FOREACH ERROR IN ERRORS %] - [% IF ( ERROR.NOTKPZ ) %] -
  • The upload file does not appear to be a kpz file. The extension is not '.kpz'.
    • - [% ELSIF ( ERROR.NOWRITETEMP ) %] -
  • This script is not able to create/write to the necessary temporary directory.
    • - [% ELSIF ( ERROR.EMPTYUPLOAD ) %] -
  • The upload file appears to be empty.
    • - [% ELSIF ( ERROR.UZIPFAIL ) %] -
  • [% ERROR.UZIPFAIL | html %] failed to unpack.
    Please verify the integrity of the zip file and retry.
    • - [% ELSIF ( ERROR.NOWRITEPLUGINS ) %] -
  • Cannot unpack file to the plugins directory.
    Please verify that the Apache user can write to the plugins directory.
    • - [% ELSIF ( ERROR.RESTRICTED ) %] -
  • Cannot install plugin from unknown source whilst plugins_restricted is enabled.
    • - [% ELSE %] -
  • [% ERROR.CORERR | html %] An unknown error has occurred.
    Please review the error log for more details.
    • - [% END %] - [% END %] -
    +[% WRAPPER 'main-container.inc' %] +

    Upload plugin

    + [% IF ( ERRORS ) %] +
    + [% FOREACH ERROR IN ERRORS %] + [% IF ( ERROR.NOTKPZ ) %] +
  • The upload file does not appear to be a kpz file. The extension is not '.kpz'.
    • + [% ELSIF ( ERROR.NOWRITETEMP ) %] +
  • This script is not able to create/write to the necessary temporary directory.
    • + [% ELSIF ( ERROR.EMPTYUPLOAD ) %] +
  • The upload file appears to be empty.
    • + [% ELSIF ( ERROR.UZIPFAIL ) %] +
  • [% ERROR.UZIPFAIL | html %] failed to unpack.
    Please verify the integrity of the zip file and retry.
    • + [% ELSIF ( ERROR.NOWRITEPLUGINS ) %] +
  • Cannot unpack file to the plugins directory.
    Please verify that the Apache user can write to the plugins directory.
    • + [% ELSIF ( ERROR.RESTRICTED ) %] +
  • Cannot install plugin from unknown source whilst plugins_restricted is enabled.
    • + [% ELSE %] +
  • [% ERROR.CORERR | html %] An unknown error has occurred.
    Please review the error log for more details.
    • + [% END %] [% END %] - [% IF ( !plugins_restart ) %] -
    - Your system is not configured to automatically refresh on plugin upload, you may need to ask your administrator to complete the plugin installation. -
    - [% END %] -
    - [% INCLUDE 'csrf-token.inc' %] -
    -
    NOTE: Only KPZ file format is supported.
    -
      -
      2. -
    -
    -
    - - -
    -
    -
    -
    - + [% END %] + [% IF ( !plugins_restart ) %] +
    + Your system is not configured to automatically refresh on plugin upload, you may need to ask your administrator to complete the plugin installation. +
    + [% END %] +
    + [% INCLUDE 'csrf-token.inc' %] +
    +
    NOTE: Only KPZ file format is supported.
    +
      +
      2. +
    +
    +
    + + +
    +
    +[% END %] [% INCLUDE 'intranet-bottom.inc' %]