From: Jeff Godin Date: Fri, 20 Jul 2012 16:29:41 +0000 (-0400) Subject: Checking in wjr changes so far, minus a few files X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8354ce6ac73cbb9e7ddd47b95323a366b7968620;p=evergreen%2Ftadl.git Checking in wjr changes so far, minus a few files Checking in changes from wjr so far, minus changes made to two files: opac/parts/searchbar.tt2 opac/parts/record/extras.tt2 Signed-off-by: Jeff Godin --- diff --git a/templates_tadlskin/opac/myopac/circ_history.tt2 b/templates_tadlskin/opac/myopac/circ_history.tt2 index 4e8c861325..af1c2d6ed7 100644 --- a/templates_tadlskin/opac/myopac/circ_history.tt2 +++ b/templates_tadlskin/opac/myopac/circ_history.tt2 @@ -31,7 +31,7 @@
[%- INCLUDE "opac/parts/preserve_params.tt2" %] - +
diff --git a/templates_tadlskin/opac/myopac/hold_history.tt2 b/templates_tadlskin/opac/myopac/hold_history.tt2 index bc3cc6cfc0..2c3e6112d8 100644 --- a/templates_tadlskin/opac/myopac/hold_history.tt2 +++ b/templates_tadlskin/opac/myopac/hold_history.tt2 @@ -107,4 +107,5 @@ [% END %] + [% END %] diff --git a/templates_tadlskin/opac/myopac/lists.tt2 b/templates_tadlskin/opac/myopac/lists.tt2 index 88972c6c22..e5885526a9 100644 --- a/templates_tadlskin/opac/myopac/lists.tt2 +++ b/templates_tadlskin/opac/myopac/lists.tt2 @@ -52,8 +52,8 @@ -

[% l("Your existing lists") %]

[% INCLUDE "opac/parts/anon_list.tt2" %] +

[% l("Your existing lists") %]

[% IF ctx.bookbags.size %]
[% l('Saved Lists') %] @@ -88,10 +88,10 @@ [%- INCLUDE "opac/parts/preserve_params.tt2"; %] [% IF bbag.pub != 't' %] - + [% ELSE %] - + [% END %]
@@ -100,7 +100,7 @@ [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - +
@@ -108,17 +108,15 @@ [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - +
-
+
[% IF bbag.pub == 't'; %] - [% l('RSS Feed') %] + [% l('RSS') %] [% END %]
-
+
[% IF bbag.pub == 't'; %] bbag.id, depth => 0, locg => ctx.search_ou}, 1 ) - -%]'>[% l('HTML View') %] + -%]' class='tbutton small tadlblue'>[% l('HTML') %] [% END %]
@@ -141,7 +139,7 @@ value=CGI.param('sort') mode='bookbag' %] - +
@@ -163,7 +161,7 @@ [% l("Save changes to name or description?") %]
- + @@ -211,7 +209,7 @@ [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - + diff --git a/templates_tadlskin/opac/myopac/update_password.tt2 b/templates_tadlskin/opac/myopac/update_password.tt2 index c87fc5d71f..4fe4648897 100644 --- a/templates_tadlskin/opac/myopac/update_password.tt2 +++ b/templates_tadlskin/opac/myopac/update_password.tt2 @@ -26,8 +26,8 @@ [% l('Current Password') %] [% l('New Password') %] [% l('New Password Again') %] - + - +
[% END %] diff --git a/templates_tadlskin/opac/myopac/update_username.tt2 b/templates_tadlskin/opac/myopac/update_username.tt2 index a3a0bd2654..bb081a0b4e 100644 --- a/templates_tadlskin/opac/myopac/update_username.tt2 +++ b/templates_tadlskin/opac/myopac/update_username.tt2 @@ -30,8 +30,8 @@ [% l('Current Username') %][% ctx.user.usrname | html %] [% l('Current Password') %] [% l('New Username') %] - + - +
[% END %] diff --git a/templates_tadlskin/opac/parts/anon_list.tt2 b/templates_tadlskin/opac/parts/anon_list.tt2 index 00a898dc48..27c471d04c 100644 --- a/templates_tadlskin/opac/parts/anon_list.tt2 +++ b/templates_tadlskin/opac/parts/anon_list.tt2 @@ -7,7 +7,7 @@ [%- INCLUDE "opac/parts/preserve_params.tt2"; %] - + diff --git a/templates_tadlskin/opac/parts/base.tt2 b/templates_tadlskin/opac/parts/base.tt2 index 1721a9cbf1..80ba02b78a 100644 --- a/templates_tadlskin/opac/parts/base.tt2 +++ b/templates_tadlskin/opac/parts/base.tt2 @@ -8,7 +8,7 @@ [% END %] - + [% l('Catalog - [_1]', ctx.page_title) %] [% IF want_dojo %] diff --git a/templates_tadlskin/opac/parts/footer.tt2 b/templates_tadlskin/opac/parts/footer.tt2 index 76c6b7a56d..d6b2553187 100644 --- a/templates_tadlskin/opac/parts/footer.tt2 +++ b/templates_tadlskin/opac/parts/footer.tt2 @@ -4,11 +4,11 @@ -%]