X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fincludes%2Fcirc-menu.inc;h=fb56a010166dcbe20d95c0f56dde509936f3a32d;hb=b8a2365a3455a70ef8bdcb99e74b419bc4572b96;hp=7c52ce5198392a42726087a33a169358ef57caf1;hpb=602bdbab4c6f86aa136158e1459d800d9530e243;p=srvgit

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 7c52ce5198..fb56a01016 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -1,5 +1,5 @@
 [% USE Koha %]
-[% IF ( borrowernumber ) %]
+[% IF ( patron.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);
@@ -7,48 +7,52 @@
 <![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>
+        [% IF ( patron.image ) %]
+            <li>
+                <img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber | uri %]" id="patronimage" alt="[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])" />
+            </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>
+            <li id="patronbasics">
+                <div></div>
+            </li>
         [% END %]
     [% END %]
-    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
-        [% CASE 'de' %]
-            [% INCLUDE 'member-display-address-style-de.inc' %]
-        [% CASE # us %]
-            [% INCLUDE 'member-display-address-style-us.inc' %]
+    [% IF Koha.Preference( 'AddressFormat' ) %]
+        [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+    [% ELSE %]
+        [% INCLUDE 'member-display-address-style-us.inc' %]
     [% END %]
 
-    [% IF ( phone ) %]<li class="patronphone">
-        [% phone %]
+    [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">
+    [% IF ( patron.phone ) %]
+        <a href="tel:[% patron.phone | url %]">[% patron.phone | html %]</a>
     [% ELSE %]
-        [% IF ( mobile ) %]
-            [% mobile %]
+        [% IF ( patron.mobile ) %]
+            <a href="tel:[% patron.mobile | url %]">[% patron.mobile | html %]</a>
         [% ELSE %]
-            [% IF ( phonepro ) %]
-                [% phonepro %]
+            [% IF ( patron.phonepro ) %]
+                <a href="tel:[% patron.phonepro | url %]">[% patron.phonepro | html %]</a>
             [% END %]
-        [% END %]</li>
-    [% END %]
-    [% IF ( email ) %]
-        <li class="email"> <a href="mailto:[% email %]" title="[% email %]">[% email %]</a></li>
+        [% END %]
+    [% END %]</li>[% END %]
+    [% IF ( patron.email ) %]
+        <li class="email"> <a href="mailto:[% patron.email | url %]" title="[% patron.email | html %]">[% patron.email | html %]</a></li>
     [% ELSE %]
-        [% IF ( emailpro ) %]
-            <li class="email"> <a href="mailto:[% emailpro %]" title="[% emailpro %]">[% emailpro %]</a></li>
+        [% IF ( patron.emailpro ) %]
+            <li class="email"> <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a></li>
         [% END %]
     [% END %]
 
-    [% UNLESS ( address or address2 ) %]
+    [% UNLESS ( patron.address or patron.address2 ) %]
         <li><span class="empty" id="noaddressstored">No address stored.</span></li>
     [% END %]
-    [% UNLESS ( city ) %]
+    [% UNLESS ( patron.city ) %]
         <li><span class="empty" id="nocitystored">No city stored.</span></li>
     [% END %]
-    [% UNLESS ( phone or mobile or phonepro) %]
+    [% UNLESS ( patron.phone or patron.mobile or patron.phonepro) %]
         <li> <span class="empty">No phone stored.</span></li>
     [% END %]
-    [% UNLESS ( email or emailpro) %]
+    [% UNLESS ( patron.email or patron.emailpro) %]
         <li> <span class="empty">No email stored.</span></li>
     [% END %]
 
@@ -59,53 +63,63 @@
             [% 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>
+    <li class="patroncategory">Category: [% patron.category.description %] ([% patron.categorycode %])</li>
+    <li class="patronlibrary">Home library: [% Branches.GetName( patron.branchcode ) %]</li>
+    <li class="patronborrowernumber">Borrowernumber: [% patron.borrowernumber %]</li>
+  </ul></div>
 <div id="menu">
 <ul>
     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
-        [% IF Koha.Preference('BatchCheckouts') &&
-              Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ categorycode _ '$').size > 0 %]
-          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&amp;batch=1">Batch check out</a></li>
+        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]">Check out</a></li>
+        [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ patron.categorycode _ '$').size > 0 %]
+          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]&amp;batch=1">Batch check out</a></li>
         [% END %]
     [% END %]
-    [% 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>
+    [% IF CAN_user_borrowers_edit_borrowers %]
+        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.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>
+        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Fines</a></li>
     [% END %]
     [% IF ( CAN_user_circulate_circulate_remaining_permissions  )  %]
-        [% 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 Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber %]">Routing lists</a></li>[% END %]
+    [% END %]
+    [% IF CAN_user_borrowers_edit_borrowers %]
+        [% IF ( intranetreadinghistory ) %]
+            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber %]">Circulation history</a></li>
+        [% END %]
     [% END %]
-    [% IF ( CAN_user_borrowers ) %]
+    [% IF CAN_user_borrowers_edit_borrowers %]
         [% IF ( intranetreadinghistory ) %]
-            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>
+            [% IF ( holdshistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/holdshistory.pl?borrowernumber=[% patron.borrowernumber %]">Holds history</a></li>
         [% END %]
     [% END %]
     [% IF ( CAN_user_parameters ) %]
-        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% borrowernumber %]&amp;src=circ">Modification log</a></li>
+        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% patron.borrowernumber %]&amp;src=circ">Modification log</a></li>
     [% END %]
-    [% IF ( CAN_user_borrowers ) %]
-	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
+    [% IF CAN_user_borrowers_edit_borrowers %]
+    [% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber %]">Notices</a></li>
     [% END %]
-    [% 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>
+    [% IF CAN_user_borrowers_edit_borrowers %]
+        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber %]">Statistics</a></li>
     [% END %]
-    [% IF ( CAN_user_borrowers ) %]
+    [% IF CAN_user_borrowers_edit_borrowers %]
         [% IF ( EnableBorrowerFiles ) %]
-            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
+            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber %]">Files</a></li>
         [% END %]
     [% 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>
+    [% IF CAN_user_acquisition_suggestions_manage %]
+        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber %]">Purchase suggestions</a></li>
+    [% END %]
+    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
+        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">Discharges</a></li>
     [% END %]
-    [% IF CAN_user_borrowers && useDischarge %]
-        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
+    [% IF Koha.Preference('HouseboundModule') %]
+        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">Housebound</a></li>
+    [% END %]
+    [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
+        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber %]">Interlibrary loans</a></li>
     [% END %]
 </ul></div>
 [% END %]
-