From f64b4a4aca8884e46e1e60c7a4a38fd7e9157952 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Mon, 10 Sep 2012 09:32:17 -0400 Subject: [PATCH] TPAC: Remove noise, misleading text from myopac/holds/circs/circ_history There are many "class='hide_me'" elements that will never be displayed and which are currently just extra bits to ship over the wire. Same for the inline comments. Also move most of the inline styles out to the stylesheet. Also remove the explicit widths on the table cells; if the font size changes or the translated text is wider than the table cells, then the display will become comical. Also remove explicit
tags from localized strings; given the likelihood that font sizes and column widths will change,
tags inside localized strings make very little sense. Signed-off-by: Dan Scott Signed-off-by: Kathy Lussier Signed-off-by: Lebbeous Fogle-Weekley --- Open-ILS/src/templates/opac/css/style.css.tt2 | 24 +++- .../src/templates/opac/myopac/circ_history.tt2 | 41 ++---- Open-ILS/src/templates/opac/myopac/circs.tt2 | 85 +++--------- Open-ILS/src/templates/opac/myopac/holds.tt2 | 146 ++++++--------------- .../templates/opac/parts/login/password_hint.tt2 | 4 +- .../src/templates/opac/parts/place_hold_result.tt2 | 2 +- Open-ILS/web/css/skin/default/opac/semiauto.css | 6 +- 7 files changed, 104 insertions(+), 204 deletions(-) diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2 index d988d050d6..c22b9cedb3 100644 --- a/Open-ILS/src/templates/opac/css/style.css.tt2 +++ b/Open-ILS/src/templates/opac/css/style.css.tt2 @@ -285,6 +285,11 @@ span.dash_divider { text-decoration: none; } +.checkbox_col { + width: 1%; + padding-left: 10px !important; +} + #adv_search.on, #num_search.on, #expert_search.on { color: [% css_colors.accent_darker %]; background: [% css_colors.background %]; @@ -584,6 +589,17 @@ div.format_icon { margin:0; } +#holds_temp_parent tr td div { + margin-top: 10px; + margin-bottom: 10px; +} + +#holds_temp_parent tr td div.format_icon { + margin-top: 6px; + margin-bottom: 6px; + float: none; +} + #results_header_bar { background: [% css_colors.accent_medium %]; border-top:1px solid [% css_colors.accent_mediumdark %]; @@ -804,11 +820,17 @@ table.acct_notes th { font-weight:bold; text-transform:uppercase; font-size: [% css_fonts.size_smaller %]; + border-collapse: collapse; } #acct_checked_main_header td, #acct_holds_main_header td, #acct_checked_hist_header td, #acct_list_header td, #acct_list_header_anon td, #temp_list_holds td { background: [% css_colors.accent_lighter2 %]; - padding: 8px 0px 7px 0px; + padding: 10px; +} + +#acct_checked_main_header th, #acct_holds_main_header th, #acct_checked_hist_header th, #acct_list_header th, #acct_list_header_anon th, #temp_list_holds th { + text-align: left; + padding: 0px 10px 0px 10px; } #acct_list_header select, #acct_list_header_anon select { diff --git a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates/opac/myopac/circ_history.tt2 index 4e8c861325..9b6d78d8ae 100644 --- a/Open-ILS/src/templates/opac/myopac/circ_history.tt2 +++ b/Open-ILS/src/templates/opac/myopac/circ_history.tt2 @@ -39,34 +39,19 @@
[% IF ctx.circs.size < 1 %] -
- [% l('There are no items in your circulation history.') %] -
+
[% l('There are no items in your circulation history.') %]
[% ELSE %]
- - +
+ - - - - - - + + + + + + @@ -74,7 +59,7 @@ attrs = {marc_xml => circ.marc_xml}; PROCESS get_marc_attrs args=attrs; %] - - - -
- [% l('Title') %] / - [% l('Author') %] - - [% l('Checkout Date') %] - - [% l('Due Date') %] - - [% l('Date Returned') %] - - [% l('Barcode') %] - - [% l('Call Number') %] - [% l('Title / Author') %][% l('Checkout Date') %][% l('Due Date') %][% l('Date Returned') %][% l('Barcode') %][% l('Call Number') %]
+ [% attrs.title | html %] [% IF attrs.author %] / @@ -83,13 +68,13 @@ )%]">[% attrs.author | html %] [% END %] + [% date.format(ctx.parse_datetime(circ.circ.xact_start),DATE_FORMAT); %] + [% date.format(ctx.parse_datetime(circ.circ.due_date),DATE_FORMAT); %] + [% IF circ.circ.checkin_time; date.format(ctx.parse_datetime(circ.circ.checkin_time),DATE_FORMAT); diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2 index bf3ab0e8cd..8ff44ac7fe 100644 --- a/Open-ILS/src/templates/opac/myopac/circs.tt2 +++ b/Open-ILS/src/templates/opac/myopac/circs.tt2 @@ -15,15 +15,10 @@
[% l('Current Items Checked Out') %] - - [% l('Export List') %] -
[% IF ctx.circs.size < 1 %] -
- [% l('You have no items checked out.') %] -
+
[% l('You have no items checked out.') %]
[% ELSE %] [% IF ctx.success_renewals %]
@@ -52,59 +47,37 @@ class="opac-button" />
- Renewing Help[% l('Renewing Help') %]
- +
+ - - - - - + + + + + + -
+ - - - - Title - / - - Author - - - Renews
Left - - 		- Due Date - - barcode - - call number - [% l('Title / Author') %][% l('Renewals Left') %][% l('Due Date') %][% l('Barcode') %][% l('Call number') %]
- -
-
- + + [% FOR circ IN ctx.circs; attrs = {marc_xml => circ.marc_xml}; PROCESS get_marc_attrs args=attrs; %] - - - [% due_date = ctx.parse_datetime(circ.circ.due_date); due_class = (date.now > date.format(due_date, '%s')) ? 'error' : ''; %] - - - @@ -148,25 +121,5 @@ [% END %] -
-
-
[% l("Other Circulations") %]
-
+ + [% attrs.title | html %] @@ -114,20 +87,20 @@ ) %]">[% attrs.author | html %] [% END %] + [% circ.circ.renewal_remaining %] + [% date.format(due_date, DATE_FORMAT) %] + [% circ.circ.target_copy.barcode | html %] + [% circ.circ.target_copy.call_number.label | html %]
- - - - - - - - - - - -
[% l("Circulating Library") %][% l("Circulation Type") %][% l("Please return by ...") %]
- - -
-
[% END %] diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2 index 8321067fc7..5b5a36ab6d 100644 --- a/Open-ILS/src/templates/opac/myopac/holds.tt2 +++ b/Open-ILS/src/templates/opac/myopac/holds.tt2 @@ -47,7 +47,7 @@ - Export List + [% l('Export List') %]
@@ -73,77 +73,55 @@ Holds Help [% IF ctx.hold_suspend_post_capture; - l('One or more holds could not be suspended because
the item is at (or en route to) the pickup library.'); + l('One or more holds could not be suspended because the item is at (or en route to) the pickup library.'); END; %] - [% l("Show") %]     [% IF CGI.param("available") %] - [% l('all') %] | - [% l("only available") %] + [% l('Show all') %] | + [% l("Show only available") %] [% ELSE %] - [% l("all") %] | - [% l("only available") %] + [% l("Show all") %] | + [% l("Show only available") %] [% END %]     [% l("holds") %] [% IF ctx.holds.size < 1 %] -
- [% l('No holds found.') %] -
+
[% l('No holds found.') %]
[% ELSE %] - +
+ +
+
+ - - - - - - - - + + + + + + + + + -
+ - - - - Title - - - Author - - Format - - Pickup Location - ActivateCancel if not
filled by		Active - Status - [% l('Title') %][% l('Author') %][% l('Format') %][% l('Pickup Location') %][% l('Activate') %][% l('Cancel if not filled by') %][% l('Active') %][% l('Status') %]
-
- -
- - + [% FOR hold IN ctx.holds; attrs = {marc_xml => hold.marc_xml}; @@ -151,11 +129,11 @@ ahr = hold.hold.hold %] - - - - - - - - - @@ -224,31 +188,5 @@ [% END %] - - [% l("Are you sure you wish to cancel the selected holds?") %] - [% l("Are you sure you wish to suspend the selected holds? If an item has already been selected to fulfill the hold, it will not be suspended") %] - [% l("Are you sure you wish to activate the selected holds?") %] - [% l("Are you sure you wish to change the activate date for the selected holds?") %] - [% l("Select an automatic activation date. If no date is chosen, the holds will remain suspended until they are manually activated.") %] - -
+ -
+
+
[% title = attrs.title; IF ahr.hold_type == 'P'; @@ -165,52 +143,38 @@ [% title | html %]
-
+
+ -
+
+
[% IF attrs.format_icon %] [% attrs.format_label | html %] [% END %]
+ [% ctx.get_aou(ahr.pickup_lib).name | html %] - - [% IF ahr.frozen == 't' AND - ahr.thaw_date; + + [% IF ahr.frozen == 't' AND ahr.thaw_date; date.format(ctx.parse_datetime(ahr.thaw_date), DATE_FORMAT); END %] - + [% IF ahr.expire_time; date.format(ctx.parse_datetime(ahr.expire_time), DATE_FORMAT); END %] - + [% l(ahr.frozen == 'f' ? 'Active' : 'Suspended') %] -
+
+
[% PROCESS get_hold_status hold=hold; %]
- -
[% l("Processing holds... This may take a moment.") %]
- - - [% l("If you wish to cancel the selected hold, click OK, otherwise click Cancel.") %] - - -
-
- [% l("Select an automatic activation date. If no date is chosen, the holds will remain suspended until they are manually activated.") %] -
-

- -

-

- -

[% END %] diff --git a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 index a95b47fa78..920ae2ee84 100644 --- a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 +++ b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 @@ -1,5 +1,3 @@ - [% | l('
', '
') %] - If this is your first time logging in, please enter [_1] the last 4 digits of your phone number. [_2] Example: 0926 - [% END %] +[%- l('If this is your first time logging in, please enter the last 4 digits of your phone number. Example: 0926'); %] diff --git a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 index b933d6a8d5..eb05167f11 100644 --- a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 +++ b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 @@ -116,7 +116,7 @@
- [% |l %]You have permission to override some of the failed holds.
Click Submit to override and place your hold on the selected items.[% END %] + [% |l %]You have permission to override some of the failed holds. Click Submit to override and place your hold on the selected items.[% END %]