Bugzilla – Attachment 77216 Details for
Bug 20044
Switch single-column templates to Bootstrap grid: Cataloging
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20044: Switch single-column templates to Bootstrap grid: Cataloging
Bug-20044-Switch-single-column-templates-to-Bootst.patch (text/plain), 5.81 KB, created by
Owen Leonard
on 2018-07-24 13:32:57 UTC
(
hide
)
Description:
Bug 20044: Switch single-column templates to Bootstrap grid: Cataloging
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2018-07-24 13:32:57 UTC
Size:
5.81 KB
patch
obsolete
>From 2e55bc500df2c7e10c14c5ce8a66985e41c7ea6c 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> >--- > .../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() { > > <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 %]) >@@ -742,6 +740,5 @@ function Changefwk() { > > </div> > </div> >-</div> > > [% 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 @@ > > <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 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' %] > <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 %] >@@ -184,7 +182,6 @@ div#result { margin-top: 1em; } > > </div> > </div> >-</div> > > [% 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' %] >-<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 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 +94,8 @@ > [% END %] > [% END %] > [% END %] >+ >+ </div> >+</div> >+ > [% INCLUDE 'intranet-bottom.inc' %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20044
:
70751
|
71707
|
71909
|
72741
|
72743
|
73489
|
73490
|
77216
|
77217
|
77396
|
77451
|
77473
|
77555
|
77556
|
77557
|
77558
|
78336
|
78337
|
78338
|
78339
|
80433
|
80434
|
80435
|
80436