Bug 15400: Display date of birth and age more consistantly

[koha-ffzg.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 7b34942..948a95c 100644 (file)
--- 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,6 @@
 [% USE Koha %]
 [% USE KohaDates %]
+[% PROCESS 'member-display-address-style.inc' %]
 [% IF ( patron.borrowernumber ) %]
 <div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
 
@@ -29,12 +30,7 @@
 
 <ul class="patronbriefinfo">
     [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
-        [% SWITCH Koha.Preference( 'AddressFormat' ) %]
-            [% CASE 'de' %]
-                [% INCLUDE 'member-display-address-style-de.inc' %]
-            [% CASE # us %]
-                [% INCLUDE 'member-display-address-style-us.inc' %]
-        [% END %]
+        [% PROCESS 'display-address-style' %]
 
         [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">
         [% IF ( patron.phone ) %]
@@ -55,6 +51,12 @@
                 <li class="email"> <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a></li>
             [% END %]
         [% END %]
+        [% IF ( patron.dateofbirth ) %]
+            <li>
+                <span class="label">Date of birth:</span>
+                [% INCLUDE 'patron-age.inc' %]
+            </li>
+        [% END %]
 
         [% UNLESS ( patron.address or patron.address2 ) %]
             <li><span class="empty" id="noaddressstored">No address stored.</span></li>
@@ -68,6 +70,10 @@
         [% UNLESS ( patron.email or patron.emailpro) %]
             <li> <span class="empty">No email stored.</span></li>
         [% END %]
+        [% UNLESS ( patron.dateofbirth ) %]
+            <li> <span class="empty">No date of birth stored.</span></li>
+        [% END %]
+
     [% END %]
 
     [% IF Koha.Preference('ExtendedPatronAttributes') %]