Bugzilla – Attachment 50414 Details for
Bug 3534
Patron quick add form
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 3534 - Fix tabs to spaces
Bug-3534---Fix-tabs-to-spaces.patch (text/plain), 41.76 KB, created by
Marc Véron
on 2016-04-19 14:37:39 UTC
(
hide
)
Description:
Bug 3534 - Fix tabs to spaces
Filename:
MIME Type:
Creator:
Marc Véron
Created:
2016-04-19 14:37:39 UTC
Size:
41.76 KB
patch
obsolete
>From 3af0bbc3c8d42a1478537ea62b1e8b9c24906f57 Mon Sep 17 00:00:00 2001 >From: Your Full Name <your_email> >Date: Tue, 19 Apr 2016 13:50:43 +0000 >Subject: [PATCH] Bug 3534 - Fix tabs to spaces >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Signed-off-by: Marc Véron <veron@veron.ch> >--- > .../prog/en/modules/members/memberentrygen.tt | 766 ++++++++++---------- > 1 file changed, 383 insertions(+), 383 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >index 8fc26e0..b30d935 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -8,126 +8,126 @@ > //<![CDATA[ > $(document).ready(function() { > >- [% IF categorycode %] >- update_category_code( "[% categorycode %]" ); >- [% ELSE %] >- if ( $("#categorycode_entry").length > 0 ){ >- var category_code = $("#categorycode_entry").find("option:selected").val(); >- update_category_code( category_code ); >- } >- [% END %] >- $("#dateofbirth").datepicker({ maxDate: "-1D", yearRange: "c-120:" }); >- dateformat = $("#dateofbirth").siblings(".hint").first().html(); >- write_age(); >- $("#entryform").validate({ >- rules: { >- email: { >- email: true >- }, >- emailpro: { >- email: true >- }, >- B_email: { >- email: true >- } >- }, >- submitHandler: function(form) { >- $("body, form input[type='submit'], form button[type='submit'], form a").addClass('waiting'); >- if (form.beenSubmitted) >- return false; >- else >- form.beenSubmitted = true; >- form.submit(); >- } >- }); >- >- var mrform = $("#manual_restriction_form"); >- var mrlink = $("#add_manual_restriction"); >- mrform.hide(); >- mrlink.on("click",function(e){ >- $(this).hide(); >- mrform.show(); >- e.preventDefault(); >- }); >- $("#cancel_manual_restriction").on("click",function(e){ >- $('#debarred_expiration').val(''); >- $('#add_debarment').val(0); >- $('#debarred_comment').val(''); >- mrlink.show(); >- mrform.hide(); >- e.preventDefault(); >- }); >+ [% IF categorycode %] >+ update_category_code( "[% categorycode %]" ); >+ [% ELSE %] >+ if ( $("#categorycode_entry").length > 0 ){ >+ var category_code = $("#categorycode_entry").find("option:selected").val(); >+ update_category_code( category_code ); >+ } >+ [% END %] >+ $("#dateofbirth").datepicker({ maxDate: "-1D", yearRange: "c-120:" }); >+ dateformat = $("#dateofbirth").siblings(".hint").first().html(); >+ write_age(); >+ $("#entryform").validate({ >+ rules: { >+ email: { >+ email: true >+ }, >+ emailpro: { >+ email: true >+ }, >+ B_email: { >+ email: true >+ } >+ }, >+ submitHandler: function(form) { >+ $("body, form input[type='submit'], form button[type='submit'], form a").addClass('waiting'); >+ if (form.beenSubmitted) >+ return false; >+ else >+ form.beenSubmitted = true; >+ form.submit(); >+ } >+ }); >+ >+ var mrform = $("#manual_restriction_form"); >+ var mrlink = $("#add_manual_restriction"); >+ mrform.hide(); >+ mrlink.on("click",function(e){ >+ $(this).hide(); >+ mrform.show(); >+ e.preventDefault(); >+ }); >+ $("#cancel_manual_restriction").on("click",function(e){ >+ $('#debarred_expiration').val(''); >+ $('#add_debarment').val(0); >+ $('#debarred_comment').val(''); >+ mrlink.show(); >+ mrform.hide(); >+ e.preventDefault(); >+ }); > }); > > function clear_entry(node) { >- var original = $(node).parent(); >- $("textarea", original).attr('value', ''); >- $("select", original).attr('value', ''); >+ var original = $(node).parent(); >+ $("textarea", original).attr('value', ''); >+ $("select", original).attr('value', ''); > } > > function clone_entry(node) { >- var original = $(node).parent(); >- var clone = original.clone(); >- >- var newId = 50 + parseInt(Math.random() * 100000); >- $("input,select,textarea", clone).attr('id', function() { >- return this.id.replace(/patron_attr_\d+/, 'patron_attr_' + newId); >- }); >- $("input,select,textarea", clone).attr('name', function() { >- return this.name.replace(/patron_attr_\d+/, 'patron_attr_' + newId); >- }); >- $("label", clone).attr('for', function() { >- return $(this).attr("for").replace(/patron_attr_\d+/, 'patron_attr_' + newId); >- }); >- $("input#patron_attr_" + newId, clone).attr('value',''); >- $("select#patron_attr_" + newId, clone).attr('value',''); >- $(original).after(clone); >- return false; >+ var original = $(node).parent(); >+ var clone = original.clone(); >+ >+ var newId = 50 + parseInt(Math.random() * 100000); >+ $("input,select,textarea", clone).attr('id', function() { >+ return this.id.replace(/patron_attr_\d+/, 'patron_attr_' + newId); >+ }); >+ $("input,select,textarea", clone).attr('name', function() { >+ return this.name.replace(/patron_attr_\d+/, 'patron_attr_' + newId); >+ }); >+ $("label", clone).attr('for', function() { >+ return $(this).attr("for").replace(/patron_attr_\d+/, 'patron_attr_' + newId); >+ }); >+ $("input#patron_attr_" + newId, clone).attr('value',''); >+ $("select#patron_attr_" + newId, clone).attr('value',''); >+ $(original).after(clone); >+ return false; > } > > function update_category_code(category_code) { >- if ( $(category_code).is("select") ) { >- category_code = $("#categorycode_entry").find("option:selected").val(); >- } >- var mytables = $(".attributes_table"); >- $(mytables).find("li").hide(); >- $(mytables).find(" li[data-category_code='"+category_code+"']").show(); >- $(mytables).find(" li[data-category_code='']").show(); >+ if ( $(category_code).is("select") ) { >+ category_code = $("#categorycode_entry").find("option:selected").val(); >+ } >+ var mytables = $(".attributes_table"); >+ $(mytables).find("li").hide(); >+ $(mytables).find(" li[data-category_code='"+category_code+"']").show(); >+ $(mytables).find(" li[data-category_code='']").show(); > } > > function select_user(borrowernumber, borrower) { >- var form = $('#entryform').get(0); >- if (form.guarantorid.value) { >- $("#contact-details").find('a').remove(); >- $("#contactname, #contactfirstname").parent().find('span').remove(); >- } >- >- var id = borrower.borrowernumber; >- form.guarantorid.value = id; >- $('#contact-details') >- .show() >- .find('span') >- .after('<a target="blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=' + id + '">' + id + '</a>'); >- >- $(form.contactname) >- .val(borrower.surname) >- .before('<span>' + borrower.surname + '</span>').get(0).type = 'hidden'; >- $(form.contactfirstname) >- .val(borrower.firstname) >- .before('<span>' + borrower.firstname + '</span>').get(0).type = 'hidden'; >- >- form.streetnumber.value = borrower.streetnumber; >- form.address.value = borrower.address; >- form.address2.value = borrower.address2; >- form.city.value = borrower.city; >- form.state.value = borrower.state; >- form.zipcode.value = borrower.zipcode; >- form.country.value = borrower.country; >- form.branchcode.value = borrower.branchcode; >- >- form.guarantorsearch.value = _("Change"); >- >- return 0; >+ var form = $('#entryform').get(0); >+ if (form.guarantorid.value) { >+ $("#contact-details").find('a').remove(); >+ $("#contactname, #contactfirstname").parent().find('span').remove(); >+ } >+ >+ var id = borrower.borrowernumber; >+ form.guarantorid.value = id; >+ $('#contact-details') >+ .show() >+ .find('span') >+ .after('<a target="blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=' + id + '">' + id + '</a>'); >+ >+ $(form.contactname) >+ .val(borrower.surname) >+ .before('<span>' + borrower.surname + '</span>').get(0).type = 'hidden'; >+ $(form.contactfirstname) >+ .val(borrower.firstname) >+ .before('<span>' + borrower.firstname + '</span>').get(0).type = 'hidden'; >+ >+ form.streetnumber.value = borrower.streetnumber; >+ form.address.value = borrower.address; >+ form.address2.value = borrower.address2; >+ form.city.value = borrower.city; >+ form.state.value = borrower.state; >+ form.zipcode.value = borrower.zipcode; >+ form.country.value = borrower.country; >+ form.branchcode.value = borrower.branchcode; >+ >+ form.guarantorsearch.value = _("Change"); >+ >+ return 0; > } > > function write_age() { >@@ -217,8 +217,8 @@ $(document).ready(function() { > [% IF ( opadd ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %] > > <div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> >+ <div id="yui-main"> >+ <div class="yui-b"> > [% IF error_alert %] > [% IF ( error_alert == "no_email" ) %] > <div class="error">This member has no email</div> >@@ -230,16 +230,16 @@ $(document).ready(function() { > <div class="dialog message">Email has been sent.</div> > [% END %] > >- [% IF ( no_add ) %]<div class="dialog alert"><h3>Cannot add patron</h3> >+ [% IF ( no_add ) %]<div class="dialog alert"><h3>Cannot add patron</h3> > [% IF ( no_branches ) %]<p><strong>There are no libraries defined.</strong> [% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/branches.pl">Please add a library.</a>[% ELSE %]An administrator must define at least one library.[% END %]</p>[% END %] > [% IF ( no_categories ) %]<p><strong>There are no patron categories defined.</strong> [% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/categories.pl">Please add a patron category.</a>[% ELSE %]An administrator must define at least one patron category.</p>[% END %][% END %]</div>[% END %] > >- [% UNLESS ( no_add ) %] >+ [% UNLESS ( no_add ) %] > <h1>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</h1> > >- [% IF ( check_member ) %] >- <div class="dialog alert"> >- <h3>Duplicate patron record?</h3> >+ [% IF ( check_member ) %] >+ <div class="dialog alert"> >+ <h3>Duplicate patron record?</h3> > <p><a class="popup" href="#" onclick="Dopop('moremember.pl?print=brief&borrowernumber=[% check_member %]');return false;" >View existing record</a></p> > <form action="/cgi-bin/koha/members/memberentry.pl" method="get"> > <input type="hidden" name="op" value="modify" /> >@@ -249,50 +249,50 @@ $(document).ready(function() { > </form> > > <form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off"> >- <input type="hidden" name="nodouble" value="1" /> >+ <input type="hidden" name="nodouble" value="1" /> > <button type="submit" class="new"><i class="fa fa-plus"></i> Not a duplicate. > Save as new record</button> >- </div> >- [% END %] >- >- [% IF ( nok ) %] >- <div class="dialog alert"> >- <p>The following fields are wrong. Please fix them.</p> >- <ul> >- [% IF ( ERROR_login_exist ) %] >- <li id="ERROR_login_exist">Username/password already exists.</li> >- [% END %] >+ </div> >+ [% END %] >+ >+ [% IF ( nok ) %] >+ <div class="dialog alert"> >+ <p>The following fields are wrong. Please fix them.</p> >+ <ul> >+ [% IF ( ERROR_login_exist ) %] >+ <li id="ERROR_login_exist">Username/password already exists.</li> >+ [% END %] > [% IF ERROR_cardnumber_already_exists %] > <li id="ERROR_cardnumber">Cardnumber already in use.</li> > [% END %] > [% IF ERROR_cardnumber_length %] > <li id="ERROR_cardnumber">Cardnumber length is incorrect.</li> > [% END %] >- [% IF ( ERROR_age_limitations ) %] >- <li id="ERROR_age_limitations">Patron's age is incorrect for their category. >+ [% IF ( ERROR_age_limitations ) %] >+ <li id="ERROR_age_limitations">Patron's age is incorrect for their category. > Ages allowed are [% age_low %]-[% age_high %].</li> >- [% END %] >- [% IF ( ERROR_branch ) %] >- <li id="ERROR_branch">Library is invalid.</li> >- [% END %] >- [% IF ( ERROR_dateofbirth ) %] >- <li id="ERROR_dateofbirth">Date of birth is invalid.</li> >- [% END %] >- [% IF ( ERROR_dateenrolled ) %] >- <li id="ERROR_dateenrolled">Date of enrollment is invalid.</li> >- [% END %] >- [% IF ( ERROR_dateexpiry ) %] >- <li id="ERROR_dateexpiry">Date of expiration is invalid.</li> >- [% END %] >- [% IF ( ERROR_short_password ) %] >- <li id="ERROR_short_password">Password must be at least [% minPasswordLength %] characters long.</li> >- [% END %] >- [% IF ( ERROR_password_mismatch ) %] >- <li id="ERROR_password_mismatch">Passwords do not match.</li> >- [% END %] >+ [% END %] >+ [% IF ( ERROR_branch ) %] >+ <li id="ERROR_branch">Library is invalid.</li> >+ [% END %] >+ [% IF ( ERROR_dateofbirth ) %] >+ <li id="ERROR_dateofbirth">Date of birth is invalid.</li> >+ [% END %] >+ [% IF ( ERROR_dateenrolled ) %] >+ <li id="ERROR_dateenrolled">Date of enrollment is invalid.</li> >+ [% END %] >+ [% IF ( ERROR_dateexpiry ) %] >+ <li id="ERROR_dateexpiry">Date of expiration is invalid.</li> >+ [% END %] >+ [% IF ( ERROR_short_password ) %] >+ <li id="ERROR_short_password">Password must be at least [% minPasswordLength %] characters long.</li> >+ [% END %] >+ [% IF ( ERROR_password_mismatch ) %] >+ <li id="ERROR_password_mismatch">Passwords do not match.</li> >+ [% END %] > [% IF ( ERROR_extended_unique_id_failed ) %] > <li id="ERROR_extended_unique_id_failed"><strong>[% ERROR_extended_unique_id_failed_description %]</strong> attribute value <i>[% ERROR_extended_unique_id_failed_value %]</i> is already in use by another patron record.</li> >- [% END %] >+ [% END %] > [% IF ERROR_bad_email %] > <li id="ERROR_bad_email">The primary email is invalid.</li> > [% END %] >@@ -302,9 +302,9 @@ $(document).ready(function() { > [% IF ERROR_bad_email_alternative %] > <li id="ERROR_bad_email_alternative">The alternative email is invalid.</li> > [% END %] >- </ul> >- </div> >- [% END %] >+ </ul> >+ </div> >+ [% END %] > > > [% UNLESS ( check_member ) %]<form name="form" id="entryform" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off" class='toggler' > >@@ -333,12 +333,12 @@ $(document).ready(function() { > > [% IF ( step_1 ) %] > [%UNLESS notitle && nosurname && nofirstname && nodateofbirth && noinitials && noothernames &&nosex %] >- <fieldset class="rows" id="memberentry_identity"> >- <legend id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend> >- <ol> >- [% UNLESS ( I ) %] >+ <fieldset class="rows" id="memberentry_identity"> >+ <legend id="identity_lgd">[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend> >+ <ol> >+ [% UNLESS ( I ) %] > [% UNLESS notitle %] >- [% IF ( title_cgipopup ) %] >+ [% IF ( title_cgipopup ) %] > <li> > [% IF ( mandatorytitle ) %] > <label for="btitle" class="required"> >@@ -349,26 +349,26 @@ $(document).ready(function() { > [% borrotitlepopup %] > [% IF ( mandatorytitle ) %]<span class="required">Required</span>[% END %] > </li> >- [% END %] > [% END %] >- [% END %] >+ [% END %] >+ [% END %] > [% UNLESS nosurname %] >- <li> >- [% IF ( mandatorysurname ) %] >- <label for="surname" class="required"> >- [% ELSE %] >- <label for="surname"> >- [% END %] >- Surname: </label> >- [% IF ( uppercasesurnames ) %] >+ <li> >+ [% IF ( mandatorysurname ) %] >+ <label for="surname" class="required"> >+ [% ELSE %] >+ <label for="surname"> >+ [% END %] >+ Surname: </label> >+ [% IF ( uppercasesurnames ) %] > <input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20" value="[% surname %]" /> >- [% ELSE %] >+ [% ELSE %] > <input type="text" id="surname" name="surname" size="20" value="[% surname %]" /> >- [% END %] >- [% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %] >- </li> > [% END %] >- [% UNLESS ( I ) %] >+ [% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] >+ [% UNLESS ( I ) %] > [% UNLESS nofirstname %] > <li> > [% IF ( mandatoryfirstname ) %] >@@ -394,7 +394,7 @@ $(document).ready(function() { > > [% IF ( mandatorydateofbirth ) %]<span class="required">Required</span>[% END %] > [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %] >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> > </li> > [% END %] > [% UNLESS noinitials %] >@@ -411,21 +411,21 @@ $(document).ready(function() { > [% END %] > [% END %] > [% UNLESS noothernames %] >- <li> >- [% IF ( mandatoryothernames ) %] >- <label for="othernames" class="required"> >- [% ELSE %] >- <label for="othernames"> >- [% END %] >+ <li> >+ [% IF ( mandatoryothernames ) %] >+ <label for="othernames" class="required"> >+ [% ELSE %] >+ <label for="othernames"> >+ [% END %] > Other name: </label> > <input type="text" id="othernames" name="othernames" size="20" value="[% UNLESS opduplicate %][% othernames %][% END %]" /> > [% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %] >- [% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %] >- </li> >+ [% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %] >+ </li> > [% END %] > [% UNLESS ( I ) %] > [% UNLESS nosex %] >- <li class="radio"> >+ <li class="radio"> > > [% UNLESS ( opduplicate ) %] > [% IF ( female ) %] >@@ -449,11 +449,11 @@ $(document).ready(function() { > <label for="sex-none">None specified </label><input type="radio" name="sex" id="sex-none" value="" checked="checked" /> > [% END %] > >- </li> >+ </li> > [% END %] > [% END %] >- </ol> >- </fieldset> >+ </ol> >+ </fieldset> > [% END # hide fieldset %] > > [% IF ( showguarantor ) %]<input type="hidden" id="guarantorid" name="guarantorid" value="[% guarantorid %]" /> >@@ -461,22 +461,22 @@ $(document).ready(function() { > <legend>Guarantor information</legend> > <ol> > [% IF ( P ) %] >- [% IF ( guarantorid ) %] >- <li id="contact-details"> >- [% ELSE %] >- <li id="contact-details" style="display: none"> >- [% END %] >- <span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %] >- </li> >- <li> >- <label for="contactname">Organization name: </label> >- [% IF ( guarantorid ) %] >- <span>[% contactname %]</span> >- <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" /> >- [% ELSE %] >+ [% IF ( guarantorid ) %] >+ <li id="contact-details"> >+ [% ELSE %] >+ <li id="contact-details" style="display: none"> >+ [% END %] >+ <span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %] >+ </li> >+ <li> >+ <label for="contactname">Organization name: </label> >+ [% IF ( guarantorid ) %] >+ <span>[% contactname %]</span> >+ <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" /> >+ [% ELSE %] > <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" /> >- [% END %] >- </li> >+ [% END %] >+ </li> > [% ELSE %] > [% IF ( C ) %] > [% IF ( guarantorid ) %] >@@ -572,7 +572,7 @@ $(document).ready(function() { > [% END %] > Primary phone: </label> > <input type="text" id="phone" name="phone" value="[% phone %]" /> >- [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div> >+ [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div> > > </li> > [% END %] >@@ -585,7 +585,7 @@ $(document).ready(function() { > [% END %] > Secondary phone: </label> > <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" /> >- [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %] >+ [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] > [% UNLESS nomobile %] >@@ -597,7 +597,7 @@ $(document).ready(function() { > [% END %] > Other phone: </label> > <input type="text" id="mobile" name="mobile" value="[% mobile %]" /> >- [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %] >+ [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] > [% UNLESS noemail %] >@@ -609,7 +609,7 @@ $(document).ready(function() { > [% END %] > Primary email: </label> > <input type="text" id="email" name="email" size="45" value="[% email %]" /> >- [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div> >+ [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div> > > </li> > [% END %] >@@ -622,7 +622,7 @@ $(document).ready(function() { > [% END %] > Secondary email: </label> > <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]" /> >- [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %] >+ [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] > [% UNLESS nofax %] >@@ -634,10 +634,10 @@ $(document).ready(function() { > [% END %] > Fax: </label> > <input type="text" id="fax" name="fax" value="[% fax %]" /> >- [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %] >+ [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] >- </ol> >+ </ol> > </fieldset> > [%END # hide fieldset %] > >@@ -771,240 +771,240 @@ $(document).ready(function() { > [% END %] > </li> > [% END %] >- </ol> >+ </ol> > </fieldset> > [% UNLESS nodateenrolled && noopacnote && noborrowernotes %] >- <fieldset class="rows" id="memberentry_subscription"> >- <legend id="library_setup_lgd">Library set-up</legend><ol> >+ <fieldset class="rows" id="memberentry_subscription"> >+ <legend id="library_setup_lgd">Library set-up</legend><ol> > [% UNLESS nodateenrolled %] >- <li> >- [% IF ( mandatorydateenrolled ) %] >+ <li> >+ [% IF ( mandatorydateenrolled ) %] > <label for="from" class="required"> >- [% ELSE %] >+ [% ELSE %] > <label for="from"> >- [% END %] >- Registration date: </label> >+ [% END %] >+ Registration date: </label> > [% IF ( dateformat == "metric" ) %] > <input type="text" id="from" name="dateenrolled" maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="[% dateenrolled %]" class="datepickerfrom" /> > [% ELSE %] > <input type="text" id="from" name="dateenrolled" maxlength="10" size="10" value="[% dateenrolled %]" class="datepickerfrom" /> > [% END %] >- [% IF ( mandatorydateenrolled ) %]<span class="required">Required</span>[% END %] >- [% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %] >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >+ [% IF ( mandatorydateenrolled ) %]<span class="required">Required</span>[% END %] >+ [% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %] >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> > [% END %] > [% UNLESS nodateexpiry %] >- <li> >+ <li> > [% ELSE %] > <li style="display:none"> > [% END %] >- [% IF ( mandatorydateexpiry ) %] >+ [% IF ( mandatorydateexpiry ) %] > <label for="to" class="required"> >- [% ELSE %] >+ [% ELSE %] > <label for="to"> >- [% END %] >- Expiry date (leave blank for auto calc): </label> >+ [% END %] >+ Expiry date (leave blank for auto calc): </label> > [% IF ( dateformat == "metric" ) %] >- [% UNLESS ( opadd ) %] >+ [% UNLESS ( opadd ) %] > <input type="text" id="to" name="dateexpiry" maxlength="10" size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="[% UNLESS opduplicate %][% dateexpiry %][% END %]" class="datepickerto" /> >- [% ELSE %] >+ [% ELSE %] > <input type="text" id="to" name="dateexpiry" maxlength="10" size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" class="datepickerto" /> >- [% END %] >- [% ELSE %] >- [% UNLESS ( opadd ) %] >+ [% END %] >+ [% ELSE %] >+ [% UNLESS ( opadd ) %] > <input type="text" id="to" name="dateexpiry" maxlength="10" size="10" value="[% UNLESS opduplicate %][% dateexpiry %][% END %]" class="datepickerto" /> >- [% ELSE %] >+ [% ELSE %] > <input type="text" id="to" name="dateexpiry" maxlength="10" size="10" class="datepickerto" /> >- [% END %] >- [% END %] >- [% IF ( mandatorydateexpiry ) %]<span class="required">Required</span>[% END %] >- [% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %] >- <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >- </li> >+ [% END %] >+ [% END %] >+ [% IF ( mandatorydateexpiry ) %]<span class="required">Required</span>[% END %] >+ [% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %] >+ <div class="hint">[% INCLUDE 'date-format.inc' %]</div> >+ </li> > [% UNLESS noopacnote %] >- <li> >- [% IF ( mandatoryopacnote ) %] >- <label for="opacnote" class="required"> >- [% ELSE %] >- <label for="opacnote"> >- [% END %] >- OPAC note: </label> >+ <li> >+ [% IF ( mandatoryopacnote ) %] >+ <label for="opacnote" class="required"> >+ [% ELSE %] >+ <label for="opacnote"> >+ [% END %] >+ OPAC note: </label> > <textarea id="opacnote" name="opacnote" cols="55" rows="5">[% UNLESS opduplicate %][% opacnote %][% END %]</textarea> >- <div class="hint">This message appears on this patron's user page in the OPAC</div> >- [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %] >- </li> >+ <div class="hint">This message appears on this patron's user page in the OPAC</div> >+ [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %] >+ </li> > [% END %] > [% UNLESS noborrowernotes %] >- <li> >- [% IF ( mandatoryborrowernotes ) %] >- <label for="borrowernotes" class="required"> >- [% ELSE %] >- <label for="borrowernotes"> >- [% END %] >- Circulation note: </label> >+ <li> >+ [% IF ( mandatoryborrowernotes ) %] >+ <label for="borrowernotes" class="required"> >+ [% ELSE %] >+ <label for="borrowernotes"> >+ [% END %] >+ Circulation note: </label> > <textarea id="borrowernotes" name="borrowernotes" cols="55" rows="5">[% UNLESS opduplicate %][% borrowernotes %][% END %]</textarea> >- <div class="hint">This message displays when checking out to this patron</div> >- [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %] >- </li> >+ <div class="hint">This message displays when checking out to this patron</div> >+ [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %] >+ </li> > [% END %] >- </ol> >- </fieldset> >+ </ol> >+ </fieldset> > [% END # hide fieldset %] > > [% UNLESS nouserid && nopassword %] >- <fieldset class="rows" id="memberentry_userid"> >+ <fieldset class="rows" id="memberentry_userid"> > <legend id="opac_staff_login_lgd">OPAC/Staff login</legend><ol> > [% UNLESS nouserid %] >- <li> >- [% IF ( mandatoryuserid ) %] >- <label for="userid" class="required"> >- [% ELSE %] >- <label for="userid"> >- [% END %] >- Username: </label> >+ <li> >+ [% IF ( mandatoryuserid ) %] >+ <label for="userid" class="required"> >+ [% ELSE %] >+ <label for="userid"> >+ [% END %] >+ Username: </label> > > [% IF ( NoUpdateLogin ) %] >- [% IF ( opduplicate ) %] >- <input type="text" id="userid" name="userid" size="20" disabled="disabled" /> >- [% ELSE %] >- <input type="text" id="userid" name="userid" size="20" disabled="disabled" value="[% userid %]" /> >- [% END %] >+ [% IF ( opduplicate ) %] >+ <input type="text" id="userid" name="userid" size="20" disabled="disabled" /> >+ [% ELSE %] >+ <input type="text" id="userid" name="userid" size="20" disabled="disabled" value="[% userid %]" /> >+ [% END %] > [% ELSE %] >- [% IF ( opduplicate ) %] >- <input type="text" id="userid" name="userid" size="20" value="" /> >- [% ELSE %] >- <input type="text" id="userid" name="userid" size="20" value="[% userid %]" /> >- [% END %] >+ [% IF ( opduplicate ) %] >+ <input type="text" id="userid" name="userid" size="20" value="" /> >+ [% ELSE %] >+ <input type="text" id="userid" name="userid" size="20" value="[% userid %]" /> >+ [% END %] > [% END %] > > [%# Dummy input to avoid Firefox from using userid/password saved for authentication %] > <input type="text" disabled="disabled" style="display:none" /> > >- [% IF ( mandatoryuserid ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% IF ( mandatoryuserid ) %]<span class="required">Required</span>[% END %] >+ </li> > [%END %] > [% UNLESS nopassword %] >- <li> >- [% IF ( mandatorypassword ) %] >- <label for="password" class="required"> >- [% ELSE %] >- <label for="password"> >- [% END %] >- Password: </label> >- [% IF ( opadd ) %] >- [% IF ( NoUpdateLogin ) %] >- [% IF ( opduplicate ) %] >- <input type="password" id="password" name="password" size="20" disabled="disabled" /> >- [% ELSE %] >- <input type="password" id="password" name="password" size="20" disabled="disabled" value="[% password %]" /> >- [% END %] >+ <li> >+ [% IF ( mandatorypassword ) %] >+ <label for="password" class="required"> >+ [% ELSE %] >+ <label for="password"> >+ [% END %] >+ Password: </label> >+ [% IF ( opadd ) %] >+ [% IF ( NoUpdateLogin ) %] >+ [% IF ( opduplicate ) %] >+ <input type="password" id="password" name="password" size="20" disabled="disabled" /> >+ [% ELSE %] >+ <input type="password" id="password" name="password" size="20" disabled="disabled" value="[% password %]" /> >+ [% END %] > [% ELSE %] >- [% IF ( opduplicate ) %] >- <input type="password" id="password" name="password" size="20" /> >- [% ELSE %] >- <input type="password" id="password" name="password" size="20" value="[% password %]" /> >- [% END %] >+ [% IF ( opduplicate ) %] >+ <input type="password" id="password" name="password" size="20" /> >+ [% ELSE %] >+ <input type="password" id="password" name="password" size="20" value="[% password %]" /> >+ [% END %] > [% END %] >- [% ELSE %] >- [% IF ( password ) %] >- [% IF ( NoUpdateLogin ) %] >- <input type="password" id="password" name="password" size="20" disabled="disabled" value="****" /> >- [% ELSE %] >- [% IF ( opduplicate ) %] >- <input type="password" id="password" name="password" size="20" /> >- [% ELSE %] >- <input type="password" id="password" name="password" size="20" value="****" /> >- [% END %] >- [% END %] >- [% ELSE %] >- [% IF ( NoUpdateLogin ) %] >- <input type="password" id="password" name="password" size="20" disabled="disabled" value="" /> >- [% ELSE %] >- <input type="password" id="password" name="password" size="20" value="" /> >- [% END %] >- [% END %] >- [% END %] >- [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_short_password ) %]<span class="required">Password is too short</span>[% END %] >+ [% ELSE %] >+ [% IF ( password ) %] >+ [% IF ( NoUpdateLogin ) %] >+ <input type="password" id="password" name="password" size="20" disabled="disabled" value="****" /> >+ [% ELSE %] >+ [% IF ( opduplicate ) %] >+ <input type="password" id="password" name="password" size="20" /> >+ [% ELSE %] >+ <input type="password" id="password" name="password" size="20" value="****" /> >+ [% END %] >+ [% END %] >+ [% ELSE %] >+ [% IF ( NoUpdateLogin ) %] >+ <input type="password" id="password" name="password" size="20" disabled="disabled" value="" /> >+ [% ELSE %] >+ <input type="password" id="password" name="password" size="20" value="" /> >+ [% END %] >+ [% END %] >+ [% END %] >+ [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_short_password ) %]<span class="required">Password is too short</span>[% END %] > [% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %] >- </li> >- <li> >- [% IF ( mandatorypassword ) %] >- <label for="password2" class="required"> >- [% ELSE %] >- <label for="password2"> >- [% END %] >- Confirm password: </label> >- [% IF ( opadd ) %] >- [% IF ( NoUpdateLogin ) %] >- [% IF ( opduplicate ) %] >- <input type="password" id="password2" name="password2" size="20" disabled="disabled" /> >- [% ELSE %] >- <input type="password" id="password2" name="password2" size="20" disabled="disabled" value="[% password %]" /> >- [% END %] >+ </li> >+ <li> >+ [% IF ( mandatorypassword ) %] >+ <label for="password2" class="required"> >+ [% ELSE %] >+ <label for="password2"> >+ [% END %] >+ Confirm password: </label> >+ [% IF ( opadd ) %] >+ [% IF ( NoUpdateLogin ) %] >+ [% IF ( opduplicate ) %] >+ <input type="password" id="password2" name="password2" size="20" disabled="disabled" /> >+ [% ELSE %] >+ <input type="password" id="password2" name="password2" size="20" disabled="disabled" value="[% password %]" /> >+ [% END %] > [% ELSE %] >- [% IF ( opduplicate ) %] >- <input type="password" id="password2" name="password2" size="20" /> >- [% ELSE %] >- <input type="password" id="password2" name="password2" size="20" value="[% password %]" /> >- [% END %] >+ [% IF ( opduplicate ) %] >+ <input type="password" id="password2" name="password2" size="20" /> >+ [% ELSE %] >+ <input type="password" id="password2" name="password2" size="20" value="[% password %]" /> >+ [% END %] > [% END %] >- [% ELSE %] >- [% IF ( password ) %] >- [% IF ( NoUpdateLogin ) %] >- <input type="password" id="password2" name="password2" size="20" disabled="disabled" value="****" /> >- [% ELSE %] >- [% IF ( opduplicate ) %] >- <input type="password" id="password2" name="password2" size="20" /> >- [% ELSE %] >- <input type="password" id="password2" name="password2" size="20" value="****" /> >- [% END %] >- [% END %] >- [% ELSE %] >- [% IF ( NoUpdateLogin ) %] >- <input type="password" id="password2" name="password2" size="20" disabled="disabled" value="" /> >- [% ELSE %] >- <input type="password" id="password2" name="password2" size="20" value="" /> >- [% END %] >- [% END %] >- [% END %] >- [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_password_mismatch ) %]<span class="required">Passwords do not match</span>[% END %] >- </li> >- </ol> >- </fieldset> >+ [% ELSE %] >+ [% IF ( password ) %] >+ [% IF ( NoUpdateLogin ) %] >+ <input type="password" id="password2" name="password2" size="20" disabled="disabled" value="****" /> >+ [% ELSE %] >+ [% IF ( opduplicate ) %] >+ <input type="password" id="password2" name="password2" size="20" /> >+ [% ELSE %] >+ <input type="password" id="password2" name="password2" size="20" value="****" /> >+ [% END %] >+ [% END %] >+ [% ELSE %] >+ [% IF ( NoUpdateLogin ) %] >+ <input type="password" id="password2" name="password2" size="20" disabled="disabled" value="" /> >+ [% ELSE %] >+ <input type="password" id="password2" name="password2" size="20" value="" /> >+ [% END %] >+ [% END %] >+ [% END %] >+ [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_password_mismatch ) %]<span class="required">Passwords do not match</span>[% END %] >+ </li> >+ </ol> >+ </fieldset> > [% END # hide fieldset %][% END %] >- <!--this zones are not necessary in modif mode --> >+ <!--this zones are not necessary in modif mode --> > [% UNLESS ( opadd || opduplicate ) %] >- <fieldset class="rows"> >+ <fieldset class="rows"> > <legend>Patron account flags</legend> >- <ol class="radio"> >- [% FOREACH flagloo IN flagloop %] >- <li><label class="radio" for="yes[% flagloo.name %]"> >+ <ol class="radio"> >+ [% FOREACH flagloo IN flagloop %] >+ <li><label class="radio" for="yes[% flagloo.name %]"> > [% IF ( flagloo.key == 'gonenoaddress' ) %]Gone no address:[% END %] > [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %] > </label> > [% IF CAN_user_circulate_manage_restrictions %] >- <label for="yes[% flagloo.name %]">Yes </label> >- [% IF ( flagloo.yes ) %] >- <input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" checked="checked" /> >- [% ELSE %] >- <input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" /> >- [% END %] >- <label for="no[% flagloo.name %]">No </label> >- [% IF ( flagloo.no ) %] >- <input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" checked="checked"/> >- [% ELSE %] >- <input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" /> >- [% END %] >+ <label for="yes[% flagloo.name %]">Yes </label> >+ [% IF ( flagloo.yes ) %] >+ <input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" checked="checked" /> >+ [% ELSE %] >+ <input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" /> >+ [% END %] >+ <label for="no[% flagloo.name %]">No </label> >+ [% IF ( flagloo.no ) %] >+ <input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" checked="checked"/> >+ [% ELSE %] >+ <input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" /> >+ [% END %] > [% ELSE %] > [% IF flagloo.yes %]Yes[% ELSE %]No[% END %] > [% END %] > > </li> >- [% END %] >+ [% END %] > >- </ol> >- </fieldset> >+ </ol> >+ </fieldset> > > <fieldset class="rows"> > <legend>Patron restrictions</legend> >@@ -1058,7 +1058,7 @@ $(document).ready(function() { > </fieldset> > [% END %] > </fieldset> >- [% END %] >+ [% END %] > > [% END %] > >@@ -1190,9 +1190,9 @@ $(document).ready(function() { > <input type="submit" name="save" onclick="return check_form_borrowers();" value="Save" /> > [% IF ( opadd ) %] > <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a> >- [% ELSE %] >- <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a> >- [% END %] >+ [% ELSE %] >+ <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a> >+ [% END %] > </fieldset> > [% END %] > >-- >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 3534
:
1396
|
50090
|
50091
|
50092
|
50093
|
50362
|
50410
|
50413
|
50414
|
50665
|
50666
|
50729
|
51382
|
51389
|
51445
|
51446
|
51960
|
51961
|
52192
|
52584
|
52585
|
52586
|
52934
|
52935
|
52936
|
52937
|
53109
|
53152
|
53171
|
53172
|
53173
|
53174
|
53175
|
84851