From 2e55bc500df2c7e10c14c5ce8a66985e41c7ea6c Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 19 Jan 2018 15:10:18 +0000 Subject: [PATCH] Bug 20044: Switch single-column templates to Bootstrap grid: Cataloging This patch updates several cataloging module templates to use the Bootstrap grid. - cataloguing/addbooks.tt - Cataloging - The main page and the cataloging search results page should look correct. - cataloguing/addbiblio.tt - Cataloging -> New record - The record edit page should look correct. - cataloguing/merge.tt - Cataloging -> Search -> Select two records to merge. The merge reference selection page should look correct, as well as the source/destination selection page. - cataloguing/moveitem.tt - Catalog -> Search -> View record -> Edit -> Attach item. The barcode submit form and confirmation screens should look correct. Signed-off-by: Claire Gravely --- .../prog/en/modules/cataloguing/addbiblio.tt | 9 +++------ .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 7 +++---- .../intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 15 ++++++--------- .../intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt | 12 ++++++++++-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 2f31727..6537c4d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -413,11 +413,9 @@ function Changefwk() { -
- -
-
-
+
+
+

[% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %]) @@ -742,6 +740,5 @@ function Changefwk() {

-
[% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index 7305bd5..a0bcbcc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -11,10 +11,9 @@ -
- -
-
+
+
+
[% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt index c94d88d..17e1edb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt @@ -18,11 +18,9 @@ div#result { margin-top: 1em; } [% INCLUDE 'cataloging-search.inc' %] -
- -
-
- +
+
+

Merging records

[% IF ( result ) %] @@ -157,12 +155,12 @@ div#result { margin-top: 1em; }
-
+
[% PROCESS mergesource sourcerecords=records %]
-
+
[% PROCESS mergetarget %] -
+
[% FOREACH record IN records %] @@ -184,7 +182,6 @@ div#result { margin-top: 1em; }
-
[% MACRO jsinclude BLOCK %] [% Asset.js("js/merge-record.js") %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt index 3e2f10e..d91869b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt @@ -1,12 +1,16 @@ [% INCLUDE 'doc-head-open.inc' %] -Attach an item to [% bibliotitle |html %] +Koha › Cataloging › Attach an item to [% bibliotitle |html %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] -
+ +
+
+
+ [% BLOCK actions %] [% IF ( BiblioDefaultViewmarc ) %] @@ -90,4 +94,8 @@ [% END %] [% END %] [% END %] + +
+
+ [% INCLUDE 'intranet-bottom.inc' %] -- 2.1.4