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

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (-3 / +3 lines)
Lines 389-408 a .term { Link Here
389
}
389
}
390
390
391
/* action buttons */
391
/* action buttons */
392
#action {
392
#action, #searchlinks {
393
	margin-top : .5em;
393
	margin-top : .5em;
394
	background-color : #F3F3F3;
394
	background-color : #F3F3F3;
395
	border : 1px solid #E8E8E8;
395
	border : 1px solid #E8E8E8;
396
	padding-bottom : 3px;
396
	padding-bottom : 3px;
397
}
397
}
398
398
399
#action li {
399
#action li, #searchlinks li {
400
	list-style : none;
400
	list-style : none;
401
	margin : .2em;
401
	margin : .2em;
402
	padding : .3em 0;
402
	padding : .3em 0;
403
}
403
}
404
404
405
#action a {
405
#action a, #searchlinks a {
406
	background-position : 5px center;
406
	background-position : 5px center;
407
	background-repeat : no-repeat;
407
	background-repeat : no-repeat;
408
	text-decoration : none;
408
	text-decoration : none;
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc (-2 / +2 lines)
Lines 72-80 Link Here
72
        <option value="callnum">Call Number</option>
72
        <option value="callnum">Call Number</option>
73
		<!-- /TMPL_IF --></select>
73
		<!-- /TMPL_IF --></select>
74
<!-- TMPL_IF NAME="ms_value" -->
74
<!-- TMPL_IF NAME="ms_value" -->
75
        <input type="text" id = "transl1" name="q" value="<!-- TMPL_VAR ESCAPE="HTML" NAME="ms_value" -->" class="left" style="width: 35%; font-size: 111%;"/><div id="translControl"></div>
75
        <input type="text" id = "transl1" name="q" value="<!-- TMPL_VAR ESCAPE="HTML" NAME="ms_value" -->" class="left focus" style="width: 35%; font-size: 111%;"/><div id="translControl"></div>
76
<!-- TMPL_ELSE -->
76
<!-- TMPL_ELSE -->
77
        <input type="text" id = "transl1" name="q" class="left" style="width: 35%; font-size: 111%;"/><div id="translControl"></div>
77
        <input type="text" id = "transl1" name="q" class="left focus" style="width: 35%; font-size: 111%;"/><div id="translControl"></div>
78
<!-- /TMPL_IF -->
78
<!-- /TMPL_IF -->
79
   <!-- TMPL_IF NAME="OpacAddMastheadLibraryPulldown" -->
79
   <!-- TMPL_IF NAME="OpacAddMastheadLibraryPulldown" -->
80
      <select name="limit" id="masthead_search" class="left" style="max-width:10em;width:10em;">
80
      <select name="limit" id="masthead_search" class="left" style="max-width:10em;width:10em;">
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/search-links.inc (+11 lines)
Line 0 Link Here
1
<!-- TMPL_IF NAME="currentsearchquery" -->
2
<div id="searchlinks" >
3
<ul>
4
    <!-- TMPL_UNLESS NAME="currentsearchisoneresult" -->
5
        <li><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME='currentsearchquery' --><!-- TMPL_VAR NAME='currentsearchlimit' -->">Back to results</a></li>
6
    <!-- /TMPL_UNLESS -->
7
    <li><a href="/cgi-bin/koha/opac-main.pl?<!-- TMPL_VAR NAME='currentsearchquery' --><!-- TMPL_VAR NAME='currentsearchlimit' -->">Back to simple search</a></li>
8
    <li><a href="/cgi-bin/koha/opac-search.pl">Back to advanced search</a></li>
9
</ul>
10
</div>
11
<!-- /TMPL_IF -->
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl (+1 lines)
Lines 103-108 Link Here
103
 	    <option value="ris">RIS</option>    
103
 	    <option value="ris">RIS</option>    
104
		</select><input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
104
		</select><input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
105
<input type="submit" name="save" value="Go" /></form></div>
105
<input type="submit" name="save" value="Go" /></form></div>
106
<!-- TMPL_INCLUDE NAME="search-links.inc" -->
106
</div>
107
</div>
107
</div>
108
</div>
108
</div>
109
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl (+1 lines)
Lines 257-262 $(document).ready(function(){ Link Here
257
        <option value="marc8">MARC (non-Unicode/MARC-8)</option>
257
        <option value="marc8">MARC (non-Unicode/MARC-8)</option>
258
        <option value="utf8">MARC (Unicode/UTF-8)</option>    </select><input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
258
        <option value="utf8">MARC (Unicode/UTF-8)</option>    </select><input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
259
<input type="submit" name="save" value="Go" /></form></div>
259
<input type="submit" name="save" value="Go" /></form></div>
260
<!-- TMPL_INCLUDE NAME="search-links.inc" -->
260
</div>
261
</div>
261
</div>
262
</div>
262
</div>
263
</div>
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl (+1 lines)
Lines 845-850 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
845
		</select><input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
845
		</select><input type="hidden" name="op" value="export" /><input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
846
<input type="submit" name="save" value="Go" /></form>
846
<input type="submit" name="save" value="Go" /></form>
847
        </div>
847
        </div>
848
        <!-- TMPL_INCLUDE NAME="search-links.inc" -->
848
849
849
</div>
850
</div>
850
</div>
851
</div>
(-)a/opac/opac-ISBDdetail.pl (-1 / +9 lines)
Lines 42-48 the items attached to the biblio Link Here
42
use strict;
42
use strict;
43
use warnings;
43
use warnings;
44
44
45
use C4::Auth;
45
use C4::Auth qw(:DEFAULT get_session);
46
use C4::Context;
46
use C4::Context;
47
use C4::Output;
47
use C4::Output;
48
use CGI;
48
use CGI;
Lines 202-205 if ( C4::Context->preference("OPACAmazonEnabled") == 1 ) { Link Here
202
    $template->param( AMAZONREVIEWS    => \@reviews );
202
    $template->param( AMAZONREVIEWS    => \@reviews );
203
}
203
}
204
204
205
# Get current search from session
206
my $session = get_session($query->cookie("CGISESSID"));
207
if ($session) {
208
    foreach (qw(currentsearchquery currentsearchlimit currentsearchisoneresult)) {        
209
        $template->param( $_ => $session->param( $_ ) );
210
    }
211
}
212
205
output_html_with_http_headers $query, $cookie, $template->output;
213
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/opac/opac-MARCdetail.pl (-1 / +9 lines)
Lines 44-50 the items attached to the biblio Link Here
44
use strict;
44
use strict;
45
use warnings;
45
use warnings;
46
46
47
use C4::Auth;
47
use C4::Auth qw(:DEFAULT get_session);
48
use C4::Context;
48
use C4::Context;
49
use C4::Output;
49
use C4::Output;
50
use CGI;
50
use CGI;
Lines 286-289 $template->param( Link Here
286
    biblionumber     => $biblionumber,
286
    biblionumber     => $biblionumber,
287
);
287
);
288
288
289
# Get current search from session
290
my $session = get_session($query->cookie("CGISESSID"));
291
if ($session) {
292
    foreach (qw(currentsearchquery currentsearchlimit currentsearchisoneresult)) {        
293
        $template->param( $_ => $session->param( $_ ) );
294
    }
295
}
296
289
output_html_with_http_headers $query, $cookie, $template->output;
297
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/opac/opac-detail.pl (-1 / +9 lines)
Lines 23-29 use strict; Link Here
23
use warnings;
23
use warnings;
24
24
25
use CGI;
25
use CGI;
26
use C4::Auth;
26
use C4::Auth qw(:DEFAULT get_session);
27
use C4::Branch;
27
use C4::Branch;
28
use C4::Koha;
28
use C4::Koha;
29
use C4::Serials;    #uses getsubscriptionfrom biblionumber
29
use C4::Serials;    #uses getsubscriptionfrom biblionumber
Lines 567-570 my $defaulttab = Link Here
567
        ? 'serialcollection' : 'subscription';
567
        ? 'serialcollection' : 'subscription';
568
$template->param('defaulttab' => $defaulttab);
568
$template->param('defaulttab' => $defaulttab);
569
569
570
# Get current search from session
571
my $session = get_session($query->cookie("CGISESSID"));
572
if ($session) {
573
    foreach (qw(currentsearchquery currentsearchlimit currentsearchisoneresult)) {        
574
        $template->param( $_ => $session->param( $_ ) );
575
    }
576
}
577
570
output_html_with_http_headers $query, $cookie, $template->output;
578
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/opac/opac-main.pl (+20 lines)
Lines 95-98 if (C4::Context->preference('GoogleIndicTransliteration')) { Link Here
95
        $template->param('GoogleIndicTransliteration' => 1);
95
        $template->param('GoogleIndicTransliteration' => 1);
96
}
96
}
97
97
98
# Restore current search index and query
99
#  multivalued CGI paramaters are returned as a packaged string separated by "\0" (null)
100
my $param_idx = $input->param('idx') || '';
101
my $param_q   = $input->param('q')   || '';
102
103
# indexes are query qualifiers, like 'title', 'author', etc.
104
# They can be single or multiple parameters separated by comma: kw,right-Truncation 
105
my @indexes = split("\0", $param_idx);
106
# if a simple index (only one)  display the index used in the top search box
107
if ($indexes[0] && !$indexes[1]) {
108
    $template->param( "ms_".$indexes[0] => 1 );
109
}
110
111
# an operand can be a single term, a phrase, or a complete ccl query
112
my @operands = split("\0",$param_q);
113
# if a simple search, display the value in the search box
114
if ($operands[0] && !$operands[1]) {
115
    $template->param( ms_value => $operands[0] );
116
}
117
98
output_html_with_http_headers $input, $cookie, $template->output;
118
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/opac/opac-search.pl (-1 / +9 lines)
Lines 118-123 if (C4::Context->preference('TagsEnabled')) { Link Here
118
	}
118
	}
119
}
119
}
120
120
121
# Read session
122
my $session = get_session($cgi->cookie("CGISESSID"));
123
121
## URI Re-Writing
124
## URI Re-Writing
122
# Deprecated, but preserved because it's interesting :-)
125
# Deprecated, but preserved because it's interesting :-)
123
# The same thing can be accomplished with mod_rewrite in
126
# The same thing can be accomplished with mod_rewrite in
Lines 394-399 if (C4::Context->preference('OpacSuppression')) { Link Here
394
397
395
$template->param ( LIMIT_INPUTS => \@limit_inputs );
398
$template->param ( LIMIT_INPUTS => \@limit_inputs );
396
399
400
# Set session variables
401
$session->param('currentsearchisoneresult', '0'); # init is only one result
402
$session->param('currentsearchquery', $query_cgi);
403
$session->param('currentsearchlimit', $limit_cgi);
404
397
## II. DO THE SEARCH AND GET THE RESULTS
405
## II. DO THE SEARCH AND GET THE RESULTS
398
my $total = 0; # the total results for the whole set
406
my $total = 0; # the total results for the whole set
399
my $facets; # this object stores the faceted results that display on the left-hand of the results page
407
my $facets; # this object stores the faceted results that display on the left-hand of the results page
Lines 538-543 for (my $i=0;$i<@servers;$i++) { Link Here
538
            } else {
546
            } else {
539
                print $cgi->redirect("/cgi-bin/koha/opac-detail.pl?biblionumber=$biblionumber");
547
                print $cgi->redirect("/cgi-bin/koha/opac-detail.pl?biblionumber=$biblionumber");
540
            } 
548
            } 
549
            $session->param('currentsearchisoneresult', 1);
541
            exit;
550
            exit;
542
        }
551
        }
543
        if ($hits) {
552
        if ($hits) {
544
- 

Return to bug 6120