From 9f49869b4c1823394a66317bb802972ce618cc2f Mon Sep 17 00:00:00 2001 From: senator Date: Thu, 10 Feb 2011 13:15:19 -0500 Subject: [PATCH] some progress on the place_hold page; ou selector improvements, etc --- Open-ILS/web/css/skin/default/opac/style.css | 8 +- Open-ILS/web/templates/default/opac/home.tt2 | 2 +- .../default/opac/parts/advanced/search.tt2 | 9 +- .../web/templates/default/opac/parts/libselect.tt2 | 33 ------ .../templates/default/opac/parts/org_selector.tt2 | 23 ++++ .../templates/default/opac/parts/place_hold.tt2 | 131 ++++++++++++--------- .../web/templates/default/opac/parts/searchbar.tt2 | 11 +- 7 files changed, 118 insertions(+), 99 deletions(-) delete mode 100644 Open-ILS/web/templates/default/opac/parts/libselect.tt2 create mode 100644 Open-ILS/web/templates/default/opac/parts/org_selector.tt2 diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css index 1dc5d31fcd..b3a8bbce7b 100644 --- a/Open-ILS/web/css/skin/default/opac/style.css +++ b/Open-ILS/web/css/skin/default/opac/style.css @@ -518,12 +518,8 @@ div.select-wrapper:hover { border-bottom: 1px solid black; } -#main-content { - /* on devcatalog: width: 974px; margin:auto; padding-left:0px; */ - width: 694px; - margin: auto; - padding-left: 17px; -} +#main-content-home { width: 694px; margin: auto; padding-left: 17px; } +#main-content { width: 974px; margin:auto; padding-left: 0px; } #main-content .login_boxes { border: 1px solid #dedede; diff --git a/Open-ILS/web/templates/default/opac/home.tt2 b/Open-ILS/web/templates/default/opac/home.tt2 index f6c4ea5c4c..be2696334e 100644 --- a/Open-ILS/web/templates/default/opac/home.tt2 +++ b/Open-ILS/web/templates/default/opac/home.tt2 @@ -6,7 +6,7 @@ [% INCLUDE "default/opac/parts/searchbar.tt2" %]
-
+
[% INCLUDE "default/opac/parts/homesearch.tt2" %]
diff --git a/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2 b/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2 index 44fb6b38fe..f0beef983c 100644 --- a/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2 +++ b/Open-ILS/web/templates/default/opac/parts/advanced/search.tt2 @@ -28,7 +28,14 @@ [% l("Search Library") %]

- [% INCLUDE "default/opac/parts/libselect.tt2" %] + + [% PROCESS "default/opac/parts/org_selector.tt2"; + PROCESS build_org_selector name='loc' value=loc %] + + + [% l("Choose a library to search") %] +

[% l("Limit to Available") %] diff --git a/Open-ILS/web/templates/default/opac/parts/libselect.tt2 b/Open-ILS/web/templates/default/opac/parts/libselect.tt2 deleted file mode 100644 index 59cdfa6cb6..0000000000 --- a/Open-ILS/web/templates/default/opac/parts/libselect.tt2 +++ /dev/null @@ -1,33 +0,0 @@ -[% # XXX TODO probably put this BLOCK somewhere else so it can be used widely. - # Org Unit Selector Widget : - # PROCESS build_org_selector id='selector-id' name='selector-name' - BLOCK build_org_selector; - first_run = 0; - IF !org_unit; - org_unit = ctx.aou_tree; - first_run = 1; -%] - - [% END %] -[% END %] - - - - [% PROCESS build_org_selector name='loc' value=loc %] - - - [% l("Choose a library to search") %] - - diff --git a/Open-ILS/web/templates/default/opac/parts/org_selector.tt2 b/Open-ILS/web/templates/default/opac/parts/org_selector.tt2 new file mode 100644 index 0000000000..aa99e91b0b --- /dev/null +++ b/Open-ILS/web/templates/default/opac/parts/org_selector.tt2 @@ -0,0 +1,23 @@ +[% + BLOCK build_org_selector_options; %] + + [% FOR child IN walker.children; + PROCESS build_org_selector_options walker=child value=value; + END; + END; + + # XXX TODO probably put this BLOCK somewhere else so it can be used widely. + # Org Unit Selector Widget : + # PROCESS build_org_selector id='selector-id' name='selector-name' + BLOCK build_org_selector; +%] + +[% END %] diff --git a/Open-ILS/web/templates/default/opac/parts/place_hold.tt2 b/Open-ILS/web/templates/default/opac/parts/place_hold.tt2 index 7fc9f31ac4..45f43b14c7 100644 --- a/Open-ILS/web/templates/default/opac/parts/place_hold.tt2 +++ b/Open-ILS/web/templates/default/opac/parts/place_hold.tt2 @@ -1,3 +1,8 @@ +[% USE CGI; + PROCESS "default/opac/parts/marc_misc.tt2"; + attrs = {marc_xml => ctx.marc_xml}; + PROCESS get_marc_attrs args=attrs; +%]
@@ -9,13 +14,16 @@ - + - + @@ -28,28 +36,40 @@ [% l("Checking for possibility of hold fulfillment...") %]
-
-

Place Hold

-

- You would like to place a hold on - "" - to be picked up at - "".
- If this is correct, press SUBMIT.

-

- If you would like to change the library pick up location, select - from the        -
- Location dropdown menu. -

-

If you use the Traveling Library Center (TLC) and ABC Express - services, please select "Outreach" to have the item delivered - during your scheduled visit.

- Submit -        - Cancel +
+
+ + + +

Place Hold

+

+ You would like to place a hold on + [% attrs.title %] + to be picked up at + + [% ctx.find_aou(ctx.default_pickup_lib).name %]. +
+ If this is correct, press SUBMIT. +

+

+ If you would like to change the library pick up location, select + from the        + [% PROCESS "default/opac/parts/org_selector.tt2"; + PROCESS build_org_selector name='pickup_lib' value=ctx.default_pickup_lib %]
+ Location dropdown menu. +

+

If you use the Traveling Library Center (TLC) and ABC Express + services, please select "Outreach" to have the item delivered + during your scheduled visit.

+ +        + Cancel +


* If you need your item today, and it is checked in at your library, please place your hold and then call your library to set it @@ -124,7 +144,7 @@ [% l("Contact email address") %]: - ([% l("Patron has no configured email address)" %])
+ ([% l("Patron has no configured email address") %])
([% l("See") %] [% l("My Account") %] [% l("for setting your email address") %]) @@ -234,37 +254,37 @@

-
- Place hold on selected
- Remove selected - - - - - - - -
- - - - Title -
- - - - - - - - - +
+ Place hold on selected
+ Remove selected + +
+ + + + - -
+ + + + Title +
- Back to search results + + + + + + + + + + + + +
+ Back to search results
@@ -283,5 +303,4 @@ [% l("PATRON BARRED. Please see any notes in the \"Staff Notes\" section of your \"My Account\" page or contact your local library.") %] [% l("This hold is no longer valid. It's likely that the target for the hold was deleted from the system. Please cancel this hold and place a new one.") %] [% l("The patron barcode entered as the hold recipient is invalid.") %] -
diff --git a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 index 50ae309211..0a469ebfbc 100644 --- a/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 +++ b/Open-ILS/web/templates/default/opac/parts/searchbar.tt2 @@ -1,3 +1,4 @@ +[% PROCESS "default/opac/parts/org_selector.tt2" %]