Bugzilla – Attachment 14558 Details for
Bug 9360
Clean borrowers tool wording and layout problematic
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
bug 9360 - Clean borrowers tool wording and layout problematic
bug-9360---Clean-borrowers-tool-wording-and-layout.patch (text/plain), 11.99 KB, created by
Jonathan Druart
on 2013-01-14 09:04:53 UTC
(
hide
)
Description:
bug 9360 - Clean borrowers tool wording and layout problematic
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2013-01-14 09:04:53 UTC
Size:
11.99 KB
patch
obsolete
>From e36ac8ecdaa144fee18ac5b9d126364e7c11a91d Mon Sep 17 00:00:00 2001 >From: Liz Rea <liz@catalyst.net.nz> >Date: Tue, 8 Jan 2013 16:51:45 +1300 >Subject: [PATCH] bug 9360 - Clean borrowers tool wording and layout > problematic > >To test: > >Verify that the text has been changed to "Batch patron deletion/anonymization in the following places: > >* tools-home >* the page title >* the heading on cleanborrowers >* the menu on cleanborrowers > >Verify that the tool still works as intended. > >This (finally) fixes the things Owen pointed out. >changes check-out to checkout per Galen. > >Signed-off-by: Marc Veron <veron@veron.ch> >Behaves as expected. > >Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> >Fix indentation and tabulations characters >--- > .../intranet-tmpl/prog/en/includes/tools-menu.inc | 2 +- > .../prog/en/modules/tools/cleanborrowers.tt | 124 +++++++++++--------- > .../prog/en/modules/tools/tools-home.tt | 4 +- > 3 files changed, 72 insertions(+), 58 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >index c209de4..e4fd8c7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc >@@ -33,7 +33,7 @@ > <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li> > [% END %] > [% IF ( CAN_user_tools_delete_anonymize_patrons ) %] >- <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Patrons (anonymize, bulk-delete)</a></li> >+ <li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Batch patron deletion/anonymization</a></li> > [% END %] > [% IF ( CAN_user_tools_edit_patrons ) %] > <li><a href="/cgi-bin/koha/tools/modborrowers.pl">Batch patron modification</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >index 5aa1865..7e1fc97 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Tools › Clean patron records [% IF ( step2 ) %]› Confirm[% END %][% IF ( step3 ) %]› Finished[% END %]</title> >+<title>Koha › Tools › Batch patron deletion/anonymization [% IF ( step2 ) %]› Confirm[% END %][% IF ( step3 ) %]› Finished[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > <script type="text/javascript"> >@@ -42,47 +42,63 @@ > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › [% IF ( step1 ) %]Clean Patron Records[% ELSE %]<a href="/cgi-bin/koha/tools/cleanborrowers.pl">Clean patron records</a> › [% END %][% IF ( step2 ) %]Confirm[% END %][% IF ( step3 ) %]Finished[% END %]</div> > > <div id="doc3" class="yui-t2"> >- >- <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> > >-<h1>Delete some old patrons/Anonymize some check-out history</h1> >+ <div id="bd"> >+ <div id="yui-main"> >+ <div class="yui-b"> > >+<h1>Batch patron deletion/anonymization</h1> >+<div class="help"> >+ <p>This tool allows you to delete patrons and anonymize checkout history. For deleting patrons, any combination of limits can be used.</p> >+</div> > [% IF ( step1 ) %] > <!-- step 1 START --> > <div id="step1"> > <form name="f1" onsubmit="return checkForm(this);" action="/cgi-bin/koha/tools/cleanborrowers.pl" method="post"> > <fieldset> >- <legend>What do you want to do ?</legend> >- <h3><input id="checkborrower" type="checkbox" name="checkbox" value="borrower" /><label for="checkborrower"> Delete borrowers</label></h3> >- >- <label for="date1">Who have not borrowed since:</label> >- <input size="10" id="date1" name="filterdate1" type="text" class="datepicker" /> >- <span class="hint">[% INCLUDE 'date-format.inc' %]</span></p> >- >- <label for="borrower_dateexpiry">Whose expiration date is before:</label> >- <input size="10" id=borrower_dateexpiry" name="borrower_dateexpiry" type="text" class="datepicker" /> >- <span class="hint">[% INCLUDE 'date-format.inc' %]</span></p> >- >- <label for="borrower_categorycode">Whose patron category is:</label> >- <select id="borrower_categorycode" name="borrower_categorycode"> >- <option value="" selected="selected">Any</option> >- [% FOREACH bc IN borrower_categorycodes %] >- [% UNLESS bc.categorycode == 'S' %] >- <option value="[% bc.categorycode %]">[% bc.description %]</option> >- [% END %] >- [% END %] >- </select> >- >- <h3><input id="checkissue" type="checkbox" name="checkbox" value="issue" /><label for="checkissue"> Anonymize history</label></h3> >- <label for="date2">Anonymize check-out history older than</label> >- <input size="10" id="date2" name="filterdate2" type="text" class="datepicker" /> >- <span class="hint">[% INCLUDE 'date-format.inc' %]</span></p> >+ <legend>Delete patrons</legend> >+ <h3><input id="checkborrower" type="checkbox" name="checkbox" value="borrower" /><label for="checkborrower"> Verify you want to delete patrons</label></h3> >+ <br /> >+ <h5>Delete patrons who meet the following criteria:</h5> >+ <ul> >+ <li> >+ <label for="date1">who have not borrowed since:</label> >+ <input size="10" id="date1" name="filterdate1" type="text" class="datepicker" /> >+ <span class="hint">[% INCLUDE 'date-format.inc' %]</span> >+ </li> >+ <li> >+ <label for="borrower_dateexpiry">whose expiration date is before:</label> >+ <input size="10" id="borrower_dateexpiry" name="borrower_dateexpiry" type="text" class="datepicker" /> >+ <span class="hint">[% INCLUDE 'date-format.inc' %]</span> >+ </li> >+ <li> >+ <label for="borrower_categorycode">whose patron category is:</label> >+ <select id="borrower_categorycode" name="borrower_categorycode"> >+ <option value="" selected="selected">Any</option> >+ [% FOREACH bc IN borrower_categorycodes %] >+ [% UNLESS bc.categorycode == 'S' %] >+ <option value="[% bc.categorycode %]">[% bc.description %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ </li> >+ </ul> >+ </fieldset> >+ <fieldset> >+ <legend>Anonymize checkout history</legend> >+ <h3><input id="checkissue" type="checkbox" name="checkbox" value="issue" /><label for="checkissue"> Verify you want to anonymize patron checkout history</label></h3> >+ <br /> >+ <ul> >+ <li> >+ <label for="date2">Permanently delete checkout history older than</label> >+ <input size="10" id="date2" name="filterdate2" type="text" class="datepicker" /> >+ <span class="hint">[% INCLUDE 'date-format.inc' %]</span> >+ </li> >+ </ul> > > <!-- hidden here --> > <input type="hidden" name="step2" value="1" /> >- </fieldset> >+ </fieldset> > <fieldset class="action"><input type="submit" value="Next >>" /></fieldset> > </form> > </div> >@@ -95,36 +111,34 @@ > <form name="f2" action="/cgi-bin/koha/tools/cleanborrowers.pl" method="post" onsubmit="return checkForm2(this);"> > <fieldset> > <legend>Warnings</legend> >- >- <ul> >- <li>[% IF ( totalToDelete ) %][% totalToDelete %] [% ELSE %]0 [% END %] patrons will be deleted</li> >- <li>[% IF ( totalToAnonymize ) %][% totalToAnonymize %] [% ELSE %]0 [% END %] check-out history will be anonymized</li> >- </ul> >+ <ul> >+ <li>[% IF ( totalToDelete ) %][% totalToDelete %] [% ELSE %]0 [% END %] patrons will be deleted</li> >+ <li>[% IF ( totalToAnonymize ) %][% totalToAnonymize %] [% ELSE %]0 [% END %] checkout history will be anonymized</li> >+ </ul> > > <br /> > [% IF ( totalToDelete ) %] > <fieldset><legend>What do you want to do for deleted patrons?</legend> > <label for="delete">Permanently delete these patrons</label> > <input id="delete" type="radio" name="radio" value="delete" checked="checked" /> >- >+ > <label for="trash">Move these patrons to the trash</label> > <input id="trash" type="radio" name="radio" value="trash" /> > <input type="hidden" name="do_delete" value="[% totalToDelete %]" /></fieldset> > > [% END %] > [% IF ( totalToAnonymize ) %] >- >- Check-out history for [% totalToAnonymize %] patrons will be anonymized >+ Checkout history for [% totalToAnonymize %] patrons will be anonymized > <input type="hidden" name="do_anonym" value="[% totalToAnonymize %]" /> > [% END %] >- >+ > <input type="hidden" name="step3" value="1" /> > <input type="hidden" name="filterdate1" value="[% filterdate1 %]" /> > <input type="hidden" name="filterdate2" value="[% filterdate2 %]" /> > <input type="hidden" name="borrower_dateexpiry" value="[% borrower_dateexpiry %]" /> > <input type="hidden" name="borrower_categorycode" value="[% borrower_categorycode %]" /> > </fieldset> >- <fieldset class="action"><input type="submit" value="Finish" /> <a class="cancel" href="/cgi-bin/koha/tools/cleanborrowers.pl">Cancel</a></fieldset> >+ <fieldset class="action"><input type="submit" value="Finish" /> <a class="cancel" href="/cgi-bin/koha/tools/cleanborrowers.pl">Cancel</a></fieldset> > </form> > </div> > <!-- STEP 2 END --> >@@ -135,20 +149,20 @@ > > <div id="step3"> > >- [% IF ( do_delete ) %] >- [% IF ( trash ) %] >- <h4>[% TotalDel %] patrons have been successfully moved to trash</h4> >- [% ELSE %] >- <h4>[% TotalDel %] patrons have been successfully deleted</h4> >- [% END %] >- [% ELSE %] >- <h4>No patron records have been removed</h4> >- [% END %] >- [% IF ( do_anonym ) %] >- <h4>All patrons with checkouts older than [% filterdate1 %] have been anonymized</h4> >- [% ELSE %] >- <h4>No patron records have been anonymized</h4> >+ [% IF ( do_delete ) %] >+ [% IF ( trash ) %] >+ <h4>[% TotalDel %] patrons have been successfully moved to trash</h4> >+ [% ELSE %] >+ <h4>[% TotalDel %] patrons have been successfully deleted</h4> > [% END %] >+ [% ELSE %] >+ <h4>No patron records have been removed</h4> >+ [% END %] >+ [% IF ( do_anonym ) %] >+ <h4>All patrons with checkouts older than [% filterdate1 %] have been anonymized</h4> >+ [% ELSE %] >+ <h4>No patron records have been anonymized</h4> >+ [% END %] > > </div> > <!-- Step 3 END --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >index 52cc1e6..31124a9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >@@ -41,8 +41,8 @@ > [% END %] > > [% IF ( CAN_user_tools_delete_anonymize_patrons ) %] >- <dt><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Patrons (anonymize, bulk-delete)</a></dt> >- <dd>Delete old borrowers and anonymize circulation history (deletes borrower reading history)</dd> >+ <dt><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Batch patron deletion/anonymization</a></dt> >+ <dd>Batch delete patrons and delete patron circulation history</dd> > [% END %] > > [% IF ( CAN_user_tools_edit_patrons ) %] >-- >1.7.10.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 9360
:
14456
|
14473
|
14476
|
14507
|
14533
|
14534
|
14551
|
14554
| 14558