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

Bug 7334: Improve 'no address stored' and similar messages in patron account 

- 'no address stored' is now only displayed when first and second line
  of the address are empty
- added id's to all 3 possible messages so people can change or hide
  them

To test:

1) Check 'no address stored' shows only up when address fields are both
   empty
2) Check address is still correctly displayed

Note: make sure you check the 'checkouts' and other tabs, because there
are 2 different include files used here.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I confirm the bug and the solution. Text messages identification for
customization with JavaScript is a plus.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(cherry picked from commit ac139f8f63)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This commit is contained in:
Katrin Fischer 2011-12-08 07:19:05 +01:00 committed by Chris Nighswonger
parent 3a42ff5d67
commit 436e55447c
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
View File

@ -12,19 +12,21 @@
<li><img src="/intranet-tmpl/prog/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 %]
<li>[% IF ( address ) %]
[% address %]
[% IF ( address or address2 ) %]
[% IF ( address ) %]
<li>[% address %]</li>
[% END %]
[% IF ( address2 ) %]
<li>[% address2 %]</li>
[% END %]
[% ELSE %]
<span class="empty">No address stored.</span>
[% END %]</li>
[% IF ( address2 ) %]
<li>[% address2 %]</li>
[% END %]<li>
<li><span class="empty" id="noadressstored">No address stored.</span></li>
[% END %]
[% IF ( city ) %]
[% city %][% IF ( state ) %], [% state %][% END %]
[% zipcode %][% IF ( country ) %], [% country %][% END %]
[% ELSE %]
<span class="empty">No city stored.</span>
<span class="empty" id="nocitystored">No city stored.</span>
[% END %]</li>
<li>[% IF ( phone ) %]
[% phone %]
@ -35,7 +37,7 @@
[% IF ( phonepro ) %]
[% phonepro %]
[% ELSE %]
<span class="empty">No phone stored.</span>
<span class="empty" id="nophonestored">No phone stored.</span>
[% END %]
[% END %]
[% END %]</li>

21
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
View File

@ -14,19 +14,22 @@ in the global namespace %]
<li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
[% END %]
[% END %]
<li>[% IF borrower.address %]
[% borrower.address %]
[% IF ( borrower.address or borrower.address2 ) %]
[% IF ( borrower.address ) %]
<li>[% borrower.address %]</li>
[% END %]
[% IF ( borrower.address2 ) %]
<li>[% borrower.address2 %]</li>
[% END %]
[% ELSE %]
<span class="empty">No address stored.</span>
[% END %]</li>
[% IF borrower.address2 %]
<li>[% borrower.address2 %]</li>
[% END %]<li>
<li><span class="empty" id="noaddressstored">No address stored.</span></li>
[% END %]
<li>
[% IF borrower.city %]
[% borrower.city %][% IF borrower.state %], [% borrower.state %][% END %]
[% borrower.zipcode %][% IF ( borrower.country ) %], [% borrower.country %][% END %]
[% ELSE %]
<span class="empty">No city stored.</span>
<span class="empty" id="nocitystored">No city stored.</span>
[% END %]</li>
<li>[% IF borrower.phone %]
[% borrower.phone %]
@ -37,7 +40,7 @@ in the global namespace %]
[% IF borrower.phonepro %]
[% borrower.phonepro %]
[% ELSE %]
<span class="empty">No phone stored.</span>
<span class="empty" id="nophonestored">No phone stored.</span>
[% END %]
[% END %]
[% END %]</li>