From 919db765db4879fefb2bb6f01c52d73ce059bf18 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 25 Jan 2012 15:26:12 -0500 Subject: [PATCH] kpac : templating; url-based searching Signed-off-by: Bill Erickson --- .../src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm | 2 +- Open-ILS/src/templates/kpac/category.tt2 | 8 +- Open-ILS/src/templates/kpac/checkout.tt2 | 8 +- Open-ILS/src/templates/kpac/checkout_results.tt2 | 7 +- Open-ILS/src/templates/kpac/detailed.tt2 | 8 +- Open-ILS/src/templates/kpac/parts/subpage.tt2 | 123 ++++++++-------- Open-ILS/src/templates/kpac/search_results.tt2 | 155 ++++++++++++--------- 7 files changed, 171 insertions(+), 140 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm index 63cd098955..bbbba4506e 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm @@ -29,7 +29,7 @@ sub load { return $self->load_simple("checkout") if $path =~ m|kpac/checkout|; return $self->load_simple("checkout_results") if $path =~ m|kpac/checkout_results|; return $self->load_simple("detailed") if $path =~ m|kpac/detailed|; - return $self->load_simple("search_results") if $path =~ m|kpac/search_results|; + return $self->load_rresults if $path =~ m|kpac/search_results|; # inherited from tpac # ---------------------------------------------------------------- # Everything below here requires SSL diff --git a/Open-ILS/src/templates/kpac/category.tt2 b/Open-ILS/src/templates/kpac/category.tt2 index eab0e2df15..0a63e9d0dc 100644 --- a/Open-ILS/src/templates/kpac/category.tt2 +++ b/Open-ILS/src/templates/kpac/category.tt2 @@ -1,14 +1,12 @@ -[% - PROCESS "opac/parts/header.tt2"; +[% PROCESS "opac/parts/header.tt2"; PROCESS "kpac/parts/grid.tt2"; WRAPPER "kpac/parts/subpage.tt2"; - ctx.page_title = l("Sub Page"); -%] + ctx.page_title = ctx.kpac_layout.name %]

Living Creatures

 
- [% render_kpac_grid(ctx.kpac_config.pages.page.10); %] + [% render_kpac_grid(ctx.kpac_config.pages.page.10); # TODO %]
diff --git a/Open-ILS/src/templates/kpac/checkout.tt2 b/Open-ILS/src/templates/kpac/checkout.tt2 index 866193f437..884368d400 100644 --- a/Open-ILS/src/templates/kpac/checkout.tt2 +++ b/Open-ILS/src/templates/kpac/checkout.tt2 @@ -1,8 +1,8 @@ -[% +[% PROCESS "opac/parts/header.tt2"; + PROCESS "kpac/parts/grid.tt2"; WRAPPER "kpac/parts/subpage.tt2"; - ctx.page_title = l("Sub Page"); -%] - + ctx.page_title = l('Get it') %] +
item image
diff --git a/Open-ILS/src/templates/kpac/checkout_results.tt2 b/Open-ILS/src/templates/kpac/checkout_results.tt2 index 2821adda12..56686f3069 100644 --- a/Open-ILS/src/templates/kpac/checkout_results.tt2 +++ b/Open-ILS/src/templates/kpac/checkout_results.tt2 @@ -1,8 +1,7 @@ -[% +[% PROCESS "opac/parts/header.tt2"; + PROCESS "kpac/parts/grid.tt2"; WRAPPER "kpac/parts/subpage.tt2"; - ctx.page_title = l("Sub Page"); -%] - + ctx.page_title = l('Get it') %]

You Got It!

diff --git a/Open-ILS/src/templates/kpac/detailed.tt2 b/Open-ILS/src/templates/kpac/detailed.tt2 index 2d25321183..fd803b83a5 100644 --- a/Open-ILS/src/templates/kpac/detailed.tt2 +++ b/Open-ILS/src/templates/kpac/detailed.tt2 @@ -1,8 +1,8 @@ -[% +[% PROCESS "opac/parts/header.tt2"; + PROCESS "kpac/parts/grid.tt2"; WRAPPER "kpac/parts/subpage.tt2"; - ctx.page_title = l("Sub Page"); -%] - + ctx.page_title = l('Item Details') %] +
item image
diff --git a/Open-ILS/src/templates/kpac/parts/subpage.tt2 b/Open-ILS/src/templates/kpac/parts/subpage.tt2 index 8f3a06ad74..0a40a99e8b 100755 --- a/Open-ILS/src/templates/kpac/parts/subpage.tt2 +++ b/Open-ILS/src/templates/kpac/parts/subpage.tt2 @@ -1,63 +1,74 @@ -[% - PROCESS "opac/parts/header.tt2"; - WRAPPER "kpac/parts/base.tt2"; -%] +[% WRAPPER "kpac/parts/base.tt2" %] -
-
+
+
+ [%# TODO BREADCRUMBS %]
- home -
 
- Animals, insects, & birds -
 
- search results -
 
- book name -
 
- got it -
 
+ home +
 
+ Animals, insects, & birds +
 
+ search results +
 
+ book name +
 
+ got it +
 
-
-
- - - - - -
 
 -
- - - - - [% content %] - - - - -
 
-
- 		-
-
New Search
-
- - - - - - -
 
 
-
 
-
-
 
-
search
-
- -
 
-
-
 
+
+ + + + + + + +
 
 +
+ [% content %] +
 
+
+ 		+
+
New Search
+
+ +
+ + + + + + + + + + + +
+ +
 
 + +
 
 + +
+
 
+
+ +
+
 
+
+ search +
+
+
 
+
 
[% END %] diff --git a/Open-ILS/src/templates/kpac/search_results.tt2 b/Open-ILS/src/templates/kpac/search_results.tt2 index 30dca06367..e241606f4b 100644 --- a/Open-ILS/src/templates/kpac/search_results.tt2 +++ b/Open-ILS/src/templates/kpac/search_results.tt2 @@ -1,71 +1,94 @@ -[% +[% PROCESS "opac/parts/header.tt2"; + PROCESS "opac/parts/misc_util.tt2"; # MARC + PROCESS "kpac/parts/grid.tt2"; WRAPPER "kpac/parts/subpage.tt2"; - ctx.page_title = l("Sub Page"); -%] + + ctx.page_title = l('Search Results') + ctx.result_start = 1 + ctx.page_size * page; + ctx.result_stop = ctx.page_size * (page + 1); + IF ctx.result_stop > ctx.hit_count; ctx.result_stop = ctx.hit_count; END; + result_count = ctx.result_start; +%] -

Search Results

- -
- - - - -
-
Page 3 of 12
-
-
- -
-
-
item image
-
-
Book Name
-
by Author Name
-
Call Number
-
Publisher, Year, Size
-
-
more info
-
get it
-
 
-
-
-
-
 book 
-
Book
-
-
 
+

Search Results

+ +
+ + + + + + +
+ + + + + + + +
Page 3 of 12
+
+
+ +
+ +[% FOR rec IN ctx.records; + attrs = {marc_xml => rec.marc_xml}; + PROCESS get_marc_attrs args=attrs %] + +
+
+ [% ident = attrs.isbn_clean || attrs.upc; IF ident; %] + [% l('Image of item') %]
+ [% ELSE %] + [% l('Image of item') %] + [% END %] +
+
+
[% attrs.title %]
+
[% l('by [_1]', attrs.author) %]
+
[% attrs.holdings.0.label | html %]
+
[% l('[_1], [_2]', attrs.publisher, attrs.pubdate) | html %]
+
+
more info
+
get it
+
 
- -
-
item image
-
-
Book Name
-
by Author Name
-
Call Number
-
Publisher, Year, Size
-
-
more info
-
get it
-
 
-
-
-
-
 book 
-
Book
-
-
 
+
+
+
+  [% attrs.format_label %]  +
-
- -
- - - - - -
-
Page 3 of 12
-
-
- +
[% attrs.format_label %]
+
+
 
+
+ +[% END %] +
+ +
+ + + + + + + +
+ + + + + + +
Page 3 of 12
+
+
+ [% END %] -- 2.11.0