fixed holds sorting; my-account link redirects to my-account; i18n cleanup

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
index f576c65..7dd7605 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
@@ -81,6 +81,8 @@ sub load {
 
     my $path = $self->apache->path_info;
 
+    $self->apache->log->info("path = $path; referer = " . $self->cgi->referer);
+
     return $self->load_simple("home") if $path =~ /opac\/home/;
     return $self->load_simple("advanced") if $path =~ /opac\/advanced/;
     return $self->load_login if $path =~ /opac\/login/;

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index ce275d4..dd89852 100644 (file)
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -84,9 +84,8 @@ sub fetch_user_holds {
     };
 
     my $first = 1;
-    my @collected;
-    my @holds;
-    my @ses;
+    my(@collected, @holds, @ses);
+
     while(1) {
         @ses = $mk_req_batch->() if $first;
         last if $first and not @ses;
@@ -108,7 +107,13 @@ sub fetch_user_holds {
         $first = 0;
     }
 
-    return \@holds;
+    # put the holds back into the original server sort order
+    my @sorted;
+    for my $id (@$hold_ids) {
+        push @sorted, grep { $_->{hold}->{hold}->id == $id } @holds;
+    }
+
+    return \@sorted;
 }
 
 sub handle_hold_update {

diff --git a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2
index 5f3ad5d..7156e55 100644 (file)
--- a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2
@@ -4,7 +4,7 @@
     <table cellpadding="0" cellspacing="10" border="0">
         <tr>
             <td colspan="3">
-                <span class="search_catalog_lbl">Search the Catalog</span>
+                <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
                 <a href="[% ctx.opac_root %]/advanced"
                     id="home_adv_search_link"><span
                     class="adv_search_font">Advanced Search</span></a>

diff --git a/Open-ILS/web/templates/default/opac/parts/topnav.tt2 b/Open-ILS/web/templates/default/opac/parts/topnav.tt2
index 243fc52..635c5c0 100644 (file)
--- a/Open-ILS/web/templates/default/opac/parts/topnav.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/topnav.tt2
@@ -1,13 +1,14 @@
 <div id="header">
     <div class="float-left">
-        <a href="http://www.kcls.org"><img alt="KCLS Logo"
+        <a href="http://www.kcls.org"><img alt="[% l('KCLS Logo') %]" 
             src="[% ctx.media_prefix %]/images/KCLS_logo_horiz.gif" /></a>
     </div>
     <div class="float-right">
         [% IF !ctx.user %]
         <div id="your-acct-login">
-            <a href="[% ctx.opac_root %]/login" id="home_myopac_link"><img
-                alt="Your Account Log in"
+            [% myopac_redirect = 'https://' _ ctx.hostname _ ctx.opac_root _ '/myopac/main' | url %]
+            <a href="[% ctx.opac_root %]/login?redirect_to=[% myopac_redirect %]" id="home_myopac_link"><img
+                alt="[% l('Your Account Log in') %]"
                 src="[% ctx.media_prefix %]/images/login-btn.png"
                 onmouseover="this.src='[% ctx.media_prefix %]/images/login-btn-hover.png';"
                 onmouseout="this.src='[% ctx.media_prefix %]/images/login-btn.png';" /></a>
@@ -22,22 +23,20 @@
                         </td>
                         <td id="dash_corner_mid1a">
                             <span id="dash_user">
-                                [%  # XXX TODO: some kind of standard helper
-                                    # function in TT2 to render human names,
-                                    # i18n aware.
-                                    ctx.user.first_given_name %]
-                                [% ctx.user.family_name %]
+                                [%  l('[_1] [_2]', ctx.user.first_given_name, ctx.user.family_name) %]
                             </span>
                         </td>
                         <td id="dash_corner_mid1b">
                             <img src="[% ctx.media_prefix %]/images/dash-divider.jpg" />
                         </td>
                         <td id="dash_corner_mid1c">
+
                             <a href="[% ctx.opac_root %]/myopac/main" class="pos-rel-top4"><img
                                 alt="[% l('My Account') %]"
                                 src="[% ctx.media_prefix %]/images/acct-btn.png"
                                 onmouseover="this.src='[% ctx.media_prefix %]/images/acct-btn-hover.png';"
                                 onmouseout="this.src='[% ctx.media_prefix %]/images/acct-btn.png';" /></a>
+
                             <a href="[% ctx.opac_root %]/logout" class="pos-rel-top4"
                                 id="logout_link"><img
                                 alt="[% l('Logout') %]"
@@ -107,12 +106,9 @@
 <div id="gold-links-holder">
     <div id="gold-links">
         <div id="header-links">
-            <a href="http://www.kcls.org/usingthelibrary/index.cfm">Using
-                the Library</a>
-            <a href="http://www.kcls.org/booksandreading/">Books &amp;
-                Reading</a>
-            <a href="http://www.kcls.org/research/index.cfm">Research &amp;
-                Homework</a>
+            <a href="http://www.kcls.org/usingthelibrary/index.cfm">Using the Library</a>
+            <a href="http://www.kcls.org/booksandreading/">Books &amp; Reading</a>
+            <a href="http://www.kcls.org/research/index.cfm">Research &amp; Homework</a>
             <a href="http://www.kcls.org/programs/">Programs &amp; Classes</a>
             <a href="http://www.kcls.org/events/">Events</a>
             <a href="/opac/extras/mobile/">Mobile Catalog</a>