Bug 12159: Fix getting extended patron attributes for circ-menu

[srvgit] / 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 c54e427..b225e85 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -2,25 +2,30 @@
 [% USE KohaDates %]
 [% IF ( patron.borrowernumber ) %]
 <div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
-<input type="hidden" id="hiddenborrowernumber" value="[% patron.borrowernumber %]">
-<input type="hidden" id="hiddenborrowername" value="[% patron.surname %] [% patron.firstname %]">
-<input type="hidden" id="hiddenborrowercard" value="[% patron.cardnumber %]">
-<!--[if IE 6]>
-<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
-}</style>
-<![endif]-->
+
+<input type="hidden" id="hiddenborrowernumber" value="[% patron.borrowernumber | html %]">
+<input type="hidden" id="hiddenborrowername" value="[% patron.surname | html %] [% patron.firstname | html %]">
+<input type="hidden" id="hiddenborrowercard" value="[% patron.cardnumber | html %]">
+
+[% IF ( patronimages ) %]
+    <div>
+        <div class="patronimage-container">
+            [% IF ( patron.image ) %]
+                <img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="patronimage" alt="[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])" />
+                <div class="patronimage-controls">
+                    <div class="patronimage-control"><a data-borrowernumber="[% patron.borrowernumber | uri %]" class="btn btn-default btn-sm edit-patronimage" title="Edit patron image" href="#"><i class="fa fa-pencil"></i> Edit</a></div>
+                </div>
+            [% ELSE %]
+                <div class="patronimage empty"></div>
+                <div class="patronimage-controls">
+                    <div class="patronimage-control"><a data-borrowernumber="[% patron.borrowernumber | uri %]" class="btn btn-default btn-sm edit-patronimage" title="Add patron image" href="#"><i class="fa fa-plus"></i> Add</a></div>
+                </div>
+            [% END %]
+        </div>
+    </div>
+[% END %]
+
 <ul class="patronbriefinfo">
-    [% IF ( patronimages ) %]
-        [% 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">
-                <div></div>
-            </li>
-        [% END %]
-    [% END %]
     [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
         [% SWITCH Koha.Preference( 'AddressFormat' ) %]
             [% CASE 'de' %]
@@ -63,13 +68,13 @@
         [% END %]
     [% END %]
 
-    [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN extendedattributes %]
-        [% IF ( extendedattribute.display_checkout ) %]
-            [% IF ( extendedattribute.value ) %]
-                <li class="patronattribute"><span class="patronattributelabel">[% extendedattribute.description | html %]</span> : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description | html %][% ELSE %][% extendedattribute.value | html %][% END %]</li>
+    [% IF Koha.Preference('ExtendedPatronAttributes') %]
+        [% FOREACH extendedattribute IN patron.attributes %]
+            [% IF ( extendedattribute.display_checkout ) %]
+                <li class="patronattribute"><span class="patronattributelabel">[% extendedattribute.type_description | html %]</span> : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description | html %][% ELSE %][% extendedattribute.attribute | html %][% END %]</li>
             [% END %]
         [% END %]
-    [% END %][% END %]
+    [% END %]
     <li class="patroncategory">Category: [% patron.category.description | html %] ([% patron.categorycode | html %])</li>
     <li class="patronlibrary">Home library: [% Branches.GetName( patron.branchcode ) | html %]</li>
     <li class="patronborrowernumber">Borrowernumber: [% patron.borrowernumber | html %]</li>
@@ -87,7 +92,7 @@
         [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">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=[% patron.borrowernumber | uri %]">Fines</a></li>
+        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Accounting</a></li>
     [% END %]
     [% IF ( CAN_user_circulate_circulate_remaining_permissions  )  %]
         [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber | uri %]">Routing lists</a></li>[% END %]
@@ -127,7 +132,26 @@
         [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber | uri %]">Housebound</a></li>
     [% END %]
     [% IF Koha.Preference('ILLModule') && CAN_user_ill %]
-        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% patron.borrowernumber | uri %]">Interlibrary loans</a></li>
+        [% IF illview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/ill-requests.pl?borrowernumber=[% patron.borrowernumber | uri %]">ILL requests history</a></li>
     [% END %]
 </ul></div>
+
+<!-- Modal -->
+<div class="modal" id="patronImageEdit" tabindex="-1" role="dialog" aria-labelledby="patronImageEditLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" id="patronImageEditLabel">Modal title</h4>
+            </div>
+            <div class="modal-body">
+                <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" />
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 [% END %]