@@ -, +, @@ --- installer/data/mysql/atomicupdate/bug_31028.pl | 6 ++++++ installer/data/mysql/en/optional/sample_news.yml | 11 +++++++++++ .../prog/en/includes/modals/add_catalog_concern.inc | 8 +++++++- .../prog/en/modules/tools/additional-contents.tt | 2 +- .../bootstrap/en/includes/modals/catalog_concern.inc | 8 +++++++- 5 files changed, 32 insertions(+), 3 deletions(-) --- a/installer/data/mysql/atomicupdate/bug_31028.pl +++ a/installer/data/mysql/atomicupdate/bug_31028.pl @@ -62,5 +62,11 @@ return { } ); + $dbh->do( + q{ + INSERT INTO additional_contents ( category, code, location, title, content, lang, published_on ) VALUES ('html_customizations', 'CatalogConcernHelp_1', 'CatalogConcernHelp', '', 'Please describe your concern clearly and the library will try to deal with it as quickly as possible', 'default', CAST(NOW() AS date) ) + } + ); + }, } --- a/installer/data/mysql/en/optional/sample_news.yml +++ a/installer/data/mysql/en/optional/sample_news.yml @@ -55,3 +55,14 @@ tables: published_on: "2007-10-29 05:34:45" expirationdate: "2099-01-10" number: 2 + + - title: "" + category: "html_customizations" + location: "CatalogConcernHelp" + code: "CatalogConcernHelp_1" + content: + - "Please describe your concern clearly and the library will try to deal with it as quickly as possible" + lang: "default" + published_on: "2007-10-29 05:25:58" + expirationdate: "2099-01-10" + number: 1 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc @@ -1,3 +1,5 @@ +[% USE AdditionalContents %] +[% SET CatalogConcernHelp = AdditionalContents.get( location => "CatalogConcernHelp", lang => lang, library => logged_in_user.branchcode ) %]
A short summary of what the library policy is for dealing with such concerns and what constitutes a valid concern
+ [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%] + [% FOREACH help IN CatalogConcernHelp.content %] +[% help.content | $raw %]
+ [%- END -%] + [%- END -%] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -484,7 +484,7 @@ [% END %] [% END %] [% ELSE %] - [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo' ] %] + [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'CatalogConcernHelp' ] %] [% FOREACH l IN available_options.sort %] [% IF l == location %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc @@ -1,3 +1,5 @@ +[% USE AdditionalContents %] +[% SET CatalogConcernHelp = AdditionalContents.get( location => "CatalogConcernHelp", lang => lang, library => logged_in_user.branchcode || default_branch ) %]