Bugzilla – Attachment 70678 Details for
Bug 19954
Update popup window templates to use Bootstrap grid: Patrons
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19954: Update popup window templates to use Bootstrap grid: Patrons
Bug-19954-Update-popup-window-templates-to-use-Boo.patch (text/plain), 5.69 KB, created by
Zoe Bennett
on 2018-01-18 03:56:48 UTC
(
hide
)
Description:
Bug 19954: Update popup window templates to use Bootstrap grid: Patrons
Filename:
MIME Type:
Creator:
Zoe Bennett
Created:
2018-01-18 03:56:48 UTC
Size:
5.69 KB
patch
obsolete
>From 4921154186c3dfd8e98e126fe9e00c8001577b2e Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 11 Jan 2018 18:16:39 +0000 >Subject: [PATCH] Bug 19954: Update popup window templates to use Bootstrap > grid: Patrons > >This patch updates two patron-related templates to use the >Bootstrap grid instead of the YUI grid. > >This patch also corrects an unrelated error in update-child.tt where >some JS variable declarations required by members-menu.js were >missing. > >To test you must have more than one adult-type patron category defined. > >- Locate and view a child-type patron record. >- From the "More" menu in the toolbar, choose "Update child to adult > patron." > - The popup window which appears should look correct and work > correctly. > - The table of patron categories should be sortable. >- Add a new patron and enter the first and last names of an existing > patron. > - When Koha asks to confirm a possible duplicate record, click the > "View existing record" link. The popup which is triggered should > look correct. >--- > .../prog/en/modules/members/moremember-brief.tt | 47 +++++++++++++--------- > .../prog/en/modules/members/update-child.tt | 21 ++++++---- > 2 files changed, 40 insertions(+), 28 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt >index 98b006a..0c2270a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt >@@ -4,26 +4,30 @@ > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Check duplicate patron</title> > [% INCLUDE 'doc-head-close.inc' %] >- <style type="text/css"> >- #custom-doc { width:44.23em;*width:43.12em;min-width:491px; margin:auto; text-align:left; } >- </style> > </head> >-<body id="pat_moremember-brief" class="pat" style="padding:.5em;"> >-<div id="custom-doc" class="yui-t7"> >- <div id="bd"> >+ >+<body id="pat_moremember-brief" class="pat"> >+ <div class="container-fluid"> >+ <div class="row"> >+ >+ <div class="col-xs-12"> > <h3>[% UNLESS ( I ) %] > [% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3> >-<div class="yui-g"> >-<div class="yui-u first"> >- <div id="patron-information" style="padding: .5em;"> >+ </div> >+ </div> >+ <div class="row"> >+ <div class="col-xs-6"> >+ <div id="patron-information"> > > [% UNLESS ( I ) %][% IF ( othernames ) %]“[% othernames %]”[% END %] > <div class = "address"> >- [% IF Koha.Preference( 'AddressFormat' ) %] >- [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] >- [% ELSE %] >- [% INCLUDE 'member-display-address-style-us.inc' %] >- [% END %] >+ <ul> >+ [% IF Koha.Preference( 'AddressFormat' ) %] >+ [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %] >+ [% ELSE %] >+ [% INCLUDE 'member-display-address-style-us.inc' %] >+ [% END %] >+ </ul> > </div> > <div class="rows"> > <ol> >@@ -49,9 +53,10 @@ > [% END %] > </ol> > </div> >- </div> >- </div> >- <div class="yui-u"> >+ </div> >+ </div> >+ >+ <div class="col-xs-6"> > <div id="patron-library-details"> > <h3>Library use</h3> > <div class="rows"> >@@ -74,10 +79,12 @@ > </ol> > </div> > </div> >- <fieldset class="action"><input type="button" class="close" value="Close window" /></fieldset> >- </div> >- </div> >+ </div> > </div> >+<div class="row"> >+ <div class="col-xs-12"> >+ <fieldset class="action"><input type="button" class="close" value="Close window" /></fieldset> >+ </div> > </div> > > [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >index 836b9a4..0511ae7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt >@@ -3,15 +3,10 @@ > <title>Koha › Choose adult category</title> > [% INCLUDE 'doc-head-close.inc' %] > <link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" /> >-<style type="text/css"> >- #custom-doc { width:29em;*width:28.3em;min-width:377px; margin:auto; text-align:left; } >-</style> > </head> > > <body id="pat_update-child" class="pat"> >- >-<div id="custom-doc" class="yui-t7"> >-<div id="bd"> >+ <div class="container-fluid"> > > [% IF ( MULTI ) %] > >@@ -53,12 +48,21 @@ > </form> > [% END %] > [% END %] >-</div> >+ > > [% MACRO jsinclude BLOCK %] >- <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> > [% INCLUDE 'datatables.inc' %] > <script type="text/javascript"> >+ >+ /* Set some variables needed in members-menu.js */ >+ var advsearch = "[% advsearch %]"; >+ var dateformat = "[% dateformat %]"; >+ var CAN_user_borrowers = "[% CAN_user_borrowers %]"; >+ var NorwegianPatronDBEnable = "[% NorwegianPatronDBEnable %]"; >+ var CATCODE_MULTI = "[% CATCODE_MULTI %]"; >+ var catcode = "[% catcode %]"; >+ var destination = "[% destination %]"; >+ > $(document).ready(function() { > $("#catst").dataTable($.extend(true, {}, dataTablesDefaults, { > "sDom": 't', >@@ -88,6 +92,7 @@ > window.close(); > </script> > [% END %] >+ <script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu.js"></script> > [% END %] > > [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >-- >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 19954
:
70435
|
70678
|
70679
|
71746
|
71754
|
71906