From 67ec2ead88c7d58f7977a206ad75f00eddef8095 Mon Sep 17 00:00:00 2001 From: Roch D'Amour Date: Mon, 23 Apr 2018 09:20:35 -0400 Subject: [PATCH] Bug 11317: (follow-up) Add two-level entry to koha-conf and 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 Test plans stay the same, just make sure that the two-level configuration entry work properly and everything pass QA. Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- debian/templates/koha-conf-site.xml.in | 7 ++++++- etc/koha-conf.xml | 7 ++++++- .../prog/en/modules/reports/reports-home.tt | 1 - .../prog/en/modules/tools/access_files.tt | 5 +++-- tools/access_files.pl | 15 +++++++++++++-- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in index 3c2aa46e44..0a4f02eeab 100644 --- a/debian/templates/koha-conf-site.xml.in +++ b/debian/templates/koha-conf-site.xml.in @@ -297,7 +297,12 @@ __END_SRU_PUBLICSERVER__ __API_SECRET__ - + diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml index 37b304c2db..1b50f77a45 100644 --- a/etc/koha-conf.xml +++ b/etc/koha-conf.xml @@ -128,7 +128,12 @@ __PAZPAR2_TOGGLE_XML_POST__ CHANGEME - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt index 86d58ba520..ea1d67b56d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt @@ -63,7 +63,6 @@ -<<<<<<< 3dd4c261c3d9d152edb12ead6b10b71b44418eab

Top lists

  • Patrons with the most checkouts
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt index 34e4922b81..316509892a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt +++ b/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' %]