From: Bill Erickson Date: Fri, 9 Sep 2011 20:41:45 +0000 (-0400) Subject: TPac: Review & More content cafe option on results page X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=15c70c70e474fa234534adc1b0cf75a7812a65df;p=contrib%2FConifer.git TPac: Review & More content cafe option on results page Links to a new top-level page. Also cleaned up some bare &'s in the content cafe url. added a ctx->proto = http / https var. Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm index 92dc3c5662..0db9912acd 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb.pm @@ -152,6 +152,7 @@ sub load_context { $ctx->{base_url} = $cgi->url(-base => 1); $ctx->{skin} = $cgi->cookie(OILS_HTTP_COOKIE_SKIN) || 'default'; $ctx->{theme} = $cgi->cookie(OILS_HTTP_COOKIE_THEME) || 'default'; + $ctx->{proto} = $cgi->https ? 'https' : 'http'; # Any paths configured in Apache will be placed in front of # any paths configured in the global oils_web.xml config. diff --git a/Open-ILS/src/templates/opac/parts/record/summaryplus.tt2 b/Open-ILS/src/templates/opac/parts/record/summaryplus.tt2 index d397b48678..7796213fa8 100644 --- a/Open-ILS/src/templates/opac/parts/record/summaryplus.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/summaryplus.tt2 @@ -12,8 +12,8 @@ [% ident = attrs.isbn_clean || attrs.upc %] diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2 index 3948515f92..0706ef6766 100644 --- a/Open-ILS/src/templates/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/table.tt2 @@ -224,6 +224,17 @@ [% label %] + [% IF ENV.OILS_CONTENT_CAFE_USER %] + + [% END %]