From a9c7799b3b7afe12958df579c7fc8032ee01d89c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 2 May 2018 14:06:23 +0000 Subject: [PATCH] Bug 21304: Update two-column templates with Bootstrap grid: Catalog This patch modifies several catalog templates to use the Bootstrap grid instead of YUI. This patch also removes obsolete "text/javascript" attributes from diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt index e549122ef0..7034199f20 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tt @@ -25,14 +25,15 @@ [% END %] -
+
+
+
+
[% IF ( unknownbiblionumber ) %]
The record you requested does not exist ([% biblionumber | html %]).
[% ELSE %] -
-
-
+ [% INCLUDE 'cat-toolbar.inc' %] [% UNLESS ( popup ) %] @@ -168,19 +169,26 @@ [% END %]
-
-
-
-[% INCLUDE 'biblio-view-menu.inc' %] -
+ +
+
+ +
+ +
+
+ [% END %] -
+ + [% MACRO jsinclude BLOCK %] [% INCLUDE 'catalog-strings.inc' %] [% Asset.js("js/catalog.js") | $raw %] [% INCLUDE 'browser-strings.inc' %] [% Asset.js("js/browser.js") | $raw %] - diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 4bd6402659..1cc6193466 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -32,14 +32,14 @@ › Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]
-
-
-
-
+
+
+
+
[% IF ( outer_sup_results_loop ) %] -
-
+
+
[% END %] [% IF ( koha_spsuggest ) %] @@ -594,7 +594,7 @@ [% END %] [% IF ( outer_sup_results_loop ) %]
-
+
[% FOREACH outer_sup_results_loo IN outer_sup_results_loop %] [% IF ( outer_sup_results_loo.inner_sup_results_loop ) %] @@ -622,19 +622,22 @@ -
-
-
-[% INCLUDE 'facets.inc' %] -
-
+
+
+ +
+ +
+
[% MACRO jsinclude BLOCK %] [% INCLUDE 'browser-strings.inc' %] [% Asset.js("js/browser.js") | $raw %] [% Asset.js("lib/hc-sticky.js") | $raw %] [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] - -- 2.11.0