@@ -, +, @@
remove unwanted characters
- Removed merge marker
- Changed include path in favor of using the Asset tt plugin (bug 20538)
- Changed access_dir to a two-level entry for clarity
---
debian/templates/koha-conf-site.xml.in | 7 ++++++-
etc/koha-conf.xml | 7 ++++++-
.../intranet-tmpl/prog/en/modules/reports/reports-home.tt | 1 -
.../intranet-tmpl/prog/en/modules/tools/access_files.tt | 5 +++--
tools/access_files.pl | 15 +++++++++++++--
5 files changed, 28 insertions(+), 7 deletions(-)
--- a/debian/templates/koha-conf-site.xml.in
+++ a/debian/templates/koha-conf-site.xml.in
@@ -297,7 +297,12 @@ __END_SRU_PUBLICSERVER__
__API_SECRET__
-
+
--- a/etc/koha-conf.xml
+++ a/etc/koha-conf.xml
@@ -128,7 +128,12 @@ __PAZPAR2_TOGGLE_XML_POST__
CHANGEME
-
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
@@ -63,7 +63,6 @@
-<<<<<<< 3dd4c261c3d9d152edb12ead6b10b71b44418eab
Top lists
- Patrons with the most checkouts
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
@@ -1,8 +1,9 @@
+[% USE Asset %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
Report/log files
[% INCLUDE 'doc-head-close.inc' %]
-
+[% Asset.css("css/datatables.css") %]
[% INCLUDE 'header.inc' %]
@@ -52,7 +53,7 @@
[% MACRO jsinclude BLOCK %]
-
+ [% Asset.js("js/tools-menu.js") %]
[% INCLUDE 'datatables.inc' %]