From f9761b5b0cf6d3f28c07393cc8e57850ac4b6aaa Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 2 Nov 2018 14:40:14 +0000 Subject: [PATCH] Bug 10662: (follow-up) Template corrections and improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch makes a number of corrections and improvements to the OAI harvester templates: - Add missing DataTables CSS include - Replace YUI grid with Bootstrap - Correct style of inline dialogs (.dialog.alert, .dialog.message) - Correct class of form hint and error messages - Format dates in saved and submitted requests tables - Add title-string sorting to DataTables configuration - Add delete confirmation to saved and submitted tables - Disable sorting on action columns - Style action links inside tables as buttons - Removed commented markup - Add missing JavaScript include (tools-menu.js) to highlight active section in sidebar menu - Add CodeMirror styling to record view page (CodeMirror XML mode file is added to enable this) - Remove invalid [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/record.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/record.tt index 4b2d217356..19a4d46927 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/record.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/record.tt @@ -1,23 +1,55 @@ +[% USE raw %] +[% USE Asset %] +[% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › OAI-PMH harvester › Downloaded record [% INCLUDE 'doc-head-close.inc' %] +[% Asset.css("lib/codemirror/codemirror.css") | $raw %] + [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] -
-
-
-
+ +
+
+
+
+

Downloaded record

[% IF ( record ) %] -
[% record | xml %]
+ [% END %] -
-
-
- [% INCLUDE 'tools-menu.inc' %] -
-
+ + +
+ +
+ +
+
+ +[% MACRO jsinclude BLOCK %] + [% Asset.js("js/tools-menu.js") | $raw %] + [% Asset.js("lib/codemirror/codemirror-compressed.js") | $raw %] + [% Asset.js( "lib/codemirror/xml.min.js" ) | $raw %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/request.tt index 78a878d6a6..676ed9b7d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/oai-pmh-harvester/request.tt @@ -4,7 +4,7 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Tools › OAI-PMH harvester › Request [% INCLUDE 'doc-head-close.inc' %] -