View | Details | Raw Unified | Return to bug 22087
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+14 lines)
Lines 2003-2008 li { Link Here
2003
    }
2003
    }
2004
}
2004
}
2005
2005
2006
#searchresults {
2007
    .address {
2008
        ul {
2009
            margin: 0;
2010
            padding-left: 0;
2011
            li {
2012
                clear: none;
2013
                float: left;
2014
                list-style: none;
2015
            }
2016
        }
2017
    }
2018
}
2019
2006
#searchheader {
2020
#searchheader {
2007
    background-color: #E6F0F2;
2021
    background-color: #E6F0F2;
2008
    border: 1px solid #B9D8D9;
2022
    border: 1px solid #B9D8D9;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc (-64 / +64 lines)
Lines 1-74 Link Here
1
[% USE Koha %]
1
[%~ USE Koha ~%]
2
[% BLOCK 'display-address-style' %]
2
[%~ BLOCK 'display-address-style' ~%]
3
    [% IF Koha.Preference( 'AddressFormat' ) %]
3
    [%~ IF Koha.Preference( 'AddressFormat' ) ~%]
4
        [% PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
4
        [%~ PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" ~%]
5
    [% ELSE %]
5
    [%~ ELSE ~%]
6
        [% PROCESS 'member-display-address-style-us' %]
6
        [%~ PROCESS 'member-display-address-style-us' ~%]
7
    [% END %]
7
    [%~ END ~%]
8
[% END %]
8
[%~ END ~%]
9
9
10
[% BLOCK 'member-display-address-style-us' %]
10
[%~ BLOCK 'member-display-address-style-us' ~%]
11
    [% IF ( patron.address or patron.address2 ) %]
11
    [%~ IF ( patron.address or patron.address2 ) ~%]
12
        [% IF ( patron.address ) %]
12
        [%~ IF ( patron.address ) ~%]
13
            [% SET roadtype_desc = '' %]
13
            [%~ SET roadtype_desc = '' ~%]
14
            [% IF patron.streettype %]
14
            [%~ IF patron.streettype ~%]
15
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
15
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
16
            [% END %]
16
            [%~ END ~%]
17
            <li class="patronaddress1">[% if (patron.streetnumber) | html %][% patron.streetnumber |html  %][% end | html %] [% patron.address | html %] [% IF roadtype_desc %][% roadtype_desc |html  %] [% END %][% end | html %]</li>
17
            <li class="patronaddress1">[%~ if (patron.streetnumber) | html ~%][%~ patron.streetnumber |html  ~%][%~ end | html ~%] [%~ patron.address | html ~%] [%~ IF roadtype_desc ~%][%~ roadtype_desc |html  ~%] [%~ END ~%][%~ end | html ~%]</li>
18
        [% END %]
18
        [%~ END ~%]
19
        [% IF ( patron.address2 ) %]
19
        [%~ IF ( patron.address2 ) ~%]
20
            <li class="patronaddress2">[% patron.address2 |html  %]</li>
20
            <li class="patronaddress2">[%~ patron.address2 |html  ~%]</li>
21
        [% END %]
21
        [%~ END ~%]
22
    [% END %]
22
    [%~ END ~%]
23
    [% IF ( patron.city ) %]
23
    [%~ IF ( patron.city ) ~%]
24
        <li class="patroncity">
24
        <li class="patroncity">
25
            [% patron.city |html  %][% IF ( patron.state ) %], [% patron.state |html  %][% END %]
25
            [%~ patron.city |html  ~%][%~ IF ( patron.state ) ~%], [%~ patron.state |html  ~%][%~ END ~%]
26
            [% patron.zipcode |html  %][% IF ( patron.country ) %], [% patron.country |html  %][% END %]
26
            [%~ patron.zipcode |html  ~%][%~ IF ( patron.country ) ~%], [%~ patron.country |html  ~%][%~ END ~%]
27
        </li>
27
        </li>
28
    [% END %]
28
    [%~ END ~%]
29
[% END %]
29
[%~ END ~%]
30
30
31
[% BLOCK 'member-display-address-style-de' %]
31
[%~ BLOCK 'member-display-address-style-de' ~%]
32
    [% IF ( patron.address or patron.address2 ) %]
32
    [%~ IF ( patron.address or patron.address2 ) ~%]
33
        [% IF ( patron.address ) %]
33
        [%~ IF ( patron.address ) ~%]
34
            [% SET roadtype_desc = '' %]
34
            [%~ SET roadtype_desc = '' ~%]
35
            [% IF patron.streettype %]
35
            [%~ IF patron.streettype ~%]
36
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
36
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
37
            [% END %]
37
            [%~ END ~%]
38
            <li class="patronaddress1">[% patron.address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.streetnumber %] [% patron.streetnumber | html %][% END %]</li>
38
            <li class="patronaddress1">[%~ patron.address | html ~%][%~IF roadtype_desc ~%] [%~ roadtype_desc | html ~%][%~ END ~%][%~ IF patron.streetnumber ~%] [%~ patron.streetnumber | html ~%][%~ END ~%]</li>
39
        [% END %]
39
        [%~ END ~%]
40
        [% IF ( patron.address2 ) %]
40
        [%~ IF ( patron.address2 ) ~%]
41
            <li class="patronaddress2">[% patron.address2 | html %]</li>
41
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
42
        [% END %]
42
        [%~ END ~%]
43
    [% END %]
43
    [%~ END ~%]
44
    [% IF ( patron.city ) %]
44
    [%~ IF ( patron.city ) ~%]
45
        <li class="patroncity">
45
        <li class="patroncity">
46
            [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]</br>[% patron.state | html %][% END %]
46
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html ~%] [%~ END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
47
            [% IF ( patron.country ) %]<br />[% patron.country | html %][% END %]
47
            [%~ IF ( patron.country ) ~%]<br />[%~ patron.country | html ~%][%~ END ~%]
48
        </li>
48
        </li>
49
    [% END %]
49
    [%~ END ~%]
50
[% END %]
50
[%~ END ~%]
51
51
52
[% BLOCK 'member-display-address-style-fr' %]
52
[%~ BLOCK 'member-display-address-style-fr' ~%]
53
    [% IF ( patron.address or patron.address2 ) %]
53
    [%~ IF ( patron.address or patron.address2 ) ~%]
54
        [% IF ( patron.address ) %]
54
        [%~ IF ( patron.address ) ~%]
55
            [% SET roadtype_desc = '' %]
55
            [%~ SET roadtype_desc = '' ~%]
56
            [% IF patron.streettype %]
56
            [%~ IF patron.streettype ~%]
57
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
57
                [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
58
            [% END %]
58
            [%~ END ~%]
59
            <li class="patronaddress1">[% IF patron.streetnumber %][% patron.streetnumber | html %] [% END %]
59
            <li class="patronaddress1">[%~ IF patron.streetnumber ~%][%~ patron.streetnumber | html ~%] [%~ END ~%]
60
            [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
60
            [%~IF roadtype_desc ~%][%~ roadtype_desc | html ~%] [%~ END ~%]
61
                [% patron.address | html %]
61
                [%~ patron.address | html ~%]
62
            </li>
62
            </li>
63
        [% END %]
63
        [%~ END ~%]
64
        [% IF ( patron.address2 ) %]
64
        [%~ IF ( patron.address2 ) ~%]
65
            <li class="patronaddress2">[% patron.address2 | html %]</li>
65
            <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
66
        [% END %]
66
        [%~ END ~%]
67
    [% END %]
67
    [%~ END ~%]
68
    [% IF ( patron.city ) %]
68
    [%~ IF ( patron.city ) ~%]
69
        <li class="patroncity">
69
        <li class="patroncity">
70
            [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %]</br>[% patron.state | html %][% END %]
70
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html ~%] [%~ END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
71
            [% IF ( patron.country ) %]<br />[% patron.country | html %][% END %]
71
            [%~ IF ( patron.country ) ~%]<br />[%~ patron.country | html ~%][%~ END ~%]
72
        </li>
72
        </li>
73
    [% END %]
73
    [%~ END ~%]
74
[% END %]
74
[%~ END ~%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (-9 / +2 lines)
Lines 3-8 Link Here
3
[% USE AuthorisedValues %]
3
[% USE AuthorisedValues %]
4
[% USE KohaDates %]
4
[% USE KohaDates %]
5
[% USE Price %]
5
[% USE Price %]
6
[% PROCESS 'member-display-address-style.inc' %]
6
{
7
{
7
    "sEcho": [% sEcho | html %],
8
    "sEcho": [% sEcho | html %],
8
    "iTotalRecords": [% iTotalRecords | html %],
9
    "iTotalRecords": [% iTotalRecords | html %],
Lines 17-23 Link Here
17
                "dt_cardnumber":
18
                "dt_cardnumber":
18
                    "[% data.cardnumber | html | $To %]",
19
                    "[% data.cardnumber | html | $To %]",
19
                "dt_name":
20
                "dt_name":
20
                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br />[% INCLUDE escape_address data = data %][% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a>[% END %]",
21
                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br /><div class='address'><ul>[%~ PROCESS 'display-address-style' patron=data| $To ~%]</ul></div>[% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a>[% END %]",
21
    "dt_dateofbirth":
22
    "dt_dateofbirth":
22
        "[% INCLUDE 'patron-age.inc' patron = data %]",
23
        "[% INCLUDE 'patron-age.inc' patron = data %]",
23
                "dt_category":
24
                "dt_category":
Lines 40-49 Link Here
40
        [% END %]
41
        [% END %]
41
    ]
42
    ]
42
}
43
}
43
[% BLOCK escape_address %]
44
[%~ SET address = data.streetnumber _ ' ' %]
45
[%~ IF data.streettype %][% SET address = address _ AuthorisedValues.GetByCode( 'ROADTYPE', data.streettype ) _ ' ' %][% END %]
46
[%~ IF data.address %][% SET address = address _ data.address _ ' ' %][% END %]
47
[%~ IF data.address2 %][% SET address = address _ data.address2 _ ' ' %][% END %]
48
[%~ address | html | $To ~%]
49
[% END %]
50
- 

Return to bug 22087