From 58d3c94c89229535726e819b3d47d2fba9bbcae8 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> 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 <claire.gravely@bsz-bw.de> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> --- .../prog/en/modules/cataloguing/addbiblio.tt | 9 +++------ .../prog/en/modules/cataloguing/addbooks.tt | 7 +++---- .../prog/en/modules/cataloguing/merge.tt | 15 ++++++--------- .../prog/en/modules/cataloguing/moveitem.tt | 13 ++++++++++--- 4 files changed, 22 insertions(+), 22 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 2f31727fbd..6537c4d107 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() { <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › [% IF ( biblionumber ) %]Editing <em>[% title |html %]</em> (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %]</div> -<div id="doc" class="yui-t7"> - -<div id="bd"> - <div id="yui-main"> - <div class="yui-g"> +<div class="main container-fluid"> + <div class="row"> + <div class="col-md-10 col-md-offset-1"> <h1> [% IF ( biblionumber ) %]Editing <em>[% title |html %]</em> (Record number [% biblionumber %]) @@ -740,7 +738,6 @@ function Changefwk() { </form> -</div> </div> </div> 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 7305bd54b6..a0bcbcce07 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 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › Cataloging</div> -<div id="doc" class="yui-t7"> - - <div id="bd"> - <div id="yui-main"> +<div class="main container-fluid"> + <div class="row"> + <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] <div id="toolbar" class="btn-toolbar"> 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 c94d88de30..17e1edb6f9 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' %] <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › Merging records</div> -<div id="doc" class="yui-t7"> - -<div id="bd"> - <div id="yui-main"> - +<div class="main container-fluid"> + <div class="row"> + <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> <h1>Merging records</h1> [% IF ( result ) %] @@ -157,12 +155,12 @@ div#result { margin-top: 1em; } <form id="mergeform" action="/cgi-bin/koha/cataloguing/merge.pl" method="post" onsubmit="return mergeformsubmit()"> <div class="yui-g"> -<div class="yui-u first"> +<div class="col-sm-6"> [% PROCESS mergesource sourcerecords=records %] </div> -<div class="yui-u"> +<div class="col-sm-6"> [% PROCESS mergetarget %] -</div> <!-- .yui-u --> +</div> <!-- .col-sm-6 --> <input type="hidden" name="ref_biblionumber" value="[% ref_biblionumber %]" /> [% FOREACH record IN records %] @@ -182,7 +180,6 @@ div#result { margin-top: 1em; } [% END %] [% END %] -</div> </div> </div> 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 3e2f10eec0..5b2af012a8 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,15 @@ [% INCLUDE 'doc-head-open.inc' %] -<title>Attach an item to [% bibliotitle |html %]</title> +<title>Koha › Cataloging › Attach an item to [% bibliotitle | html %]</title> [% INCLUDE 'doc-head-close.inc' %] </head> <body id="catalog_moveitem" class="catalog"> [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] -<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › Attach an item to <i>[% bibliotitle |html %][% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle %][% END %]</i></div> -<div id="doc" class="yui-t7"> +<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a> › Attach an item to <i>[% bibliotitle | html %][% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle | html %][% END %]</i></div> + +<div class="main container-fluid"> + <div class="row"> + <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2"> [% BLOCK actions %] [% IF ( BiblioDefaultViewmarc ) %] @@ -90,4 +93,8 @@ [% END %] [% END %] [% END %] + + </div> +</div> + [% INCLUDE 'intranet-bottom.inc' %] -- 2.19.1