Attachment 61610 Details for Bug 18110 – BUG 18110: Corrected display address format

[patch] BUG 18110: Corrected display address format

BUG-18110-Corrected-display-address-format.patch (text/plain), 3.59 KB, created by Baptiste Wojtkowski (bwoj) on 2017-03-24 12:50:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Baptiste Wojtkowski (bwoj)

Created: 2017-03-24 12:50:18 UTC

Size: 3.59 KB

patch

obsolete

>From ce844b001242f20bc44ff4945f4face1feba4d41 Mon Sep 17 00:00:00 2001
>From: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com>
>Date: Fri, 24 Mar 2017 12:47:42 +0000
>Subject: [PATCH] BUG 18110: Corrected display address format
>
>- minor changes on address format
>- corrected member-password so that steetnumber is given to the template
>---
> .../includes/member-display-address-style-fr.inc   |  5 ++---
> .../en/includes/member-main-address-style-fr.inc   | 23 +++++++++++-----------
> members/member-password.pl                         |  1 +
> 3 files changed, 14 insertions(+), 15 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
>index 5d4f197..07fc74b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
>@@ -1,15 +1,14 @@
> [% IF ( address or address2 ) %]
>     [% IF ( address ) %]
>+        <li>
>         [% SET roadtype_desc = '' %]
>         [% IF streettype %]
>             [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
>         [% END %]
>-        <li>
>         [% IF streetnumber %] [% streetnumber %][% END %]
>         [%IF roadtype_desc %] [% roadtype_desc %][% END %]
>+            [% address %]
>         </li>
>-            <li class="patronaddress1">[% address %]
>-            </li>
>     [% END %]
>     [% IF ( address2 ) %]
>         <li class="patronaddress2">[% address2 %]</li>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
>index e666ef9..4e8dc80 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc
>@@ -1,18 +1,17 @@
> <fieldset class="rows" id="memberentry_mainaddress">
>     <legend id="main_address_lgd">Main address</legend><ol>
>-[% UNLESS nostreetnumber %]
>-    <li>
>-    [% IF ( mandatorystreetnumber ) %]
>-        <label for="streetnumber" class="required">
>-    [% ELSE %]
>-        <label for="streetnumber">
>-    [% END %]
>-        Street number: </label>
>-        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
>-    [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
>-    </li>
>-[% END %]
> [% UNLESS nostreettype %]
>+    [% UNLESS nostreetnumber %]
>+        [% IF ( mandatorystreetnumber ) %]
>+            <label for="streetnumber" class="required">
>+        [% ELSE %]
>+            <label for="streetnumber">
>+        [% END %]
>+            Street number: </label>
>+            <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
>+        [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
>+    [% END %]
>+
>     [% IF roadtypes %]
>         <li>
>         [% IF ( mandatorystreettype ) %]
>diff --git a/members/member-password.pl b/members/member-password.pl
>index 1008cb6..5322a9c 100755
>--- a/members/member-password.pl
>+++ b/members/member-password.pl
>@@ -140,6 +140,7 @@ $template->param(
>     country                    => $bor->{'country'},
>     phone                      => $bor->{'phone'},
>     phonepro                   => $bor->{'phonepro'},
>+    streetnumber               => $bor->{'streetnumber'},
>     mobile                     => $bor->{'mobile'},
>     email                      => $bor->{'email'},
>     emailpro                   => $bor->{'emailpro'},
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 18110: 60176 | 60214 | 60215 | 60426 | 60657 | 60689 | 60690 | 60694 | 60695 | 61610 | 61639 | 61650 | 61651 | 61652 | 61656 | 61796 | 62651 | 62652 | 62664 | 62740 | 62741 | 62742 | 62743 | 62744 | 62745