From 0a7cc3ec1758d6ecbb77ab9c625c1406e866d3a3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 1 May 2018 18:46:33 +0000 Subject: [PATCH] Bug 20739: Update two-column templates with Bootstrap grid, Administration part 3 This patch modifies several acquisitions 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/admin/checkmarc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt index db49419..38fbb6b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt @@ -12,11 +12,10 @@ -
- -
-
-
+
+
+
+

MARC bibliographic framework test

@@ -270,14 +269,15 @@

Configuration OK, you don't have errors in your MARC parameters table

[% END %] + + - - - -
-[% INCLUDE 'admin-menu.inc' %] -
- +
+ +
+ [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt index f7daa3c..c2256fd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -21,11 +21,10 @@ [% END %] -
- -
-
-
+
+
+
+
[% FOR m IN messages %]
@@ -137,12 +136,14 @@ [% IF cities.count %]
- - - - - - + + + + + + + + [% FOREACH city IN cities %] @@ -167,17 +168,20 @@ [% END %] [% END %] - - -
-[% INCLUDE 'admin-menu.inc' %] -
- + + + +
+ +
+ [% MACRO jsinclude BLOCK %] [% Asset.js("js/admin-menu.js") %] [% INCLUDE 'datatables.inc' %] -
City IDCityStateZIP/Postal codeCountryActions
City IDCityStateZIP/Postal codeCountryActions