@@ -422,7 +452,7 @@
[% END %]
[% BLOCK locations_options %]
- [% IF category == 'news' %]
+ [% IF category == 'news' || category == 'pages' %]
[% IF location == "staff_and_opac" %]
+ [% UNLESS category == 'pages' %]
+ [% IF location == "slip" %]
+
+ [% END %]
[% END %]
[% ELSE %]
[% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote' ] %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt
new file mode 100644
index 0000000000..93d5d7d2eb
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/page.tt
@@ -0,0 +1,62 @@
+[% USE raw %]
+[% USE Asset %]
+[% SET footerjs = 1 %]
+[% INCLUDE 'doc-head-open.inc' %]
+
+[% INCLUDE 'doc-head-close.inc' %]
+
+
+
+ [% INCLUDE 'header.inc' %]
+ [% INCLUDE 'cat-search.inc' %]
+
+
+
+
+
+
+ [% IF page %]
+
+ [% page.title | html %]
+
+
+ [% page.content | $raw %]
+
+
+ [% ELSE %]
+
+
+ This page does not exist.
+
+
+ [% END %]
+
+
+
+
+
+
+
+
+
+[% MACRO jsinclude BLOCK %]
+ [% Asset.js("js/tools-menu.js") | $raw %]
+[% END %]
+
+[% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
index 7efa6aba1c..2ebca53c9e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt
@@ -121,6 +121,9 @@
HTML customizations
Write HTML customizations
+
+
Pages
+
Write custom pages
[% END %]
[% IF ( CAN_user_tools_schedule_tasks ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js b/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js
index 8fad270f87..fa8c1a6e2d 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/tools-menu.js
@@ -18,5 +18,7 @@
$('#navmenulist a[href$="/cgi-bin/koha/tools/stockrotation.pl"]').addClass("current");
} else if (path.indexOf("plugins") >= 0 ) {
$('#navmenulist a[href$="/cgi-bin/koha/plugins/plugins-home.pl?method=tool"]').addClass("current");
+ } else if (path.indexOf("page.pl") >= 0 ) {
+ $('#navmenulist a[href$="/cgi-bin/koha/tools/additional-contents.pl?category=pages"]').addClass("current");
}
});
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index 8850ee7927..3d7f3f4125 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -100,6 +100,7 @@
[% SET show_author = Koha.Preference('NewsAuthorDisplay') == 'opac' || Koha.Preference('NewsAuthorDisplay') == 'both' %]
[% FOREACH koha_new IN koha_news %]
+ [% IF koha_new.category == 'news' %]
[% END %]
+ [% END %]
[% UNLESS news_item %]