gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Signed-off-by: Zoe Bennett <zoebennett1308@gmail.com>
Signed-off-by: Claire Gravely <claire.gravely@bsz-bw.de>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Owen Leonard 2018-01-11 18:16:39 +00:00 committed by Jonathan Druart
parent 466c46f4f6
commit a418f73cf5
2 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
View File

@ -4,26 +4,30 @@
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; 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 ) %]&ldquo;[% othernames %]&rdquo;[% 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 %]

22
koha-tmpl/intranet-tmpl/prog/en/modules/members/update-child.tt
View File

@ -3,15 +3,10 @@
<title>Koha &rsaquo; Choose adult category</title>
[% INCLUDE 'doc-head-close.inc' %]
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables_[% KOHA_VERSION %].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,22 @@
</form>
[% END %]
[% END %]
</div>
[% MACRO jsinclude BLOCK %]
<script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].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 CAN_user_borrowers_edit_borrowers = "[% CAN_user_borrowers_edit_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 +93,7 @@
window.close();
</script>
[% END %]
<script type="text/javascript" src="[% interface %]/[% theme %]/js/members-menu_[% KOHA_VERSION %].js"></script>
[% END %]
[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]