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

(-)a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc (-3 / +4 lines)
Lines 144-150 Link Here
144
        No public lists
144
        No public lists
145
		[% END %]
145
		[% END %]
146
  [% IF ( opacuserlogin ) %]
146
  [% IF ( opacuserlogin ) %]
147
    <h4>Your lists</h4>
147
     <h4>Your lists</h4>
148
	[% IF ( loggedinusername ) %]
148
	[% IF ( loggedinusername ) %]
149
		[% IF ( barshelves ) %]
149
		[% IF ( barshelves ) %]
150
			<ul class="first-of-type">
150
			<ul class="first-of-type">
Lines 156-162 Link Here
156
		[% ELSE %]
156
		[% ELSE %]
157
			<ul class="first-of-type">
157
			<ul class="first-of-type">
158
        <li>No private lists</li>
158
        <li>No private lists</li>
159
        <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[New list]</a></li></ul>
159
        <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">[Create new list]</a></li></ul>
160
		[% END %]
160
		[% END %]
161
	[% ELSE %]
161
	[% ELSE %]
162
        <ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to create your own lists</a></li></ul>
162
        <ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to create your own lists</a></li></ul>
Lines 164-169 Link Here
164
  [% END %]
164
  [% END %]
165
	  </div>
165
	  </div>
166
</div><!-- /listmenu /virtualshelves -->
166
</div><!-- /listmenu /virtualshelves -->
167
167
[% END %]
168
[% END %]
168
<div id="listsDetails"></div>
169
<div id="listsDetails"></div>
169
</div>
170
</div>
Lines 172-178 Link Here
172
[% IF ( searchdesc ) %]<p>[% IF ( total ) %]<strong>Your search returned [% total |html %] results.</strong> [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %]
173
[% IF ( searchdesc ) %]<p>[% IF ( total ) %]<strong>Your search returned [% total |html %] results.</strong> [% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %]
173
<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
174
<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;count=[% countrss |html %]&amp;sort_by=acqdate_dsc&amp;format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
174
[% ELSE %]
175
[% ELSE %]
175
<strong>No results found!</strong>
176
<h3>No results found!</h3>
176
<p>
177
<p>
177
    [% IF ( searchdesc ) %]
178
    [% IF ( searchdesc ) %]
178
    No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
179
    No results found for that in [% LibraryName %] catalog. <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&amp;format=rss2" class="rsssearchlink"><img src="/opac-tmpl/prog/images/feed-icon-16x16.png" alt="Subscribe to this search" title="Subscribe to this search" border="0" class="rsssearchicon"/></a>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt (-26 / +66 lines)
Lines 55-71 Link Here
55
    [% FOREACH search_box IN search_boxes_loop %]
55
    [% FOREACH search_box IN search_boxes_loop %]
56
        <p>
56
        <p>
57
        [% IF ( expanded_options ) %]
57
        [% IF ( expanded_options ) %]
58
            [% IF loop.index == 0 %]
59
            <span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
60
            [% END %]
61
58
            [% IF ( search_box.boolean ) %]
62
            [% IF ( search_box.boolean ) %]
59
            <select name="op">
63
                <select name="op">
60
                <option value="and" selected="selected">and</option>
64
                    <option value="and" selected="selected">and</option>
61
                <option value="or">or</option>
65
                    <option value="or">or</option>
62
                <option value="not">not</option>
66
                    <option value="not">not</option>
63
            </select>
67
                </select>
64
            [% END %]
68
            [% END %]
69
        [% ELSE %]
70
            <label for="foand_[% loop.index %]">
71
                [% IF loop.index == 0 %]
72
                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
73
                [% ELSE %]
74
                    and
75
                [% END %]
76
            </label>
65
        [% END %]
77
        [% END %]
66
        [% IF ( expanded_options ) %][% left_content %][% END %] 
78
        [% IF ( expanded_options ) %][% left_content %][% END %]
67
        <select name="idx">
79
        <select id="foand_[% loop.index %]" name="idx">
68
            <option value="kw">Keyword</option>
80
            [% IF loop.index == 0 %]
81
                <option value="kw">Keyword</option>
82
            [% ELSIF loop.index == 1 %]
83
                <option value="ti">Title</option>
84
                    [% IF ( expanded_options ) %]
85
                        <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title phrase</option>
86
                        <option value="se,wrdl">Series title</option>
87
                        <option value="callnum">Call number</option>
88
                        <option value="location">Shelving location</option>
89
                    [% END %]
90
            [% ELSIF loop.index == 2 %]
91
                <option value="au,wrdl">Author</option>
92
                [% IF ( expanded_options ) %]
93
                    <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author phrase</option>
94
                    <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
95
                    <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
96
                    <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name phrase</option>
97
                    <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
98
                    <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name phrase</option>
99
                [% END %]
100
            [% END %]
101
102
            [% IF loop.index != 0 %]
103
                <option value="kw">Keyword</option>
104
            [% END %]
105
69
            <option value="su,wrdl">Subject</option>
106
            <option value="su,wrdl">Subject</option>
70
[% IF ( expanded_options ) %]
107
[% IF ( expanded_options ) %]
71
            <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject phrase</option>
108
            <option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject phrase</option>
Lines 73-95 Link Here
73
            <option value="su-na">&nbsp;&nbsp;&nbsp;&nbsp; Subject and narrower terms</option>
110
            <option value="su-na">&nbsp;&nbsp;&nbsp;&nbsp; Subject and narrower terms</option>
74
            <option value="su-rl">&nbsp;&nbsp;&nbsp;&nbsp; Subject and related terms</option>
111
            <option value="su-rl">&nbsp;&nbsp;&nbsp;&nbsp; Subject and related terms</option>
75
[% END %]
112
[% END %]
76
            <option value="ti">Title</option>
113
            [% IF loop.index != 1 %]
77
[% IF ( expanded_options ) %]
114
                <option value="ti">Title</option>
78
            <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title phrase</option>
115
                [% IF ( expanded_options ) %]
79
            <option value="se,wrdl">Series title</option>
116
                    <option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title phrase</option>
80
            <option value="callnum">Call number</option>
117
                    <option value="se,wrdl">Series title</option>
81
            <option value="location">Shelving location</option>
118
                    <option value="callnum">Call number</option>
82
[% END %]
119
                    <option value="location">Shelving location</option>
83
            <option value="au,wrdl">Author</option>
120
                [% END %]
84
            
121
            [% END %]
85
[% IF ( expanded_options ) %]
122
86
            <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author phrase</option>
123
            [% IF loop.index != 2 %]
87
            <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
124
                <option value="au,wrdl">Author</option>
88
            <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
125
                [% IF ( expanded_options ) %]
89
            <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name phrase</option>
126
                    <option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author phrase</option>
90
            <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
127
                    <option value="cpn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Corporate name</option>
91
            <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name phrase</option>
128
                    <option value="cfn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Conference name</option>
92
[% END %]
129
                    <option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference name phrase</option>
130
                    <option value="pn,wrdl">&nbsp;&nbsp;&nbsp;&nbsp; Personal name</option>
131
                    <option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal name phrase</option>
132
                [% END %]
133
            [% END %]
93
[% IF ( expanded_options ) %]
134
[% IF ( expanded_options ) %]
94
            <option value="nt">Notes/Comments</option>
135
            <option value="nt">Notes/Comments</option>
95
    [% IF (marcflavour != 'UNIMARC') %]
136
    [% IF (marcflavour != 'UNIMARC') %]
96
- 

Return to bug 8712