Owen Leonard
526af4ea07
Differences between circ-menu.tt and circ-menu.inc always crop up when a new menu item is added--usually only to circ-menu.inc as happened with Bug 9261. Other sidebar differences are present due to differences in the patron data passed by various patron-related script to their templates. This patch also irons out some of these inconsistencies. To test, apply the patch and check out to a patron whose record has more than just basic data: othername, country, patron attributes, street number, road types, etc. View the following pages and compare the patron data and visible tabs to confirm that they match: circ/circulation.pl?borrowernumber=X members/boraccount.pl?borrowernumber=X members/files.pl?borrowernumber=X members/mancredit.pl?borrowernumber=X members/maninvoice.pl?borrowernumber=X members/member-flags.pl?member=X members/member-password.pl?member=X members/moremember.pl?borrowernumber=X members/notices.pl?borrowernumber=X members/pay.pl?borrowernumber=X members/paycollect.pl?borrowernumber=X members/purchase-suggestions.pl?borrowernumber=X members/readingrec.pl?borrowernumber=X members/routing-lists.pl?borrowernumber=X members/statistics.pl?borrowernumber=X tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&src=circ&object=X The only difference I've found which is not fixed by this patch is the display of extended patron attributes in the sidebar of moremember.pl. This is a piecemeal fix for a problem which really deserves a centralized solution, but at least it gets us back to consistency for the moment. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Going through all tabs shows consistency is back. A mid term solution should implement this in a centralized way. Great job Owen! No koha-qa errors btw. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
89 lines
5.1 KiB
HTML
89 lines
5.1 KiB
HTML
[% IF ( borrowernumber ) %]
|
|
<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
|
|
<!--[if IE 6]>
|
|
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
|
|
}</style>
|
|
<![endif]-->
|
|
<ul class="patronbriefinfo">
|
|
[% IF ( patronimages ) %]
|
|
[% IF ( picture ) %]
|
|
<li><img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="max-width : 140px; margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC; width:auto !important; width:130px;" /></li>
|
|
[% ELSE %]
|
|
<li id="patronbasics"><img src="[% interface %]/[% theme %]/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
|
|
[% END %]
|
|
[% END %]
|
|
[% IF ( address or address2 ) %]
|
|
[% IF ( address ) %]
|
|
<li class="patronaddress1">[% address %]</li>
|
|
[% END %]
|
|
[% IF ( address2 ) %]
|
|
<li class="patronaddress2">[% address2 %]</li>
|
|
[% END %]
|
|
[% ELSE %]
|
|
<li><span class="empty" id="noaddressstored">No address stored.</span></li>
|
|
[% END %]
|
|
<li class="patroncity">[% IF ( city ) %]
|
|
[% city %][% IF ( state ) %], [% state %][% END %]
|
|
[% zipcode %][% IF ( country ) %], [% country %][% END %]
|
|
[% ELSE %]
|
|
<span class="empty" id="nocitystored">No city stored.</span>
|
|
[% END %]</li>
|
|
<li class="patronphone">[% IF ( phone ) %]
|
|
[% phone %]
|
|
[% ELSE %]
|
|
[% IF ( mobile ) %]
|
|
[% mobile %]
|
|
[% ELSE %]
|
|
[% IF ( phonepro ) %]
|
|
[% phonepro %]
|
|
[% ELSE %]
|
|
<span class="empty" id="nophonestored">No phone stored.</span>
|
|
[% END %]
|
|
[% END %]
|
|
[% END %]</li>
|
|
[% IF ( email ) %]
|
|
<li class="email"> <a href="mailto:[% email %]" title="[% email %]">[% email %]</a></li>
|
|
[% ELSE %]
|
|
[% IF ( emailpro ) %]
|
|
<li class="email"> <a href="mailto:[% emailpro %]" title="[% emailpro %]">[% emailpro %]</a></li>
|
|
[% ELSE %]
|
|
<li> <span class="empty">No email stored.</span> </li>
|
|
[% END %]
|
|
[% END %]
|
|
[% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN extendedattributes %]
|
|
[% IF ( extendedattribute.display_checkout ) %]
|
|
[% IF ( extendedattribute.value ) %]
|
|
<li class="patronattribute"><span class="patronattributelabel">[% extendedattribute.description %]</span> : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
|
|
[% END %]
|
|
[% END %]
|
|
[% END %][% END %]
|
|
<li class="patroncategory">Category: [% categoryname %] ([% categorycode %])</li>
|
|
<li class="patronlibrary">Home library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>
|
|
</ul></div>
|
|
<div id="menu">
|
|
<ul>
|
|
[% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
|
|
[% IF ( CAN_user_borrowers ) %]
|
|
[% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
|
|
[% END %]
|
|
[% IF ( CAN_user_updatecharges ) %]
|
|
[% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
|
|
[% END %]
|
|
[% IF ( RoutingSerials ) %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %]
|
|
[% IF ( intranetreadinghistory ) %]
|
|
[% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>
|
|
[% END %]
|
|
[% IF ( CAN_user_parameters ) %]
|
|
[% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&object=[% borrowernumber %]&src=circ">Modification log</a></li>
|
|
[% END %]
|
|
[% IF ( EnhancedMessagingPreferences ) %]
|
|
[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
|
|
[% END %]
|
|
[% IF ( statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">Statistics</a></li>
|
|
[% IF EnableBorrowerFiles %]
|
|
[% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
|
|
[% END %]
|
|
[% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
|
|
</ul></div>
|
|
[% END %]
|
|
|