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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search-results.inc (-5 / +14 lines)
Lines 1-4 Link Here
1
[% BLOCK showreference %]
1
[% BLOCK showreference %]
2
<!--
3
    Parameters:
4
    heading: the heading itself
5
    linkType: currently 'seefrom' or 'seealso', controls the label for the entry
6
    type:
7
    authid: if it is a linked authority, its authid
8
-->
2
    [% SET authidurl = '/cgi-bin/koha/authorities/detail.pl?authid=' %]
9
    [% SET authidurl = '/cgi-bin/koha/authorities/detail.pl?authid=' %]
3
    [% SET searchurl = '/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&marclist=any&operator=contains&orderby=HeadingAsc&value=' %]
10
    [% SET searchurl = '/cgi-bin/koha/authorities/authorities-home.pl?op=do_search&type=intranet&marclist=any&operator=contains&orderby=HeadingAsc&value=' %]
4
11
Lines 15-28 Link Here
15
        [% END %]
22
        [% END %]
16
    [% ELSE %]
23
    [% ELSE %]
17
        <span class="label">
24
        <span class="label">
18
        [% IF ( type=='seefrom' ) %]
25
        [% IF ( linkType=='seefrom' ) %]
19
            used for/see from:
26
            used for/see from:
20
        [% ELSIF  ( type=='seealso' ) %]
27
        [% ELSIF  ( linkType=='seealso' ) %]
21
            see also:
28
            see also:
22
        [% END %]
29
        [% END %]
23
        </span>
30
        </span>
24
        <span class="heading">
31
        <span class="heading">
25
        [% IF ( type=='seealso' ) %]
32
        [% IF ( linkType=='seealso' ) %]
26
            [% IF ( authid ) %]
33
            [% IF ( authid ) %]
27
            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
34
            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
28
            [% ELSE %]
35
            [% ELSE %]
Lines 68-74 Link Here
68
          [% IF summary.seefrom %]
75
          [% IF summary.seefrom %]
69
            <div class="authres_seefrom">
76
            <div class="authres_seefrom">
70
            [% FOREACH see IN summary.seefrom %]
77
            [% FOREACH see IN summary.seefrom %]
71
              [% PROCESS showreference heading=see.heading label="" type=see.type search='' %]
78
              [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %]
72
              [% IF ! loop.last %] ; [% END %]
79
              [% IF ! loop.last %] ; [% END %]
73
            [% END %]
80
            [% END %]
74
            </div>
81
            </div>
Lines 76-82 Link Here
76
            [% IF summary.seealso %]
83
            [% IF summary.seealso %]
77
              <div class="authres_seealso">
84
              <div class="authres_seealso">
78
              [% FOREACH see IN summary.seealso %]
85
              [% FOREACH see IN summary.seealso %]
79
                 [% PROCESS showreference heading=see.heading label="" type=see.type search='' %]
86
                 [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %]
80
                 [% IF ! loop.last %] ; [% END %]
87
                 [% IF ! loop.last %] ; [% END %]
81
              [% END %]
88
              [% END %]
82
              </div>
89
              </div>
Lines 96-101 Link Here
96
                    <div class="seefrom authref">
103
                    <div class="seefrom authref">
97
                    [% PROCESS showreference
104
                    [% PROCESS showreference
98
                        heading=seefro.heading
105
                        heading=seefro.heading
106
                        linkType='seefrom'
99
                        type=seefro.type
107
                        type=seefro.type
100
                        authid=seefro.authid
108
                        authid=seefro.authid
101
                    %]
109
                    %]
Lines 107-112 Link Here
107
                    <div class="seealso authref">
115
                    <div class="seealso authref">
108
                    [% PROCESS showreference
116
                    [% PROCESS showreference
109
                        heading=seeals.heading
117
                        heading=seeals.heading
118
                        linkType='seealso'
110
                        type=seeals.type
119
                        type=seeals.type
111
                        authid=seeals.authid
120
                        authid=seeals.authid
112
                    %]
121
                    %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/authorities-search-results.inc (-6 / +36 lines)
Lines 1-4 Link Here
1
[% BLOCK showreference %]
1
[% BLOCK showreference %]
2
<!--
3
    Parameters:
4
    heading: the heading itself
5
    linkType: currently 'seefrom' or 'seealso', controls the label for the entry
6
    type:
7
    authid: if it is a linked authority, its authid
8
-->
9
    [% SET authidurl = '/cgi-bin/koha/opac-authoritiesdetail.pl?authid=' %]
10
    [% SET searchurl = '/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operator=contains&marclist=mainentry&and_or=and&orderby=HeadingAsc&value=' %]
2
    [% IF marcflavour == 'UNIMARC' %]
11
    [% IF marcflavour == 'UNIMARC' %]
3
        [% SWITCH type %]
12
        [% SWITCH type %]
4
            [% CASE 'broader' %]
13
            [% CASE 'broader' %]
Lines 11-20 Link Here
11
              <span class="RT">RT: [% heading | html %]</span>
20
              <span class="RT">RT: [% heading | html %]</span>
12
        [% END %]
21
        [% END %]
13
    [% ELSE %]
22
    [% ELSE %]
14
        [% IF ( label ) %]<span class="label">[% label | html %]</span>[% END %]
23
        <span class="label">
24
        [% IF ( linkType=='seefrom' ) %]
25
            used for/see from:
26
        [% ELSIF ( linkType=='seealso' ) %]
27
            see also:
28
        [% END %]
15
        <span class="heading">
29
        <span class="heading">
16
            [% IF ( linkpath && search ) %]<a href="[% link | url %][% search | url %]">[% heading | html %]</a>
30
        [% IF ( linkType=='seealso' ) %]
17
            [% ELSE %][% heading | html %][% END %]
31
            [% IF ( authid ) %]
32
            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
33
            [% ELSE %]
34
            <a href="[% searchurl | url %][% heading | html %]">[% heading | html %]</a>
35
            [% END %]
36
        [% ELSE %]
37
            [% heading | html %]
38
        [% END %]
18
        </span>
39
        </span>
19
        [% UNLESS ( type=='seefrom' || type=='seealso' ) %]
40
        [% UNLESS ( type=='seefrom' || type=='seealso' ) %]
20
            <span class="type">
41
            <span class="type">
Lines 53-59 Link Here
53
            [% IF summary.seealso %]
74
            [% IF summary.seealso %]
54
                <div class="authres_seealso">
75
                <div class="authres_seealso">
55
                    [% FOREACH see IN summary.seealso %]
76
                    [% FOREACH see IN summary.seealso %]
56
                        [% PROCESS showreference heading=see.heading label="" type=see.type search='' %]
77
                        [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %]
57
                        [% IF ! loop.last %] ; [% END %]
78
                        [% IF ! loop.last %] ; [% END %]
58
                    [% END %]
79
                    [% END %]
59
                </div>
80
                </div>
Lines 71-84 Link Here
71
            [% IF ( summary.seefrom ) %]
92
            [% IF ( summary.seefrom ) %]
72
                [% FOREACH seefro IN summary.seefrom %]
93
                [% FOREACH seefro IN summary.seefrom %]
73
                    <div class="seefrom authref">
94
                    <div class="seefrom authref">
74
                    [% PROCESS showreference heading=seefro.heading label="used for/see from:" type=seefro.type search='' %]
95
                    [% PROCESS showreference
96
                        heading=seefro.heading
97
                        linkType='seefrom'
98
                        type=seefro.type
99
                    %]
75
                    </div>
100
                    </div>
76
                [% END %]
101
                [% END %]
77
            [% END %]
102
            [% END %]
78
            [% IF ( summary.seealso ) %]
103
            [% IF ( summary.seealso ) %]
79
                [% FOREACH seeals IN summary.seealso %]
104
                [% FOREACH seeals IN summary.seealso %]
80
                    <div class="seealso authref">
105
                    <div class="seealso authref">
81
                    [% PROCESS showreference heading=seeals.heading label="see also:" type=seeals.type linkpath=link search=seeals.search %]
106
                    [% PROCESS showreference
107
                        heading=seeals.heading
108
                        linkType='seealso'
109
                        type=seeals.type
110
                        authid=seeals.authid
111
                    %]
82
                    </div>
112
                    </div>
83
                [% END %]
113
                [% END %]
84
            [% END %]
114
            [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authoritiessearchresultlist.tt (-2 / +2 lines)
Lines 85-91 Link Here
85
                                    <tbody>
85
                                    <tbody>
86
                                        [% FOREACH resul IN result %]
86
                                        [% FOREACH resul IN result %]
87
                                            <tr>
87
                                            <tr>
88
                                                <td>[% PROCESS authresult summary=resul.summary link="/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operatorc=contains&marclistc=mainentry&and_orc=and&orderby=HeadingAsc&value=" %]</td>
88
                                                <td>[% PROCESS authresult summary=resul.summary %]</td>
89
                                                <td>[% resul.authtype %]</td>
89
                                                <td>[% resul.authtype %]</td>
90
                                                [% UNLESS ( resul.isEDITORS ) %]
90
                                                [% UNLESS ( resul.isEDITORS ) %]
91
                                                    <td>
91
                                                    <td>
Lines 111-114 Link Here
111
    </div> <!-- / .main -->
111
    </div> <!-- / .main -->
112
112
113
[% INCLUDE 'opac-bottom.inc' %]
113
[% INCLUDE 'opac-bottom.inc' %]
114
[% BLOCK jsinclude %][% END %]
114
[% BLOCK jsinclude %][% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/authorities-search-results.inc (-7 / +16 lines)
Lines 1-6 Link Here
1
[% BLOCK showreference %]
1
[% BLOCK showreference %]
2
<!--
3
    Parameters:
4
    heading: the heading itself
5
    linkType: currently 'seefrom' or 'seealso', controls the label for the entry
6
    type:
7
    authid: if it is a linked authority, its authid
8
-->
2
    [% SET authidurl = '/cgi-bin/koha/opac-authoritiesdetail.pl?authid=' %]
9
    [% SET authidurl = '/cgi-bin/koha/opac-authoritiesdetail.pl?authid=' %]
3
    [% SET searchurl = '/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operatorc=contains&marclistc=mainentry&and_orc=and&orderby=HeadingAsc&value=' %]
10
    [% SET searchurl = '/cgi-bin/koha/opac-authorities-home.pl?op=do_search&type=opac&operator=contains&marclist=mainentry&and_or=and&orderby=HeadingAsc&value=' %]
4
    [% IF marcflavour == 'UNIMARC' %]
11
    [% IF marcflavour == 'UNIMARC' %]
5
        [% SWITCH type %]
12
        [% SWITCH type %]
6
        [% CASE 'broader' %]
13
        [% CASE 'broader' %]
Lines 14-27 Link Here
14
        [% END %]
21
        [% END %]
15
    [% ELSE %]
22
    [% ELSE %]
16
        <span class="label">
23
        <span class="label">
17
        [% IF ( type=='seefrom' ) %]
24
        [% IF ( linkType=='seefrom' ) %]
18
            used for/see from:
25
            used for/see from:
19
        [% ELSIF  ( type=='seealso' ) %]
26
        [% ELSIF  ( linkType=='seealso' ) %]
20
            see also:
27
            see also:
21
        [% END %]
28
        [% END %]
22
        </span>
29
        </span>
23
        <span class="heading">
30
        <span class="heading">
24
        [% IF ( type=='seealso' ) %]
31
        [% IF ( linkType=='seealso' ) %]
25
            [% IF ( authid ) %]
32
            [% IF ( authid ) %]
26
            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
33
            <a href="[% authidurl | url %][% authid | url %]">[% heading | html %]</a>
27
            [% ELSE %]
34
            [% ELSE %]
Lines 67-73 Link Here
67
            [% IF summary.seefrom %]
74
            [% IF summary.seefrom %]
68
              <div class="authres_seefrom">
75
              <div class="authres_seefrom">
69
              [% FOREACH see IN summary.seefrom %]
76
              [% FOREACH see IN summary.seefrom %]
70
                 [% PROCESS showreference heading=see.heading label="" type=see.type search='' %]
77
                 [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %]
71
                 [% IF ! loop.last %] ; [% END %]
78
                 [% IF ! loop.last %] ; [% END %]
72
              [% END %]
79
              [% END %]
73
              </div>
80
              </div>
Lines 75-81 Link Here
75
            [% IF summary.seealso %]
82
            [% IF summary.seealso %]
76
              <div class="authres_seealso">
83
              <div class="authres_seealso">
77
              [% FOREACH see IN summary.seealso %]
84
              [% FOREACH see IN summary.seealso %]
78
                 [% PROCESS showreference heading=see.heading label="" type=see.type search='' %]
85
                 [% PROCESS showreference heading=see.heading linkType="" type=see.type search='' %]
79
                 [% IF ! loop.last %] ; [% END %]
86
                 [% IF ! loop.last %] ; [% END %]
80
              [% END %]
87
              [% END %]
81
              </div>
88
              </div>
Lines 95-101 Link Here
95
                    <div class="seefrom authref">
102
                    <div class="seefrom authref">
96
                    [% PROCESS showreference
103
                    [% PROCESS showreference
97
                        heading=seefro.heading
104
                        heading=seefro.heading
105
                        linkType='seefrom'
98
                        type=seefro.type
106
                        type=seefro.type
107
                        authid=seefro.authid
99
                    %]
108
                    %]
100
                    </div>
109
                    </div>
101
                [% END %]
110
                [% END %]
Lines 105-110 Link Here
105
                    <div class="seealso authref">
114
                    <div class="seealso authref">
106
                    [% PROCESS showreference
115
                    [% PROCESS showreference
107
                        heading=seeals.heading
116
                        heading=seeals.heading
117
                        linkType='seealso'
108
                        type=seeals.type
118
                        type=seeals.type
109
                        authid=seeals.authid
119
                        authid=seeals.authid
110
                    %]
120
                    %]
111
- 

Return to bug 10691