From 793f2829c4aeaa99de5c18693b61ffb543e22c1d Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 1 Sep 2011 14:41:42 -0400 Subject: [PATCH] TPac: more template scrubbing and cleaning Signed-off-by: Bill Erickson --- Open-ILS/src/templates/opac/myopac/prefs.tt2 | 142 +++------------------ .../src/templates/opac/myopac/prefs_notify.tt2 | 92 ------------- Open-ILS/src/templates/opac/parts/anon_list.tt2 | 4 +- .../src/templates/opac/parts/record/summary.tt2 | 2 +- .../src/templates/opac/parts/result/lowhits.tt2 | 56 +------- Open-ILS/src/templates/opac/parts/result/table.tt2 | 5 +- Open-ILS/src/templates/opac/parts/searchbar.tt2 | 6 +- Open-ILS/web/css/skin/default/opac/semiauto.css | 1 - 8 files changed, 25 insertions(+), 283 deletions(-) diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2 index 2db15e591d..2aeea79fb1 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2 @@ -58,95 +58,21 @@ - - [% l("Day Phone") %] - - [% ctx.user.day_phone | html %] - - [% l("Change") %] - - - - - - Enter New [% l("Day Phone") %]: - - - - - - - - - - + [% l("Day Phone") %] + [% ctx.user.day_phone | html %] + - - [% l("Evening Phone") %] - - [% ctx.user.evening_phone | html %] - - [% l("Change") %] - - - - New - [% l("Evening Phone") %]: - - - - + [% l("Evening Phone") %] + [% ctx.user.evening_phone | html %] + - - [% l("Other Phone") %] - - [% ctx.user.other_phone | html %] - - [% l("Change") %] - - - - Enter - New [% l("Other Phone") %]: - - - - + [% l("Other Phone") %] + [% ctx.user.other_phone | html %] + @@ -187,49 +113,19 @@ [% END %] - - [% l("Active Barcode") %] - + [% l("Active Barcode") %] [% ctx.user.card.barcode %] - - - [% l("Home Library") %] + [% l("Home Library") %] [% ctx.user.home_ou.name | html %] - [% l("Change") %] - - - - - New home library: - - - - - - - - + - - - [% l("Account Creation Date") %] - - + + [% l("Account Creation Date") %] + [% date.format(ctx.parse_datetime(ctx.user.create_date), DATE_FORMAT) %] @@ -334,12 +230,8 @@ - [% IF pending_addr; - url = mkurl('', {delete_pending => pending_addr.id}, 1); - ELSE; - url = mkurl('', {}, 1); - END %] - [% l('Discard Pending Address') %] + [% params = (pending_addr) ? {delete_pending => pending_addr.id} : {} %] + [% l('Discard Pending Address') %] [% l('Address changes will be verified by staff') %] diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 index 91a3ce55a2..3729d3758c 100644 --- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 +++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 @@ -3,7 +3,6 @@ myopac_page = "prefs_notify"; prefs_page = 'notify' %] -
@@ -32,97 +31,6 @@ - - - - - [% END %] diff --git a/Open-ILS/src/templates/opac/parts/anon_list.tt2 b/Open-ILS/src/templates/opac/parts/anon_list.tt2 index a4630ca1b2..5101117bcc 100644 --- a/Open-ILS/src/templates/opac/parts/anon_list.tt2 +++ b/Open-ILS/src/templates/opac/parts/anon_list.tt2 @@ -1,6 +1,6 @@ [% IF ctx.mylist.size %]
-
+
@@ -45,7 +45,7 @@ - + [% FOR item IN ctx.mylist; attrs = {marc_xml => ctx.mylist_marc_xml.$item}; PROCESS get_marc_attrs args=attrs %] diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2 index a256d35cf7..a44e447a7e 100644 --- a/Open-ILS/src/templates/opac/parts/record/summary.tt2 +++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2 @@ -108,7 +108,7 @@ - + diff --git a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 index fe2d1608e8..ecf245df97 100644 --- a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 @@ -1,22 +1,11 @@ -
+

[% l('Sorry, no entries were found for') %] [% IF is_advanced OR is_special; l('your search'); ELSE %] [% CGI.param('query') | html %] [% END %] -
- [% l('Did you mean') %] - ?

-
[% IF attrs.publisher; l("Publisher"); END %] [% attrs.publisher | html %][% attrs.publisher | html %] [% IF attrs.pubdate; l("Publication Date"); END %]
- - - - -
- [% l('Other Possibilities:') %] -
[% INCLUDE "opac/parts/result/lowhits_purchase.tt2" %] @@ -48,47 +37,4 @@

-
-
-
[% l("Few hits were returned for your search.") %]
-
[% l("Zero hits were returned for your search.") %]
-
- - -
- [% l("Maybe you meant:") %] - -
- -
- [% l("You will find more hits when searching all item formats:") %] - [% l("Search again with all formats?") %] -
- -
- [% l("You may also like to try these related searches:") %] -
- -
-
- -
- [% l("You may also wish to expand your search range to:") %] - -
- -
- [% l("You can try searching the same terms by:") %] - [% l("title") %] - [% l("author") %] - [% l("subject") %] - [% l("series") %] - [% l("keyword") %] -
-
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2 index ed58d26add..905307ed07 100644 --- a/Open-ILS/src/templates/opac/parts/result/table.tt2 +++ b/Open-ILS/src/templates/opac/parts/result/table.tt2 @@ -19,12 +19,13 @@
-
SIDEBAR TODO +
+ SIDEBAR TODO
- [% FOR rec IN ctx.records; diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2 index aec70dbf36..0215c7415d 100644 --- a/Open-ILS/src/templates/opac/parts/searchbar.tt2 +++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2 @@ -52,13 +52,9 @@ [% INCLUDE "opac/parts/coded_value_selector.tt2" attr=["mattype", "item_type"] none_ok=1 none_label=l('All Formats') %] [% END %] diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css index 7eae4b5e63..dbae5b241f 100644 --- a/Open-ILS/web/css/skin/default/opac/semiauto.css +++ b/Open-ILS/web/css/skin/default/opac/semiauto.css @@ -21,7 +21,6 @@ /* ------------------------------------------- */ -#lib_selector_span { display: none } .float-left { float: left; } .bookbag-share { float: left; padding: 5px 0; } .bookbag-controls { float: left; padding: 5px 0px 0px 10px; } -- 2.11.0
- + [% PROCESS build_org_selector name='loc' value=CGI.param('loc') %] - - [% l("Choose a library to search") %] -