Bugzilla – Attachment 11706 Details for
Bug 3374
Display patron attributes in the same format as other patron data
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 3374 - Display patron attributes in the same format as other patron data
Bug-3374---Display-patron-attributes-in-the-same-f.patch (text/plain), 11.10 KB, created by
Owen Leonard
on 2012-08-20 16:25:42 UTC
(
hide
)
Description:
Bug 3374 - Display patron attributes in the same format as other patron data
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2012-08-20 16:25:42 UTC
Size:
11.10 KB
patch
obsolete
>From 4ef74cb61688de85ce939ba5bb6ea4ece6521910 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 27 Jul 2012 10:32:47 -0400 >Subject: [PATCH] Bug 3374 - Display patron attributes in the same format as > other patron data >Content-Type: text/plain; charset="utf-8" > >This patch revises the interface for displaying and editing >patron attributes so that it is consistent with other >similar interfaces. > >Display of patron attributes should match the display of other >kinds of patron data, and codes should be omitted in favor of >descriptions. > >Entry of patron attributes should match other patron entry >forms and should also omit codes in favor of descriptions. > >To test, view and edit patron attributes. Special functions >like "Clear" and "New" should function as before. >--- > .../intranet-tmpl/prog/en/css/staff-global.css | 17 ++++- > .../prog/en/modules/members/memberentrygen.tt | 74 +++++++------------- > .../prog/en/modules/members/moremember.tt | 36 ++++------ > koha-tmpl/intranet-tmpl/prog/img/clear-field.png | Bin 0 -> 279 bytes > koha-tmpl/intranet-tmpl/prog/img/clone-field.png | Bin 0 -> 262 bytes > 5 files changed, 55 insertions(+), 72 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/img/clear-field.png > create mode 100644 koha-tmpl/intranet-tmpl/prog/img/clone-field.png > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >index 436b728..49491f1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >@@ -634,8 +634,9 @@ fieldset.rows label, fieldset.rows span.label { > } > > fieldset.rows fieldset { >+ background-color: #FFF; > border-width : 1px; >- margin : 0 0 .5em 0; >+ margin : 1em; > padding : .3em; > } > >@@ -734,6 +735,10 @@ fieldset.action, div.action { > width: auto; > } > >+div.rows+div.rows { >+ margin-top : .6em; >+} >+ > div.rows { > float : left; > clear : left; >@@ -1184,6 +1189,16 @@ div.alert strong { > list-style-position:inside; > } > >+a.clear-field { >+ background : transparent url("../../img/clear-field.png") center left no-repeat; >+ padding-left : 16px; >+} >+ >+a.clone-field { >+ background : transparent url("../../img/clone-field.png") center left no-repeat; >+ padding-left : 20px; >+} >+ > a.document { > background-position : left middle; > background-repeat : no-repeat; >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 bd62f58..f4734c0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt >@@ -36,49 +36,39 @@ > }); > > function clear_entry(node) { >- var original = node.parentNode.parentNode; >+ var original = node.parentNode; > $("input[type=text]", original).attr('value', ''); > $("select", original).attr('value', ''); > } > > function clone_entry(node) { >- var original = node.parentNode.parentNode; >- var clone = original.cloneNode(true); >+ var original = $(node).parent(); >+ var clone = original.clone(); >+ > var newId = 50 + parseInt(Math.random() * 100000); >- $("input", clone).attr('id', function() { >+ $("input,select,textarea", clone).attr('id', function() { > return this.id.replace(/patron_attr_\d+/, 'patron_attr_' + newId); > }); >- $("input", clone).attr('name', function() { >+ $("input,select,textarea", clone).attr('name', function() { > return this.name.replace(/patron_attr_\d+/, 'patron_attr_' + newId); > }); >- $("select", clone).attr('id', function() { >- return this.id.replace(/patron_attr_\d+/, 'patron_attr_' + newId); >- }); >- $("select", 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.parentNode.insertBefore(clone, original.nextSibling); >+ $(original).after(clone); >+ return false; > } > > function update_category_code(category_code) { > if ( $(category_code).is("select") ) { > category_code = $("#categorycode").find("option:selected").val(); > } >- var mytables = $(".attributes_table>tbody"); >- >- mytables.find("tr").each(function(){ >- $(this).hide() >- }); >- >- mytables.find("tr[data-category_code="+category_code+"]").each(function(){ >- $(this).show(); >- }); >- mytables.find("tr[data-category_code='']").each(function(){ >- $(this).show(); >- }); >- >+ var mytables = $(".attributes_table"); >+ $(mytables).find("li").hide(); >+ $(mytables).find(" li[data-category_code="+category_code+"]").show(); >+ $(mytables).find(" li[data-category_code='']").show(); > } > > var MSG_SEPARATOR = _("Separator must be / in field "); >@@ -1345,24 +1335,13 @@ > <legend>Additional attributes and identifiers</legend> > [% FOREACH pa_loo IN patron_attributes %] > [% IF pa_loo.class %] >- <table id="aai_[% pa_loo.class %]" class="attributes_table"> >- <caption>[% pa_loo.lib %]</caption> >- [% ELSE %] >- <table id="aai" class="attributes_table"> >+ <fieldset id="aai_[% pa_loo.class %]"> >+ <legend>[% pa_loo.lib %]</legend> > [% END %] >- <thead> >- <tr> >- <th>Type</th> >- <th colspan="2">Value</th> >- </tr> >- </thead> >- <tbody> >+ <ol class="attributes_table"> > [% FOREACH patron_attribute IN pa_loo.items %] >- <tr data-category_code="[% patron_attribute.category_code %]"> >- <td> >- [% patron_attribute.code %] ([% patron_attribute.description %]) >- </td> >- <td> >+ <li data-category_code="[% patron_attribute.category_code %]"> >+ <label for="[% patron_attribute.form_id %]">[% patron_attribute.description %]: </label> > <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" /> > [% IF ( patron_attribute.use_dropdown ) %] > <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]"> >@@ -1389,20 +1368,17 @@ > [% END %] > [% END %] > [% IF ( patron_attribute.password_allowed ) %] >- (Password: <input type="password" maxlength="64" value="[% patron_attribute.password %]" >+ (<label class="yesno" for="[% patron_attribute.form_id %]_password">Password:</label> <input type="password" maxlength="64" value="[% patron_attribute.password %]" > id="[% patron_attribute.form_id %]_password" name="[% patron_attribute.form_id %]_password" />) > [% END %] >- </td> >- <td> >- <a href="#" onclick="clear_entry(this); return false;">Clear</a> >+ <a href="#" class="clear-field" onclick="clear_entry(this); return false;">Clear</a> > [% IF ( patron_attribute.repeatable ) %] >- <a href="#" onclick="clone_entry(this); return false;">New</a> >+ <a href="#" class="clone-field" onclick="clone_entry(this); return false;">New</a> > [% END %] >- </td> >- </tr> >+ </li> > [% END %] >- </tbody> >- </table> >+ </ol> >+ [% IF pa_loo.class %]</fieldset>[% END %] > [% END %] > </fieldset> > [% END %][% END %][% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >index b6df1b3..11bb33f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt >@@ -290,32 +290,24 @@ function validate1(date) { > <h3>Additional attributes and identifiers</h3> > [% FOREACH attribute IN attributes_loop %] > [% IF attribute.class %] >- <h4>[% attribute.lib %]</h4> >- <table id="aai_[% attribute.class %]"> >+ <div id="aai_[% attribute.class %]" class="rows"> > [% ELSE %] >- <table id="aai"> >+ <div id="aai" class="rows"> > [% END %] >- <thead> >- <tr> >- <th>Type</th> >- <th>Description</th> >- <th>Value</th> >- </tr> >- </thead> >- <tbody> >+ <h4>[% attribute.lib %]</h4> >+ <ol> > [% FOREACH item IN attribute.items %] >- <tr> >- <td>[% item.code %]</td> >- <td>[% item.description %]</td> >- <td>[% item.value %] >- [% IF ( item.value_description ) %] >- ([% item.value_description %]) >- [% END %] >- </td> >- </tr> >+ <li> >+ <span class="label">[% item.description %]: </span> >+ [% IF ( item.value_description ) %] >+ [% item.value_description %] >+ [% ELSE %] >+ [% item.value %] >+ [% END %] >+ </li> > [% END %] >- </tbody> >- </table> >+ </ol> >+ </div> > [% END %] > </div> > <div class="action"><a href="memberentry.pl?op=modify&borrowernumber=[% borrowernumber %]&step=4">Edit</a></div> >diff --git a/koha-tmpl/intranet-tmpl/prog/img/clear-field.png b/koha-tmpl/intranet-tmpl/prog/img/clear-field.png >new file mode 100644 >index 0000000000000000000000000000000000000000..80287bf8fbeb5d5085cddb5b73d838d970ac1dd9 >GIT binary patch >literal 279 >zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<w6XvX4FM)i?64!{5 >z;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6z90X`wF7cKN2ddPi_;<;h3{wh%P >zjIr_m|Nlk#V%mWU*h_-^f`MEhV36`=b^{8Pdb&7<RNP8RaAsy;Jkp@YAmAXu#K731 >z2xKHMs;NmFJjMoMiHV6BurW3;G-V{RFm{Lm8M6+aIm2Vhtk9sq#G}9<$iSgsaP-tE >uu44*7odJvxeG>10!aP82hXjxq1`J<%S!eGE3a9`&fWgz%&t;ucLK6Tp0Zjh@ > >literal 0 >HcmV?d00001 > >diff --git a/koha-tmpl/intranet-tmpl/prog/img/clone-field.png b/koha-tmpl/intranet-tmpl/prog/img/clone-field.png >new file mode 100644 >index 0000000000000000000000000000000000000000..702efb35de7c88b62456c4285bf058b3236f3cee >GIT binary patch >literal 262 >zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<w6XvX4FM)i?64!{5 >z;QX|b^2DN42FH~Aq*MjZ+{E<Mpwz^a%EFVWHb6x@0X`wFGiT0BOH2C?235b?+d+nv >z1o;I61sEK(R(=8U3p`yMLn>}1CAcv&Fdk{pV-RqVU}9iwQ3Ns^7}+csI2l+3JQ_H; >z4gf`2#1dMV)6yCknm7(zVPIuo;>clB7G@Sc!83uufuZrM;%WvCg${;El0X9<@-;9V >h5&-gf7?Bvv46gf_3S|`(WPo-vc)I$ztaD0e0suGuMLYli > >literal 0 >HcmV?d00001 > >-- >1.7.9.5
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 3374
:
1257
|
1258
|
1259
|
11706
|
11707
|
11708
|
11710