Merge remote-tracking branch 'esi/pines-tpac-galileo' into 2.5-beta1-galileo

Conflicts:
	Open-ILS/src/templates/opac/parts/footer.tt2

diff --cc Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm
Simple merge

diff --cc Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Simple merge

diff --cc Open-ILS/src/templates/opac/parts/footer.tt2
index bd4aea4,8c7d327..0fafd1b
--- 1/Open-ILS/src/templates/opac/parts/footer.tt2
--- 2/Open-ILS/src/templates/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates/opac/parts/footer.tt2
@@@ -1,17 -1,12 +1,19 @@@
  <div id="footer-wrap">
  <div id="footer">
-     <a href="http://www.galileo.usg.edu/">[% l('GALILEO') %]</a>
 +    [% IF ctx.get_org_setting(
 +        ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
 +    <a href="[% mkurl(ctx.opac_root _ '/register') %]">[% 
 +        l('Request Library Card') %]</a> &nbsp;|&nbsp;
 +    [% ELSE %]
 +    <a href="/eg/opac/home">[% l("Home") %]</a> &nbsp;|&nbsp;
 +    [% END %]
 +    <!-- <a href="/eg/kpac/home">[% l("Kids' Catalog") %]</a> &nbsp;|&nbsp; -->
 +    <a href="http://www.georgialibraries.org/lib/directories/pineslibdir.html">[% l('Find a Library Near Me') %]</a> &nbsp;|&nbsp;
 +    <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> &nbsp;|&nbsp;
 +    <a href="http://www.georgialibraries.org/public/pines.html">[% l('About PINES') %]</a> &nbsp;|&nbsp;
 -    <a href="http://example.com">[% l('Bottom Link 2') %]</a> &nbsp;|&nbsp;
 -    <a href="http://example.com">[% l('Bottom Link 3') %]</a> &nbsp;|&nbsp;
 -    <a href="http://example.com">[% l('Bottom Link 4') %]</a> &nbsp;|&nbsp;
 -    <a href="http://example.com">[% l('Bottom Link 5') %]</a>
+     <a href="/">[% l('Dynamic catalog') %]</a> &nbsp;|&nbsp;
+     [% gurl = mkurl(ctx.opac_root _ '/galileo', {}, 1) %]
+     <a href="[% gurl %]"> [% l('GALILEO') %] </a> &nbsp;|&nbsp;
      [% IF ctx.timing %]
      <div id="timing">
          [% FOR event IN ctx.timing %]