From: Bill Erickson Date: Tue, 14 Feb 2012 19:34:21 +0000 (-0500) Subject: kpac : rename files/paths for tpac consistency X-Git-Tag: sprint4-merge-nov22~4001 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=33e75c06ce05826eac9e5abdf2bd2c813db58f88;p=working%2FEvergreen.git kpac : rename files/paths for tpac consistency Signed-off-by: Bill Erickson Signed-off-by: Mike Rylander --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm index 93e88913ab..34a81f6278 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm @@ -25,29 +25,25 @@ sub load { my $path = $self->apache->path_info; ($self->ctx->{page} = $path) =~ s#.*/(.*)#$1#g; - return $self->load_simple("index") if $path =~ m|kpac/index|; + return $self->load_simple("home") if $path =~ m|kpac/home|; return $self->load_simple("category") if $path =~ m|kpac/category|; - - # note: sets page=rresult - return $self->load_rresults if $path =~ m|kpac/search_results|; # inherited from tpac - - # note: sets page=record - return $self->load_record(no_search => 1) if $path =~ m|kpac/detailed|; + return $self->load_rresults if $path =~ m|kpac/results|; # inherited + return $self->load_record(no_search => 1) if $path =~ m|kpac/record|; # inherited # ---------------------------------------------------------------- # Everything below here requires SSL # ---------------------------------------------------------------- return $self->redirect_ssl unless $self->cgi->https; - if ($path =~ m|kpac/checkout|) { + # XXX auth vs. no-auth, pending list answers + return $self->load_simple("getit_results") if $path =~ m|kpac/getit_results|; + + if ($path =~ m|kpac/getit|) { # after getit_results my $stat = $self->load_record(no_search => 1); - $self->ctx->{page} = 'checkout'; # repair the page + $self->ctx->{page} = 'getit'; # repair the page return $stat; } - # XXX auth vs. no-auth, pending list answers - return $self->load_simple("checkout_results") if $path =~ m|kpac/checkout_results|; - # ---------------------------------------------------------------- # Everything below here requires authentication # ---------------------------------------------------------------- @@ -89,6 +85,4 @@ sub load_kpac_config { } - 1; - diff --git a/Open-ILS/src/templates/kpac/checkout.tt2 b/Open-ILS/src/templates/kpac/checkout.tt2 deleted file mode 100644 index d392168df9..0000000000 --- a/Open-ILS/src/templates/kpac/checkout.tt2 +++ /dev/null @@ -1,114 +0,0 @@ -[% - PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; # MARC - WRAPPER "kpac/parts/subpage.tt2"; - attrs = {marc_xml => ctx.marc_xml}; - PROCESS get_marc_attrs args=attrs; - ctx.page_title = attrs.title | html -%] - -
- [% 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 -
-
- - - - - -
-
- - [% 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/checkout_results.tt2 b/Open-ILS/src/templates/kpac/checkout_results.tt2 deleted file mode 100644 index 56686f3069..0000000000 --- a/Open-ILS/src/templates/kpac/checkout_results.tt2 +++ /dev/null @@ -1,22 +0,0 @@ -[% PROCESS "opac/parts/header.tt2"; - PROCESS "kpac/parts/grid.tt2"; - WRAPPER "kpac/parts/subpage.tt2"; - ctx.page_title = l('Get it') %] - -

You Got It!

- -
-

Your Request for Book Name was successful.
You will be able to pick up this material at Fairwood.

-
- -
- - - - - -
 Back to Book Name
-
- -[% END %] - diff --git a/Open-ILS/src/templates/kpac/detailed.tt2 b/Open-ILS/src/templates/kpac/detailed.tt2 deleted file mode 100644 index 7690773c82..0000000000 --- a/Open-ILS/src/templates/kpac/detailed.tt2 +++ /dev/null @@ -1,133 +0,0 @@ -[% - PROCESS "opac/parts/header.tt2"; - PROCESS "opac/parts/misc_util.tt2"; # MARC - WRAPPER "kpac/parts/subpage.tt2"; - attrs = {marc_xml => ctx.marc_xml}; - PROCESS get_marc_attrs args=attrs; - ctx.page_title = attrs.title | html -%] - -
- -
- [% ident = attrs.isbn_clean || attrs.upc; - href = ctx.media_prefix _ '/images/kpac/item_image.jpg'; - IF ident; href = ctx.media_prefix _ '/opac/extras/ac/jacket/medium/' _ ident; END %] - [% l('Image of item') %]
-
- -
-
[% attrs.title | html %]
-
[% l('by [_1]', attrs.author) | html %]
-
-
-
-  [% attrs.format_label %]  - -
-
[% attrs.format_label %]
-
- -
- -
rating
-
Rate this
-
 
- -
-
[% attrs.holdings.0.label | html %]
-
- [% l('[_1], [_2]', attrs.publisher, attrs.pubdate) | html %] - [% IF attrs.phys_desc %]
[% attrs.phys_desc | html; END %] -
-
-
-
 
-
-
- -
-
[% l('Get it') | html %] -
-
- [% l('Go Back') | html %] -
-
-
 
-
- -
[% l('You can find this item at these locations:') %]
-
- [% INCLUDE 'kpac/parts/copy_table.tt2' %] -
- - [% IF attrs.summary %] -
[% l('About this item:') %]
-
- [% FOR sum IN attrs.summary %] - [% IF !loop.first; '
'; END %] -

[% sum | html %]

- [% END %] -
- [% END %] - - - -
- Reviews -
Rate this Item
- About the Author -
 
-
- -
- - - - - - -
Average Ratingratingout of 132 reviews
-
 
-
- -
-
 
-
-
- - - - - - -
Your email address will not
be displayed to other users.
-
-
- - - - - -
Ratingrating1 = Poor, 5 = Awesome
-
-
-
 
-
-
submit review
-
- -
- - - - - - -
-
- -[% END %] diff --git a/Open-ILS/src/templates/kpac/getit.tt2 b/Open-ILS/src/templates/kpac/getit.tt2 new file mode 100644 index 0000000000..71ab91b800 --- /dev/null +++ b/Open-ILS/src/templates/kpac/getit.tt2 @@ -0,0 +1,114 @@ +[% + PROCESS "opac/parts/header.tt2"; + PROCESS "opac/parts/misc_util.tt2"; # MARC + WRAPPER "kpac/parts/subpage.tt2"; + attrs = {marc_xml => ctx.marc_xml}; + PROCESS get_marc_attrs args=attrs; + ctx.page_title = attrs.title | html +%] + +
+ [% 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 +
+
+ + + + + +
+
+ + [% 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('results') ? '/results' : '/record/' _ ctx.bre_id) %] + + + +
 
+
+ +[% END %] diff --git a/Open-ILS/src/templates/kpac/getit_results.tt2 b/Open-ILS/src/templates/kpac/getit_results.tt2 new file mode 100644 index 0000000000..56686f3069 --- /dev/null +++ b/Open-ILS/src/templates/kpac/getit_results.tt2 @@ -0,0 +1,22 @@ +[% PROCESS "opac/parts/header.tt2"; + PROCESS "kpac/parts/grid.tt2"; + WRAPPER "kpac/parts/subpage.tt2"; + ctx.page_title = l('Get it') %] + +

You Got It!

+ +
+

Your Request for Book Name was successful.
You will be able to pick up this material at Fairwood.

+
+ +
+ + + + + +
 Back to Book Name
+
+ +[% END %] + diff --git a/Open-ILS/src/templates/kpac/home.tt2 b/Open-ILS/src/templates/kpac/home.tt2 new file mode 100644 index 0000000000..99325b6276 --- /dev/null +++ b/Open-ILS/src/templates/kpac/home.tt2 @@ -0,0 +1,53 @@ +[% + PROCESS "opac/parts/header.tt2"; + PROCESS "kpac/parts/grid.tt2"; + WRAPPER "kpac/parts/base.tt2"; + ctx.page_title = l("Home") +%] + +
+
 
+
 
+
 
+
 
+
+ + + + + + + +
 
 +
+

Search your Library

+

for books, movies, music, magazines, and more!

+ + + + + + + + + + + +
search
+
+
+

Or click on an image to get started:

+ [% render_kpac_grid(ctx.kpac_layout.page) %] +
+ +
 
+ +
+
 
+
 
+
 
+
 
+
+ +[% END %] + diff --git a/Open-ILS/src/templates/kpac/index.tt2 b/Open-ILS/src/templates/kpac/index.tt2 deleted file mode 100644 index 99325b6276..0000000000 --- a/Open-ILS/src/templates/kpac/index.tt2 +++ /dev/null @@ -1,53 +0,0 @@ -[% - PROCESS "opac/parts/header.tt2"; - PROCESS "kpac/parts/grid.tt2"; - WRAPPER "kpac/parts/base.tt2"; - ctx.page_title = l("Home") -%] - -
-
 
-
 
-
 
-
 
-
- - - - - - - -
 
 -
-

Search your Library

-

for books, movies, music, magazines, and more!

- - - - - - - - - - - -
search
-
-
-

Or click on an image to get started:

- [% render_kpac_grid(ctx.kpac_layout.page) %] -
- -
 
- -
-
 
-
 
-
 
-
 
-
- -[% END %] - diff --git a/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2 b/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2 index 665e928611..ff6198acff 100644 --- a/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2 +++ b/Open-ILS/src/templates/kpac/parts/breadcrumb.tt2 @@ -1,7 +1,7 @@
- [% l('Home') %] @@ -19,7 +19,7 @@
 
- [% l('search results') | html %] + [% l('search results') | html %] [% IF ctx.page != 'rresult' %] diff --git a/Open-ILS/src/templates/kpac/parts/grid.tt2 b/Open-ILS/src/templates/kpac/parts/grid.tt2 index 2ec780015f..2e1b459f6a 100644 --- a/Open-ILS/src/templates/kpac/parts/grid.tt2 +++ b/Open-ILS/src/templates/kpac/parts/grid.tt2 @@ -27,7 +27,7 @@ MACRO render_kpac_grid(page_id) BLOCK; [% ELSIF cell.type == 'search'; %] - [% cell.name %] [% ELSIF cell.type == 'link'; %] diff --git a/Open-ILS/src/templates/kpac/parts/header.tt2 b/Open-ILS/src/templates/kpac/parts/header.tt2 index e10889dc6d..e19c3899cd 100644 --- a/Open-ILS/src/templates/kpac/parts/header.tt2 +++ b/Open-ILS/src/templates/kpac/parts/header.tt2 @@ -15,7 +15,7 @@
[% IF ctx.user %] - [% redir = CGI.url('-base' => 1) _ ctx.kpac_root _ '/index' %] + [% redir = CGI.url('-base' => 1) _ ctx.kpac_root _ '/home' %] [% l('Logout') %] [% ELSE %] diff --git a/Open-ILS/src/templates/kpac/parts/record_row.tt2 b/Open-ILS/src/templates/kpac/parts/record_row.tt2 index 4522afb390..274fce8f72 100644 --- a/Open-ILS/src/templates/kpac/parts/record_row.tt2 +++ b/Open-ILS/src/templates/kpac/parts/record_row.tt2 @@ -6,12 +6,12 @@ img_src = ctx.media_prefix _ '/opac/extras/ac/jacket/medium/' _ ident; END; %] - [% l('Image of item') %]
-
[% attrs.title %]
+
[% attrs.title %]
[% l('by [_1]', attrs.author) %]
[% attrs.holdings.0.label | html %]
@@ -20,9 +20,9 @@
[% IF show_actions %]
-
more info
-
get it
 
diff --git a/Open-ILS/src/templates/kpac/parts/searchbox.tt2 b/Open-ILS/src/templates/kpac/parts/searchbox.tt2 index 714eb92e18..1d6e39e6ff 100644 --- a/Open-ILS/src/templates/kpac/parts/searchbox.tt2 +++ b/Open-ILS/src/templates/kpac/parts/searchbox.tt2 @@ -1,5 +1,5 @@
[% l('New Search') %]
-
+
+
diff --git a/Open-ILS/src/templates/kpac/record.tt2 b/Open-ILS/src/templates/kpac/record.tt2 new file mode 100644 index 0000000000..8161ebb398 --- /dev/null +++ b/Open-ILS/src/templates/kpac/record.tt2 @@ -0,0 +1,133 @@ +[% + PROCESS "opac/parts/header.tt2"; + PROCESS "opac/parts/misc_util.tt2"; # MARC + WRAPPER "kpac/parts/subpage.tt2"; + attrs = {marc_xml => ctx.marc_xml}; + PROCESS get_marc_attrs args=attrs; + ctx.page_title = attrs.title | html +%] + +
+ +
+ [% ident = attrs.isbn_clean || attrs.upc; + href = ctx.media_prefix _ '/images/kpac/item_image.jpg'; + IF ident; href = ctx.media_prefix _ '/opac/extras/ac/jacket/medium/' _ ident; END %] + [% l('Image of item') %]
+
+ +
+
[% attrs.title | html %]
+
[% l('by [_1]', attrs.author) | html %]
+
+
+
+  [% attrs.format_label %]  + +
+
[% attrs.format_label %]
+
+ +
+ +
rating
+
Rate this
+
 
+ +
+
[% attrs.holdings.0.label | html %]
+
+ [% l('[_1], [_2]', attrs.publisher, attrs.pubdate) | html %] + [% IF attrs.phys_desc %]
[% attrs.phys_desc | html; END %] +
+
+
+
 
+
+
+ +
+
[% l('Get it') | html %] +
+
+ [% l('Go Back') | html %] +
+
+
 
+
+ +
[% l('You can find this item at these locations:') %]
+
+ [% INCLUDE 'kpac/parts/copy_table.tt2' %] +
+ + [% IF attrs.summary %] +
[% l('About this item:') %]
+
+ [% FOR sum IN attrs.summary %] + [% IF !loop.first; '
'; END %] +

[% sum | html %]

+ [% END %] +
+ [% END %] + + + +
+ Reviews +
Rate this Item
+ About the Author +
 
+
+ +
+ + + + + + +
Average Ratingratingout of 132 reviews
+
 
+
+ +
+
 
+
+
+ + + + + + +
Your email address will not
be displayed to other users.
+
+
+ + + + + +
Ratingrating1 = Poor, 5 = Awesome
+
+
+
 
+
+
submit review
+
+ +
+ + + + + + +
+
+ +[% END %] diff --git a/Open-ILS/src/templates/kpac/results.tt2 b/Open-ILS/src/templates/kpac/results.tt2 new file mode 100644 index 0000000000..8a8dc0d631 --- /dev/null +++ b/Open-ILS/src/templates/kpac/results.tt2 @@ -0,0 +1,28 @@ +[% 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('Search Results') %] + +

Search Results

+ +
+ [% INCLUDE 'kpac/parts/paginate.tt2' %] +
+ +
+ +[% FOR rec IN ctx.records; + attrs = {marc_xml => rec.marc_xml}; + PROCESS get_marc_attrs args=attrs %] + + [% INCLUDE 'kpac/parts/record_row.tt2' show_actions=1 rec_id=rec.id%] + +[% END %] +
+ +
+ [% INCLUDE 'kpac/parts/paginate.tt2' showtop=1 %] +
+ +[% END %] diff --git a/Open-ILS/src/templates/kpac/search_results.tt2 b/Open-ILS/src/templates/kpac/search_results.tt2 deleted file mode 100644 index 8a8dc0d631..0000000000 --- a/Open-ILS/src/templates/kpac/search_results.tt2 +++ /dev/null @@ -1,28 +0,0 @@ -[% 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('Search Results') %] - -

Search Results

- -
- [% INCLUDE 'kpac/parts/paginate.tt2' %] -
- -
- -[% FOR rec IN ctx.records; - attrs = {marc_xml => rec.marc_xml}; - PROCESS get_marc_attrs args=attrs %] - - [% INCLUDE 'kpac/parts/record_row.tt2' show_actions=1 rec_id=rec.id%] - -[% END %] -
- -
- [% INCLUDE 'kpac/parts/paginate.tt2' showtop=1 %] -
- -[% END %] diff --git a/Open-ILS/web/images/kpac/stars!.png b/Open-ILS/web/images/kpac/stars!.png deleted file mode 100755 index 9fd8310436..0000000000 Binary files a/Open-ILS/web/images/kpac/stars!.png and /dev/null differ diff --git a/Open-ILS/web/images/kpac/stars!_gray.png b/Open-ILS/web/images/kpac/stars!_gray.png deleted file mode 100755 index bf38a47d24..0000000000 Binary files a/Open-ILS/web/images/kpac/stars!_gray.png and /dev/null differ diff --git a/Open-ILS/web/images/kpac/stars.png b/Open-ILS/web/images/kpac/stars.png new file mode 100755 index 0000000000..9fd8310436 Binary files /dev/null and b/Open-ILS/web/images/kpac/stars.png differ diff --git a/Open-ILS/web/images/kpac/stars_grey.png b/Open-ILS/web/images/kpac/stars_grey.png new file mode 100755 index 0000000000..bf38a47d24 Binary files /dev/null and b/Open-ILS/web/images/kpac/stars_grey.png differ