Bug 4041: Third step - Display address on patron's pages using the system preference

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / includes / circ-menu.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index fb283ec..fdd8da5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -4,31 +4,21 @@
 <style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
 }</style>
 <![endif]-->
-<ul>
-[% IF ( patronimages ) %]
-[% IF ( picture ) %]
-<li><img src="/cgi-bin/koha/members/patronimage.pl?crdnum=[% cardnumber | 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><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 %]
-    [% IF ( address or address2 ) %]
-        [% IF ( address ) %]
-            <li>[% address %]</li>
-        [% END %]
-        [% IF ( address2 ) %]
-            <li>[% address2 %]</li>
+<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 %]
-    [% ELSE %]
-            <li><span class="empty" id="noadressstored">No address stored.</span></li>
     [% END %]
-    <li>[% IF ( city ) %]
-            [% city %][% IF ( state ) %], [% state %][% END %]
-           [% zipcode %][% IF ( country ) %], [% country %][% END %]
+    [% IF Koha.Preference( 'addressformat' ) %]
+        [% INCLUDE "member-display-address-style-${ Koha.Preference( 'addressformat' ) }.inc" %]
     [% ELSE %]
-        <span class="empty" id="nocitystored">No city stored.</span>
-    [% END %]</li>
-    <li>[% IF ( phone ) %]
+        [% INCLUDE 'member-display-address-style-us.inc' %]
+    [% END %]
+
+    [% IF ( phone ) %]<li class="patronphone">
         [% phone %]
     [% ELSE %]
         [% IF ( mobile ) %]
@@ -36,29 +26,39 @@
         [% ELSE %]
             [% IF ( phonepro ) %]
                 [% phonepro %]
-            [% ELSE %]
-                <span class="empty" id="nophonestored">No phone stored.</span>
             [% END %]
-        [% END %]
-    [% END %]</li>
+        [% END %]</li>
+    [% END %]
     [% 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 %]
+
+    [% UNLESS ( address or address2 ) %]
+        <li><span class="empty" id="noaddressstored">No address stored.</span></li>
+    [% END %]
+    [% UNLESS ( city ) %]
+        <li><span class="empty" id="nocitystored">No city stored.</span></li>
+    [% END %]
+    [% UNLESS ( phone or mobile or phonepro) %]
+        <li> <span class="empty">No phone stored.</span></li>
+    [% END %]
+    [% UNLESS ( email or emailpro) %]
+        <li> <span class="empty">No email stored.</span></li>
+    [% END %]
+
     [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN extendedattributes %]
         [% IF ( extendedattribute.display_checkout ) %]
             [% IF ( extendedattribute.value ) %]
-                <li>[% extendedattribute.description %] : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
+                <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>Category: [% categoryname %] ([% categorycode %])</li>
-    <li>Home library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>
+    <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>
@@ -67,10 +67,11 @@
         [% 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/boraccount.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
+        [% 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 ) %]
+    <!-- Added check for borrowers permission as this is needed to access Cirulation History -->
+    [% IF ( intranetreadinghistory && CAN_user_borrowers ) %]
         [% 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 ) %]
@@ -79,10 +80,17 @@
     [% 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>
+    <!-- Added IF statement to check if user has borrowers permission. The menu item will not be shown unless user has borrowers permission  -->
+    [% IF ( CAN_user_borrowers ) %]
+        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">Statistics</a></li>
+    [% END %]
     [% 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 ( CAN_user_borrowers ) %]
+        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
+    [% END %]
 </ul></div>
 [% END %]