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/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 ( currentsearchurl ) %][% UNLESS ( currentsearchisoneresult ) %]
52
    <li><a class="comeback" href="[% currentsearchurl %]">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 ( currentsearchurl ) %][% UNLESS ( currentsearchisoneresult ) %]
207
    <li><a class="comeback" href="[% currentsearchurl %]">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 808-813 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
808
<div id="ulactioncontainer" class="container">
808
<div id="ulactioncontainer" class="container">
809
<ul id="action">
809
<ul id="action">
810
810
811
    [% IF ( currentsearchurl ) %][% UNLESS ( currentsearchisoneresult ) %]
812
    <li><a class="comeback" href="[% currentsearchurl %]">Back to results</a></li>
813
    [% END %][% END %]
814
811
[% UNLESS ( norequests ) %]
815
[% UNLESS ( norequests ) %]
812
        [% IF ( opacuserlogin ) %]
816
        [% IF ( opacuserlogin ) %]
813
		[% IF ( RequestOnOpac ) %]
817
		[% IF ( RequestOnOpac ) %]
(-)a/opac/opac-ISBDdetail.pl (-1 / +10 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 205-208 if ( C4::Context->preference("OPACAmazonEnabled") == 1 ) { Link Here
205
    $template->param( AMAZONREVIEWS    => \@reviews );
205
    $template->param( AMAZONREVIEWS    => \@reviews );
206
}
206
}
207
207
208
# Get current search from session
209
my $session = get_session($query->cookie("CGISESSID"));
210
if ($session) {
211
    $template->param(
212
        currentsearchurl       => $session->param("currentsearchurl"),
213
        currentsearchisoneresult => $session->param("currentsearchisoneresult"),
214
    );
215
}
216
208
output_html_with_http_headers $query, $cookie, $template->output;
217
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/opac/opac-MARCdetail.pl (-1 / +10 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
    $template->param(
293
        currentsearchurl       => $session->param("currentsearchurl"),
294
        currentsearchisoneresult => $session->param("currentsearchisoneresult"),
295
    );
296
}
297
289
output_html_with_http_headers $query, $cookie, $template->output;
298
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/opac/opac-detail.pl (-1 / +10 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 594-597 my $defaulttab = Link Here
594
        ? 'serialcollection' : 'subscription';
594
        ? 'serialcollection' : 'subscription';
595
$template->param('defaulttab' => $defaulttab);
595
$template->param('defaulttab' => $defaulttab);
596
596
597
# Get current search from session
598
my $session = get_session($query->cookie("CGISESSID"));
599
if ($session) {
600
    $template->param(
601
        currentsearchurl       => $session->param("currentsearchurl"),
602
        currentsearchisoneresult => $session->param("currentsearchisoneresult"),
603
    );
604
}
605
597
output_html_with_http_headers $query, $cookie, $template->output;
606
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/opac/opac-search.pl (-3 / +11 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 407-412 if (C4::Context->preference('OpacSuppression')) { Link Here
407
410
408
$template->param ( LIMIT_INPUTS => \@limit_inputs );
411
$template->param ( LIMIT_INPUTS => \@limit_inputs );
409
412
413
# Set session variables
414
$session->param('currentsearchisoneresult', '0'); # init is only one result
415
my $abs_url = $cgi->url( -absolute => 1, -query => 1 );
416
$abs_url =~ s/;/&/g; # CGI returns url with ; instead of & to separate url parameters
417
$session->param('currentsearchurl', $abs_url);
418
410
## II. DO THE SEARCH AND GET THE RESULTS
419
## II. DO THE SEARCH AND GET THE RESULTS
411
my $total = 0; # the total results for the whole set
420
my $total = 0; # the total results for the whole set
412
my $facets; # this object stores the faceted results that display on the left-hand of the results page
421
my $facets; # this object stores the faceted results that display on the left-hand of the results page
Lines 551-557 for (my $i=0;$i<@servers;$i++) { Link Here
551
                print $cgi->redirect("/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=$biblionumber");
560
                print $cgi->redirect("/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=$biblionumber");
552
            } else {
561
            } else {
553
                print $cgi->redirect("/cgi-bin/koha/opac-detail.pl?biblionumber=$biblionumber");
562
                print $cgi->redirect("/cgi-bin/koha/opac-detail.pl?biblionumber=$biblionumber");
554
            } 
563
            }
564
            $session->param('currentsearchisoneresult', 1);
555
            exit;
565
            exit;
556
        }
566
        }
557
        if ($hits) {
567
        if ($hits) {
Lines 672-678 if ($query_desc || $limit_desc) { Link Here
672
682
673
# VI. BUILD THE TEMPLATE
683
# VI. BUILD THE TEMPLATE
674
# Build drop-down list for 'Add To:' menu...
684
# Build drop-down list for 'Add To:' menu...
675
my $session = get_session($cgi->cookie("CGISESSID"));
676
my @addpubshelves;
685
my @addpubshelves;
677
my $pubshelves = $session->param('pubshelves');
686
my $pubshelves = $session->param('pubshelves');
678
my $barshelves = $session->param('barshelves');
687
my $barshelves = $session->param('barshelves');
679
- 

Return to bug 6120