From 32a8dc563d245e11ab35ee0361f27763a1d79978 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 30 Jan 2012 14:46:30 -0500 Subject: [PATCH] kpac : holds, misc Signed-off-by: Bill Erickson Signed-off-by: Mike Rylander --- Open-ILS/examples/kpac.xml | 6 +- Open-ILS/src/templates/kpac/checkout.tt2 | 203 +++++++++--------- Open-ILS/src/templates/kpac/parts/base.tt2 | 2 +- .../src/templates/kpac/parts/help_popups.tt2 | 26 +++ 4 files changed, 127 insertions(+), 110 deletions(-) create mode 100644 Open-ILS/src/templates/kpac/parts/help_popups.tt2 diff --git a/Open-ILS/examples/kpac.xml b/Open-ILS/examples/kpac.xml index 6e8ff498a9..6672bff2a7 100644 --- a/Open-ILS/examples/kpac.xml +++ b/Open-ILS/examples/kpac.xml @@ -31,9 +31,9 @@ http://en.wikipedia.org/wiki/Clarinet - su:entertainment sort('pubdate')#descending - su:politics sort('pubdate')#descending - su:economy sort('pubdate')#descending + su:entertainment sort(pubdate)#descending + su:politics sort(pubdate)#descending + su:economy sort(pubdate)#descending diff --git a/Open-ILS/src/templates/kpac/checkout.tt2 b/Open-ILS/src/templates/kpac/checkout.tt2 index 7050494167..d392168df9 100644 --- a/Open-ILS/src/templates/kpac/checkout.tt2 +++ b/Open-ILS/src/templates/kpac/checkout.tt2 @@ -11,113 +11,104 @@ [% INCLUDE 'kpac/parts/record_row.tt2' rec_id=ctx.bre_id%] -
- + +
-
+
+ + + + [% END %] + [% WRAPPER 'kpac/parts/help_popups.tt2' popup_id='password_help' %] +

[% l('Enter your password') %]

+ [% END %] + +
+

get it!

+

[% |l %]If you would like to request this item, please enter the following information and click
Submit below:[% END %]

+
+
+
 
+
+ + [% IF !ctx.user %] + [% seed = l(' Enter Numbers... ') %] +

[% l('Library Card Number without spaces:') %]

+
+ +
+ pin number help +
 
+
 
+ +

[% l('Password') %]

+
+ + + [% l('password help') %] + +
 
+
 
+ [% END %] + +

[% l('Choose a Pickup Library:') %]

+
+ [% def_lib = ctx.default_pickup_lib || ctx.physical_loc; + PROCESS "opac/parts/org_selector.tt2"; + PROCESS build_org_selector name='pickup_lib' + value=def_lib id='pickup_lib' can_have_vols_only=1 %] +
+
+
+
+ submit +
-
- submit + + + +
+
- -
- -
- -
- -
- - - - - -
-

get it!

-

If you would like to request this item, please enter the following information and click
Submit below:

-
-
-
 
-
-

Library Card Number without spaces:

-
- pin number help -
 
-
 
-

Pin Number:

-
- pin number help -
 
-
 
-

Choose a Pickup Library:

-
-
-
-
- submit -
-
- 		-
-
-

save it!

-

If you would like to save this item to a list to be requested later, please choose a location and click
Submit below.

-
-
-
 
-
-

Choose a Pickup Library:

-
-
 
- -
+ [% WRAPPER 'kpac/parts/help_popups.tt2' popup_id='card_help' %] + [% l('library card') %]
 +
+
+

save it!

+

If you would like to save this item to a list to be requested later, please choose a location and click
Submit below.

+
+
+
 
+
+

Choose a Pickup Library:

+
+
 
+ +
+
+
+ submit +
- -
-
- -
- - - -
 
-
- +
+
+ +
+ + + [% # in the absence of a sane referer, return to the detail page + url = ctx.kpac_root _ (ctx.referer.match('search_results') ? '/search_results' : '/detailed/' _ ctx.bre_id) %] + + + +
 
+
+ [% END %] diff --git a/Open-ILS/src/templates/kpac/parts/base.tt2 b/Open-ILS/src/templates/kpac/parts/base.tt2 index e3d122aedb..ae3f6b2523 100644 --- a/Open-ILS/src/templates/kpac/parts/base.tt2 +++ b/Open-ILS/src/templates/kpac/parts/base.tt2 @@ -14,6 +14,6 @@
[% content %]
[% INCLUDE 'kpac/parts/footer.tt2' %] - + diff --git a/Open-ILS/src/templates/kpac/parts/help_popups.tt2 b/Open-ILS/src/templates/kpac/parts/help_popups.tt2 new file mode 100644 index 0000000000..5399fb9107 --- /dev/null +++ b/Open-ILS/src/templates/kpac/parts/help_popups.tt2 @@ -0,0 +1,26 @@ +
+ +
-- 2.43.2