From 335dcffba7bd2a694d3893a3aa9ed2f017768340 Mon Sep 17 00:00:00 2001 From: Magnus Enger Date: Tue, 6 Aug 2013 16:00:01 +0200 Subject: [PATCH] Bug 10690 - Warn about trailing slashes in description of OPACBaseURL and staffClientBaseURL The descriptions for OPACBaseURL and staffClientBaseURL are not explicit about including a trailing slash or not. This patch makes it explicit that the trailing slash should *not* be included. To test: - Apply the patch - Search for "baseurl" in the system preferences - Check that the description of both sysprefs includes a warning about not including a trailing slash. - Sign off If you want to check that the trailing slash is in fact superfluous you can do something like 'grep -r "BaseURL" *' and check that these sysprefs are usually concatenated with some string that starts with a slash. Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Changes to the description appear correctly on both system preferences. Signed-off-by: Galen Charlton (cherry picked from commit da40fe77fc471cfe8e797a7be5f87a506cf9d921) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 46144ea08fd15636c65eef4a094c70ae4eeab9fc) --- .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +- .../prog/en/modules/admin/preferences/staff_client.pref | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 2866f8d3d2..dec0727f09 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -9,7 +9,7 @@ OPAC: - "The OPAC is located at http://" - pref: OPACBaseURL class: url - - . (This must be filled in correctly for RSS, unAPI, and search plugins to work.) + - . Do not include a trailing slash in the URL. (This must be filled in correctly for RSS, unAPI, and search plugins to work.) - - Show - pref: LibraryName diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref index d9fc21a3bf..de47c3bec8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref @@ -9,7 +9,7 @@ Staff Client: - "The staff client is located at http://" - pref: staffClientBaseURL class: url - - . + - . Do not include a trailing slash in the URL. - - Include the stylesheet at - pref: intranetstylesheet -- 2.39.5