Further modifications in preparation for 2.7 upgrade

Conflicts:
	Open-ILS/src/templates/opac/browse.tt2

diff --git a/Open-ILS/src/templates/kpac/parts/header.tt2 b/Open-ILS/src/templates/kpac/parts/header.tt2
index 6dcf401..8f75dce 100644 (file)
--- a/Open-ILS/src/templates/kpac/parts/header.tt2
+++ b/Open-ILS/src/templates/kpac/parts/header.tt2
@@ -19,7 +19,7 @@
     </div>
     <div class="header_menu">
         <!-- menu rendered in reverse order -->
-        <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> 
+        <!-- <a href="http://pines.georgialibraries.org/catalog-help">[% l('Help') %]</a> --> 
         <a href="http://www.galileo.usg.edu/kids">GALILEO for Kids</a>
         <a href="http://gapines.org">Full PINES Catalog</a>
         <a href="http://www.georgialibraries.org/directories/pineslibdir.php">Find a Library</a> 
@@ -29,7 +29,7 @@
                 {redirect_to => redir.replace('^https:', 'http:')}, 1) %]">[% 
                     l('Logout ([_1] [_2])', ctx.user.first_given_name, ctx.user.family_name) %]</a>
         [% ELSE %]
-            <a href="[% mkurl(ctx.opac_root _ '/login').replace('^http:', 'https:') %]">[% l('Login') %]</a>
+            <a href="[% mkurl(ctx.opac_root _ '/login').replace('^http:', 'https:') %]">[% l('My Account') %]</a>
         [% END %]
     </div>
     

diff --git a/Open-ILS/src/templates/opac/myopac/update_username.tt2 b/Open-ILS/src/templates/opac/myopac/update_username.tt2
index fa7d703..5c38a8a 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/update_username.tt2
+++ b/Open-ILS/src/templates/opac/myopac/update_username.tt2
@@ -31,7 +31,8 @@
     <table> 
         <tr><td>[% l('Current Username') %]</td><td>[% ctx.user.usrname | html %]</td></tr>
         <tr><td>[% l('Current Password') %]</td><td><input type='password' name='current_pw'/></td></tr>
-        <tr><td>[% l('New Username') %]</td><td><input type='text' name='username' value='[% ctx.invalid_username | html %]'/></td></tr>
+        <tr><td valign="top">[% l('New Username') %]</td><td><input type='text' name='username' value='[% ctx.invalid_username | html %]'/><br/>
+                   <i>* User name cannot start with a number.</i></td></tr>
         <tr><td colspan='2' align='right' style="text-align:right;">
                    <input type='submit' value="[% l('Save') %]" alt="[% l('Save') %]" class="opac-button" style="padding-left:20px;padding-right:20px;" />
         </td></tr>

diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 486c9a7..7628835 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -102,7 +102,7 @@ END; # FOREACH bib
             </td>
         [% END %]
             <td property="availableAtOrFrom">[% copy_info.copy_location | html %]</td>
-            <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn', {copy_id => copy_info.id}) %]">Send Text</a>)[% END %]</td>
+            <td><span property="sku">[% callnum | html %]</span> [% IF ctx.get_org_setting(CGI.param('loc') OR ctx.aou_tree.id, 'sms.enable') == 1 %](<a href="[% mkurl(ctx.opac_root _ '/sms_cn', {copy_id => copy_info.id}) %]">Send Text Message</a>)[% END %]</td>
             [%- IF has_parts == 'true' %]
             <td>[% copy_info.part_label | html %]</td>
             [%- END %]

diff --git a/Open-ILS/src/templates/opac/parts/record/navigation.tt2 b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
index f7c905b..455af87 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/record/navigation.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/navigation.tt2
@@ -40,4 +40,10 @@
 
     </div>
 </div>
+[% ELSE %]
+<div class="rdetail_header">
+    <span class="rdetail_results">
+           <a href='javascript:history.go(-1)'>[% l('&#9668; Return to Previous Page') %]</a>
+    </span>
+</div>
 [% END %]