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

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (+4 lines)
Lines 441-446 a .term { Link Here
441
	background-image:url(../../images/cart2.gif);
441
	background-image:url(../../images/cart2.gif);
442
}
442
}
443
443
444
#action a.comeback {
445
    background-image:url(../../images/previous.gif);
446
}
447
444
/* toolbar buttons */
448
/* toolbar buttons */
445
449
446
#toolbar {
450
#toolbar {
(-)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
		[% END %]</select>
73
		[% END %]</select>
74
[% IF ( ms_value ) %]
74
[% IF ( ms_value ) %]
75
        <input type="text" id = "transl1" name="q" value="[% ms_value |html %]" class="left" style="width: 35%; font-size: 111%;"/><div id="translControl"></div>
75
        <input type="text" id = "transl1" name="q" value="[% ms_value |html %]" class="left focus" style="width: 35%; font-size: 111%;"/><div id="translControl"></div>
76
[% ELSE %]
76
[% 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
[% END %]
78
[% END %]
79
   [% IF ( OpacAddMastheadLibraryPulldown ) %]
79
   [% IF ( 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/modules/opac-ISBDdetail.tt (+4 lines)
Lines 48-53 Link Here
48
	<div id="ulactioncontainer" class="container">
48
	<div id="ulactioncontainer" class="container">
49
<ul id="action">
49
<ul id="action">
50
50
51
    [% IF ( currentsearchquery ) %][% UNLESS ( currentsearchisoneresult ) %]
52
    <li><a class="comeback" href="/cgi-bin/koha/opac-search.pl?[% currentsearchquery %][% currentsearchlimit %]">Back to results</a></li>
53
    [% END %][% END %]
54
51
[% UNLESS ( norequests ) %]
55
[% UNLESS ( norequests ) %]
52
        [% IF ( opacuserlogin ) %]
56
        [% IF ( opacuserlogin ) %]
53
		[% IF ( RequestOnOpac ) %]
57
		[% IF ( RequestOnOpac ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tt (+4 lines)
Lines 203-208 $(document).ready(function(){ Link Here
203
    <div id="ulactioncontainer" class="container">
203
    <div id="ulactioncontainer" class="container">
204
<ul id="action">
204
<ul id="action">
205
205
206
    [% IF ( currentsearchquery ) %][% UNLESS ( currentsearchisoneresult ) %]
207
    <li><a class="comeback" href="/cgi-bin/koha/opac-search.pl?[% currentsearchquery %][% currentsearchlimit %]">Back to results</a></li>
208
    [% END %][% END %]
209
206
[% UNLESS ( norequests ) %]
210
[% UNLESS ( norequests ) %]
207
        [% IF ( opacuserlogin ) %]
211
        [% IF ( opacuserlogin ) %]
208
        [% IF ( RequestOnOpac ) %]
212
        [% IF ( RequestOnOpac ) %]
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (+4 lines)
Lines 795-800 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
795
<div id="ulactioncontainer" class="container">
795
<div id="ulactioncontainer" class="container">
796
<ul id="action">
796
<ul id="action">
797
797
798
    [% IF ( currentsearchquery ) %][% UNLESS ( currentsearchisoneresult ) %]
799
    <li><a class="comeback" href="/cgi-bin/koha/opac-search.pl?[% currentsearchquery %][% currentsearchlimit %]">Back to results</a></li>
800
    [% END %][% END %]
801
798
[% UNLESS ( norequests ) %]
802
[% UNLESS ( norequests ) %]
799
        [% IF ( opacuserlogin ) %]
803
        [% IF ( opacuserlogin ) %]
800
		[% IF ( RequestOnOpac ) %]
804
		[% IF ( RequestOnOpac ) %]
(-)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 582-585 my $defaulttab = Link Here
582
        ? 'serialcollection' : 'subscription';
582
        ? 'serialcollection' : 'subscription';
583
$template->param('defaulttab' => $defaulttab);
583
$template->param('defaulttab' => $defaulttab);
584
584
585
# Get current search from session
586
my $session = get_session($query->cookie("CGISESSID"));
587
if ($session) {
588
    foreach (qw(currentsearchquery currentsearchlimit currentsearchisoneresult)) {        
589
        $template->param( $_ => $session->param( $_ ) );
590
    }
591
}
592
585
output_html_with_http_headers $query, $cookie, $template->output;
593
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/opac/opac-search.pl (-3 / +10 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 395-400 if (C4::Context->preference('OpacSuppression')) { Link Here
395
398
396
$template->param ( LIMIT_INPUTS => \@limit_inputs );
399
$template->param ( LIMIT_INPUTS => \@limit_inputs );
397
400
401
# Set session variables
402
$session->param('currentsearchisoneresult', '0'); # init is only one result
403
$session->param('currentsearchquery', $query_cgi);
404
$session->param('currentsearchlimit', $limit_cgi);
405
398
## II. DO THE SEARCH AND GET THE RESULTS
406
## II. DO THE SEARCH AND GET THE RESULTS
399
my $total = 0; # the total results for the whole set
407
my $total = 0; # the total results for the whole set
400
my $facets; # this object stores the faceted results that display on the left-hand of the results page
408
my $facets; # this object stores the faceted results that display on the left-hand of the results page
Lines 538-544 for (my $i=0;$i<@servers;$i++) { Link Here
538
                print $cgi->redirect("/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=$biblionumber");
546
                print $cgi->redirect("/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=$biblionumber");
539
            } else {
547
            } else {
540
                print $cgi->redirect("/cgi-bin/koha/opac-detail.pl?biblionumber=$biblionumber");
548
                print $cgi->redirect("/cgi-bin/koha/opac-detail.pl?biblionumber=$biblionumber");
541
            } 
549
            }
550
            $session->param('currentsearchisoneresult', 1);
542
            exit;
551
            exit;
543
        }
552
        }
544
        if ($hits) {
553
        if ($hits) {
Lines 647-653 if ($query_desc || $limit_desc) { Link Here
647
656
648
# VI. BUILD THE TEMPLATE
657
# VI. BUILD THE TEMPLATE
649
# Build drop-down list for 'Add To:' menu...
658
# Build drop-down list for 'Add To:' menu...
650
my $session = get_session($cgi->cookie("CGISESSID"));
651
my @addpubshelves;
659
my @addpubshelves;
652
my $pubshelves = $session->param('pubshelves');
660
my $pubshelves = $session->param('pubshelves');
653
my $barshelves = $session->param('barshelves');
661
my $barshelves = $session->param('barshelves');
654
- 

Return to bug 6120