kpac : rename files/paths for tpac consistency
authorBill Erickson <berick@esilibrary.com>
Tue, 14 Feb 2012 19:34:21 +0000 (14:34 -0500)
committerMike Rylander <mrylander@gmail.com>
Mon, 30 Jul 2012 19:03:20 +0000 (15:03 -0400)
Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
21 files changed:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGKPacLoader.pm
Open-ILS/src/templates/kpac/checkout.tt2 [deleted file]
Open-ILS/src/templates/kpac/checkout_results.tt2 [deleted file]
Open-ILS/src/templates/kpac/detailed.tt2 [deleted file]
Open-ILS/src/templates/kpac/getit.tt2 [new file with mode: 0644]
Open-ILS/src/templates/kpac/getit_results.tt2 [new file with mode: 0644]
Open-ILS/src/templates/kpac/home.tt2 [new file with mode: 0644]
Open-ILS/src/templates/kpac/index.tt2 [deleted file]
Open-ILS/src/templates/kpac/parts/breadcrumb.tt2
Open-ILS/src/templates/kpac/parts/grid.tt2
Open-ILS/src/templates/kpac/parts/header.tt2
Open-ILS/src/templates/kpac/parts/record_row.tt2
Open-ILS/src/templates/kpac/parts/searchbox.tt2
Open-ILS/src/templates/kpac/parts/subpage.tt2
Open-ILS/src/templates/kpac/record.tt2 [new file with mode: 0644]
Open-ILS/src/templates/kpac/results.tt2 [new file with mode: 0644]
Open-ILS/src/templates/kpac/search_results.tt2 [deleted file]
Open-ILS/web/images/kpac/stars!.png [deleted file]
Open-ILS/web/images/kpac/stars!_gray.png [deleted file]
Open-ILS/web/images/kpac/stars.png [new file with mode: 0755]
Open-ILS/web/images/kpac/stars_grey.png [new file with mode: 0755]

index 93e8891..34a81f6 100644 (file)
@@ -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 (file)
index d392168..0000000
+++ /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 
-%]
-
-<div id="search_results_parent">
-    [% INCLUDE 'kpac/parts/record_row.tt2' rec_id=ctx.bre_id%]
-</div>
-          
-<div class="checkout_options">
-    <table cellpadding="0" cellspacing="0" border="0">
-        <tr>
-            <td valign="top" class="left_brain_cell">
-                <div class="left_brain">
-
-                    [% WRAPPER 'kpac/parts/help_popups.tt2' popup_id='card_help' %]
-                        <img src="[% ctx.media_prefix %]/images/kpac/library_card.png" alt="[% l('library card') %]" /></div></td>
-                    [% END %]
-                    [% WRAPPER 'kpac/parts/help_popups.tt2' popup_id='password_help' %]
-                        <p>[% l('Enter your password') %]</p>
-                    [% END %]
-
-                    <div class="top_side">
-                        <h2>get it!</h2>
-                        <p>[% |l %]If you would like to request this item, please enter the following information and click<br />Submit below:[% END %]</p>
-                    </div>
-                    <div class="checkout_box">
-                        <div class="box1_top">&nbsp;</div>
-                        <div class="box_inside">
-
-                            [% IF !ctx.user %]
-                                [% seed = l(' Enter Numbers... ') %]
-                                <p>[% l('Library Card Number without spaces:') %]</p>
-                                <div class="input_box">
-                                    <input type="text" class="text_box" style="color:#aaa;" value="[% seed %]" 
-                                        onfocus="if(this.value=='[% seed %]'){this.value='';this.style.color='#424242';}" 
-                                        onblur="if(this.value==''){this.value='[% seed %]'; this.style.color='#aaa';}" />
-                                </div>
-                                <a class="help_btn" href="javascript:;" 
-                                    onclick="helpPopup('card_help', this, event);"><img 
-                                    src="[% ctx.media_prefix %]/images/kpac/question_mark.png" alt="pin number help" /></a>
-                                <div class="clear">&nbsp;</div>
-                                <div class="hr">&nbsp;</div>
-
-                                <p>[% l('Password') %]</p>
-                                <div class="input_box">
-                                    <input type="password" class="text_box" style="color:#aaa;" value="[% seed %]" 
-                                        onfocus="if(this.value=='[% seed %]'){this.value='';this.style.color='#424242';}" 
-                                        onblur="if(this.value==''){this.value='[% seed %]'; this.style.color='#aaa';}" />
-
-                                <a class="help_btn" href="javascript:;" 
-                                    onclick="helpPopup('password_help', this, event);"><img 
-                                    src="[% ctx.media_prefix %]/images/kpac/question_mark.png" alt="[% l('password help') %]" /></a>
-
-                                <div class="clear">&nbsp;</div>
-                                <div class="hr">&nbsp;</div>
-                            [% END %]
-
-                            <p>[% l('Choose a Pickup Library:') %]</p>
-                            <div class="pickup_lib">
-                                [%  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 %]
-                            </div>
-                        </div>
-                    </div>
-                    <div class="submit_btn">
-                        <a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/review_submit_btn.png" alt="submit" /></a>
-                    </div>
-                </div>
-            </td>
-
-            <!-- TODO -->
-            <td valign="top">
-                <div class="right_brain">
-                    <div class="top_side">
-                        <h2>save it!</h2>
-                        <p>If you would like to save this item to a list to be requested later, please choose a location and click<br />Submit below.</p>
-                    </div>
-                    <div class="checkout_box">
-                        <div class="box1_top">&nbsp;</div>
-                        <div class="box_inside">
-                            <p>Choose a Pickup Library:</p>
-                            <div class="pickup_lib"><select name="library"><option>Fairwood</option></select></div>
-                            <div class="hr">&nbsp;</div>
-                            <div><a href="javascript:;">View all KCLS libraries</a></div>
-                        </div>
-                    </div>
-                    <div class="submit_btn">
-                        <a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/review_submit_btn.png" alt="submit" /></a>
-                    </div>
-                </div>
-            </td>
-        </tr>
-    </table>
-</div>
-
-<div class="sub_navigation2 checkout">
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-        <tr>
-            [%  # 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) %]
-            <td><a href="[% mkurl(url) %]"><img src="[% ctx.media_prefix %]/images/kpac/cancel_back_btn.png" /></a></td>
-            <td width="100%" class="nav_mid_bg">&nbsp;</td>
-        </tr>
-    </table>
-</div>
-         
-[% 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 (file)
index 56686f3..0000000
+++ /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') %]
-          
-          <h2 class="sub_header2">You Got It!</h2>
-          
-          <div class="checkout_res_body">
-            <p>Your Request for <a href="javascript:;">Book Name</a> was successful.<br />You will be able to pick up this material at <a href="javascript:;">Fairwood</a>.</p>
-          </div>
-          
-          <div class="sub_navigation2 checkout">
-            <table cellpadding="0" cellspacing="0" border="0" width="100%"><tr>
-              <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/back_to_results_btn.png" /></a></td>
-              <td width="100%" class="nav_mid_bg">&nbsp;</td>
-              <td><img src="[% ctx.media_prefix %]/images/kpac/back_to_book.png" /></td>
-              <td nowrap="nowrap"><a class="checkout_res_back" href="javascript:;">Back to <span>Book Name</span></a></td>
-            </tr></table>
-          </div>
-          
-[% END %]          
-
diff --git a/Open-ILS/src/templates/kpac/detailed.tt2 b/Open-ILS/src/templates/kpac/detailed.tt2
deleted file mode 100644 (file)
index 7690773..0000000
+++ /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 
-%]
-
-<div class="item_detail_header">
-
-    <div class="item_detail_image">
-        [%  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 %]
-         <a href="[% href | url %]"><img 
-            alt="[% l('Image of item') %]" width="167" src='[% href | url %]' /></a><br />
-    </div>
-
-    <div class="item_detail_info">
-        <div class="item_detail_name">[% attrs.title | html %]</div>
-        <div class="item_detail_author">[% l('by [_1]', attrs.author) | html %]</div>
-        <div class="item_detail_icon_rate">
-            <div class="item_icon_wrapper">
-                <div class="item_icon">
-                    &nbsp;<img width="35" alt="[% attrs.format_label %]" src="[% attrs.format_icon %]" />&nbsp; 
-                    <!-- put a single &nbsp; around each side of the image - for vertical centering -->
-                </div>
-                <div class="item_icon_type_text">[% attrs.format_label %]</div>
-            </div>
-
-            <div class="item_detail_rate_wrapper">
-                <!-- TODO chilifresh, etc. -->
-                <div class="item_detail_rate_starts"><img alt="rating" src="[% ctx.media_prefix %]/images/kpac/stars!.png" /></div>
-                <div class="item_detail_rate_link"><a href="javascript:;">Rate this</a></div>
-                <div class="clear">&nbsp;</div>
-
-                <div class="item_detail_cn_wrapper">
-                    <div class="item_detail_callnumber">[% attrs.holdings.0.label | html %]</div>
-                    <div class="item_detail_extra_info">
-                        [% l('[_1], [_2]', attrs.publisher, attrs.pubdate) | html %] <!-- TODO fix commas, etc. -->
-                        [% IF attrs.phys_desc %]<br/>[% attrs.phys_desc | html; END %]
-                    </div>
-                </div>
-            </div>
-            <div class="clear">&nbsp;</div>
-        </div>
-    </div>
-
-    <div class="item_detail_header_buttons">
-        <div class="item_detail_getit_btn"><a href="[% mkurl(ctx.kpac_root _ '/checkout/' _ ctx.bre_id) %]"><img 
-            alt="[% l('Get it') | html %]" src="[% ctx.media_prefix %]/images/kpac/get_it_btn.png" /></a>
-        </div>
-        <div class="item_detail_goback_btn">
-            <a href="[% mkurl(ctx.kpac_root _ '/search_results') %]"><img 
-                alt="[% l('Go Back') | html %]" src="[% ctx.media_prefix %]/images/kpac/go_back_btn.png" /></a>
-        </div>
-    </div>
-    <div class="clear">&nbsp;</div>
-</div>
-
-<div class="sub_header">[% l('You can find this item at these locations:') %]</div>
-    <div class="item_detail_location_wrapper">
-        [% INCLUDE 'kpac/parts/copy_table.tt2' %]
-    </div>
-
-    [% IF attrs.summary %]
-        <div class="sub_header">[% l('About this item:') %]</div>
-        <div class="item_detail_desc">
-            [% FOR sum IN attrs.summary %]
-                [% IF !loop.first; '<br/>'; END %]
-                <p>[% sum | html %] </p>
-            [% END %]
-        </div>
-    [% END %]
-
-    <!-- TODO -->
-
-    <div class="item_detail_extras_tabs">
-        <a href="javascript:;">Reviews</a>
-        <div class="selected">Rate this Item</div>
-        <a href="javascript:;">About the Author</a>
-        <div class="clear">&nbsp;</div>
-    </div>
-
-    <div class="item_detail_rating_top">
-        <table cellpadding="0" cellspacing="0" border="0" class="item_avg_rate_table">
-            <tr>
-                <td class="avg_rate">Average Rating</td>
-                <td class="stars"><img alt="rating" src="[% ctx.media_prefix %]/images/kpac/stars!.png" /></td>
-                <td class="total_rates">out of 132 reviews</td>
-            </tr>
-        </table>
-        <div class="clear">&nbsp;</div>
-    </div>
-
-<div class="item_detail_rating">
-    <div class="review_box_top">&nbsp;</div>
-    <div class="review_box_body">
-        <div class="input_boxes">
-            <table cellpadding="0" cellspacing="0" border="0">
-                <tr>
-                    <td class="review_name_cell"><input type="text" class="review_name" style="color:#aaa;" value=" Name " onfocus="if(this.value==' Name '){this.value='';this.style.color='#424242';}" onblur="if(this.value==''){this.value=' Name '; this.style.color='#aaa';}" /></td>
-                    <td class="review_email_cell"><input type="text" class="review_email" style="color:#aaa;" value=" Email Address " onfocus="if(this.value==' Email Address '){this.value='';this.style.color='#424242';}" onblur="if(this.value==''){this.value=' Email Address '; this.style.color='#aaa';}" /></td>
-                    <td class="rating_msg_box">Your email address will not<br />be displayed to other users.</td>
-                </tr>
-            </table>
-        </div>
-        <div class="item_detail_rating2">
-            <table cellpadding="0" cellspacing="0" border="0" class="item_avg_rate_table2"><tr>
-                    <td class="rate">Rating</td>
-                    <td class="stars"><img alt="rating" src="[% ctx.media_prefix %]/images/kpac/stars!_gray.png" /></td>
-                    <td class="scale">1 = Poor, 5 = Awesome</td>
-                </tr>
-            </table>
-        </div>
-        <div class="review_comment_box"><textarea class="review_comment" style="color:#aaa;" onfocus="if(this.value==' Write the reasons for your rating here. '){this.value='';this.style.color='#424242';}" onblur="if(this.value==''){this.value=' Write the reasons for your rating here. '; this.style.color='#aaa';}"> Write the reasons for your rating here. </textarea></div>
-        <div class="clear">&nbsp;</div>
-    </div>
-    <div class="review_submit_box"><a href="javascript:;"><img alt="submit review" src="[% ctx.media_prefix %]/images/kpac/review_submit_btn.png" /></a></div>
-</div>
-  
-<div class="sub_navigation1">
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-        <tr>
-            <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/go_back_btn.png" /></a></td>
-            <td width="100%" class="nav_mid_bg"></td>
-            <td class="to_top_btn"><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/to_top_btn.png" /></a></td>
-        </tr>
-    </table>
-</div>
-  
-[% END %]
diff --git a/Open-ILS/src/templates/kpac/getit.tt2 b/Open-ILS/src/templates/kpac/getit.tt2
new file mode 100644 (file)
index 0000000..71ab91b
--- /dev/null
@@ -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 
+%]
+
+<div id="search_results_parent">
+    [% INCLUDE 'kpac/parts/record_row.tt2' rec_id=ctx.bre_id%]
+</div>
+          
+<div class="checkout_options">
+    <table cellpadding="0" cellspacing="0" border="0">
+        <tr>
+            <td valign="top" class="left_brain_cell">
+                <div class="left_brain">
+
+                    [% WRAPPER 'kpac/parts/help_popups.tt2' popup_id='card_help' %]
+                        <img src="[% ctx.media_prefix %]/images/kpac/library_card.png" alt="[% l('library card') %]" /></div></td>
+                    [% END %]
+                    [% WRAPPER 'kpac/parts/help_popups.tt2' popup_id='password_help' %]
+                        <p>[% l('Enter your password') %]</p>
+                    [% END %]
+
+                    <div class="top_side">
+                        <h2>get it!</h2>
+                        <p>[% |l %]If you would like to request this item, please enter the following information and click<br />Submit below:[% END %]</p>
+                    </div>
+                    <div class="checkout_box">
+                        <div class="box1_top">&nbsp;</div>
+                        <div class="box_inside">
+
+                            [% IF !ctx.user %]
+                                [% seed = l(' Enter Numbers... ') %]
+                                <p>[% l('Library Card Number without spaces:') %]</p>
+                                <div class="input_box">
+                                    <input type="text" class="text_box" style="color:#aaa;" value="[% seed %]" 
+                                        onfocus="if(this.value=='[% seed %]'){this.value='';this.style.color='#424242';}" 
+                                        onblur="if(this.value==''){this.value='[% seed %]'; this.style.color='#aaa';}" />
+                                </div>
+                                <a class="help_btn" href="javascript:;" 
+                                    onclick="helpPopup('card_help', this, event);"><img 
+                                    src="[% ctx.media_prefix %]/images/kpac/question_mark.png" alt="pin number help" /></a>
+                                <div class="clear">&nbsp;</div>
+                                <div class="hr">&nbsp;</div>
+
+                                <p>[% l('Password') %]</p>
+                                <div class="input_box">
+                                    <input type="password" class="text_box" style="color:#aaa;" value="[% seed %]" 
+                                        onfocus="if(this.value=='[% seed %]'){this.value='';this.style.color='#424242';}" 
+                                        onblur="if(this.value==''){this.value='[% seed %]'; this.style.color='#aaa';}" />
+
+                                <a class="help_btn" href="javascript:;" 
+                                    onclick="helpPopup('password_help', this, event);"><img 
+                                    src="[% ctx.media_prefix %]/images/kpac/question_mark.png" alt="[% l('password help') %]" /></a>
+
+                                <div class="clear">&nbsp;</div>
+                                <div class="hr">&nbsp;</div>
+                            [% END %]
+
+                            <p>[% l('Choose a Pickup Library:') %]</p>
+                            <div class="pickup_lib">
+                                [%  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 %]
+                            </div>
+                        </div>
+                    </div>
+                    <div class="submit_btn">
+                        <a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/review_submit_btn.png" alt="submit" /></a>
+                    </div>
+                </div>
+            </td>
+
+            <!-- TODO -->
+            <td valign="top">
+                <div class="right_brain">
+                    <div class="top_side">
+                        <h2>save it!</h2>
+                        <p>If you would like to save this item to a list to be requested later, please choose a location and click<br />Submit below.</p>
+                    </div>
+                    <div class="checkout_box">
+                        <div class="box1_top">&nbsp;</div>
+                        <div class="box_inside">
+                            <p>Choose a Pickup Library:</p>
+                            <div class="pickup_lib"><select name="library"><option>Fairwood</option></select></div>
+                            <div class="hr">&nbsp;</div>
+                            <div><a href="javascript:;">View all KCLS libraries</a></div>
+                        </div>
+                    </div>
+                    <div class="submit_btn">
+                        <a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/review_submit_btn.png" alt="submit" /></a>
+                    </div>
+                </div>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<div class="sub_navigation2 checkout">
+    <table cellpadding="0" cellspacing="0" border="0" width="100%">
+        <tr>
+            [%  # 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) %]
+            <td><a href="[% mkurl(url) %]"><img src="[% ctx.media_prefix %]/images/kpac/cancel_back_btn.png" /></a></td>
+            <td width="100%" class="nav_mid_bg">&nbsp;</td>
+        </tr>
+    </table>
+</div>
+         
+[% 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 (file)
index 0000000..56686f3
--- /dev/null
@@ -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') %]
+          
+          <h2 class="sub_header2">You Got It!</h2>
+          
+          <div class="checkout_res_body">
+            <p>Your Request for <a href="javascript:;">Book Name</a> was successful.<br />You will be able to pick up this material at <a href="javascript:;">Fairwood</a>.</p>
+          </div>
+          
+          <div class="sub_navigation2 checkout">
+            <table cellpadding="0" cellspacing="0" border="0" width="100%"><tr>
+              <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/back_to_results_btn.png" /></a></td>
+              <td width="100%" class="nav_mid_bg">&nbsp;</td>
+              <td><img src="[% ctx.media_prefix %]/images/kpac/back_to_book.png" /></td>
+              <td nowrap="nowrap"><a class="checkout_res_back" href="javascript:;">Back to <span>Book Name</span></a></td>
+            </tr></table>
+          </div>
+          
+[% END %]          
+
diff --git a/Open-ILS/src/templates/kpac/home.tt2 b/Open-ILS/src/templates/kpac/home.tt2
new file mode 100644 (file)
index 0000000..99325b6
--- /dev/null
@@ -0,0 +1,53 @@
+[%  
+    PROCESS "opac/parts/header.tt2";
+    PROCESS "kpac/parts/grid.tt2";
+    WRAPPER "kpac/parts/base.tt2";
+    ctx.page_title = l("Home") 
+%]
+
+<div class="main_top_shadow">
+    <div class="main_tl_corner">&nbsp;</div>
+    <div class="main_mid_top">&nbsp;</div>
+    <div class="main_tr_corner">&nbsp;</div>
+    <div class="clear">&nbsp;</div>
+</div>
+
+<table cellpadding="0" cellspacing="0" border="0" width="100%">
+    <tr>
+        <td width="3" class="main_left_shadow"><div class="clear">&nbsp;</div></td>
+        <td valign="top" class="main_inside_cell" valign="top">
+            <div class="search_wrapper">
+                <h1>Search your Library</h1>
+                <h3>for books, movies, music, magazines, and more!</h3>
+                <table cellpadding="0" cellspacing="0" border="0" align="center" class="search_box_wrapper">
+                    <tr>
+                        <td class="st_radio_btn"><input type="radio" name="search_type" checked="checked" id="st_word" class="st_word" /></td>
+                        <td class="st_label"><label for="st_word">Word</label></td>
+                        <td class="st_radio_btn"><input type="radio" name="search_type" id="st_title" class="st_title" /></td>
+                        <td class="st_label"><label for="st_title">Title</label></td>
+                        <td class="st_radio_btn"><input type="radio" name="search_type" id="st_author" class="st_author" /></td>
+                        <td class="st_label st_author_box"><label for="st_author">Author</label></td>
+                        <td><input type="text" class="search_box" /></td>
+                        <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/search_btn.png" alt="search" /></a></td>
+                    </tr>
+                </table>
+            </div>
+            <div class="category_wrapper">
+                <h3 class="c_header_image">Or click on an image to get started:</h3>
+                [% render_kpac_grid(ctx.kpac_layout.page) %]
+            </div>
+
+        </td>
+        <td width="3" class="main_right_shadow"><div class="clear">&nbsp;</div></td>
+    </tr>
+</table>
+
+<div class="main_bottom_shadow">
+    <div class="main_bl_corner">&nbsp;</div>
+    <div class="main_mid_bottom">&nbsp;</div>
+    <div class="main_br_corner">&nbsp;</div>
+    <div class="clear">&nbsp;</div>
+</div>
+
+[% END %]
+
diff --git a/Open-ILS/src/templates/kpac/index.tt2 b/Open-ILS/src/templates/kpac/index.tt2
deleted file mode 100644 (file)
index 99325b6..0000000
+++ /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") 
-%]
-
-<div class="main_top_shadow">
-    <div class="main_tl_corner">&nbsp;</div>
-    <div class="main_mid_top">&nbsp;</div>
-    <div class="main_tr_corner">&nbsp;</div>
-    <div class="clear">&nbsp;</div>
-</div>
-
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-    <tr>
-        <td width="3" class="main_left_shadow"><div class="clear">&nbsp;</div></td>
-        <td valign="top" class="main_inside_cell" valign="top">
-            <div class="search_wrapper">
-                <h1>Search your Library</h1>
-                <h3>for books, movies, music, magazines, and more!</h3>
-                <table cellpadding="0" cellspacing="0" border="0" align="center" class="search_box_wrapper">
-                    <tr>
-                        <td class="st_radio_btn"><input type="radio" name="search_type" checked="checked" id="st_word" class="st_word" /></td>
-                        <td class="st_label"><label for="st_word">Word</label></td>
-                        <td class="st_radio_btn"><input type="radio" name="search_type" id="st_title" class="st_title" /></td>
-                        <td class="st_label"><label for="st_title">Title</label></td>
-                        <td class="st_radio_btn"><input type="radio" name="search_type" id="st_author" class="st_author" /></td>
-                        <td class="st_label st_author_box"><label for="st_author">Author</label></td>
-                        <td><input type="text" class="search_box" /></td>
-                        <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/search_btn.png" alt="search" /></a></td>
-                    </tr>
-                </table>
-            </div>
-            <div class="category_wrapper">
-                <h3 class="c_header_image">Or click on an image to get started:</h3>
-                [% render_kpac_grid(ctx.kpac_layout.page) %]
-            </div>
-
-        </td>
-        <td width="3" class="main_right_shadow"><div class="clear">&nbsp;</div></td>
-    </tr>
-</table>
-
-<div class="main_bottom_shadow">
-    <div class="main_bl_corner">&nbsp;</div>
-    <div class="main_mid_bottom">&nbsp;</div>
-    <div class="main_br_corner">&nbsp;</div>
-    <div class="clear">&nbsp;</div>
-</div>
-
-[% END %]
-
index 665e928..ff6198a 100644 (file)
@@ -1,7 +1,7 @@
 <div class="breadcrumb">
 
     <!-- home page -->
-    <a href="[% mkurl(ctx.kpac_root _ '/index', {}, ['trail', 'page']) %]" 
+    <a href="[% mkurl(ctx.kpac_root _ '/home', {}, ['trail', 'page']) %]" 
         class="bread_home"><img alt="[% l('Home') %]" 
         src="[% ctx.media_prefix %]/images/kpac/home_icon.png" /></a>
 
@@ -19,7 +19,7 @@
 
         <!-- search results -->
         <div class="bread_green_mid">&nbsp;</div>
-        <a href="[% mkurl(ctx.kpac_root _ '/search_results') %]">[% l('search results') | html %]</a>
+        <a href="[% mkurl(ctx.kpac_root _ '/results') %]">[% l('search results') | html %]</a>
 
         [% IF ctx.page != 'rresult' %]
 
index 2ec7800..2e1b459 100644 (file)
@@ -27,7 +27,7 @@ MACRO render_kpac_grid(page_id) BLOCK;
 
         [% ELSIF cell.type == 'search'; %]
 
-        <td width="[% width %]%"><a href="[% mkurl(ctx.kpac_root _ '/search_results', {query => cell.content}, ['page']) %]"><img 
+        <td width="[% width %]%"><a href="[% mkurl(ctx.kpac_root _ '/results', {query => cell.content}, ['page']) %]"><img 
             src="[% kpac_img_path(cell.img) %]" alt="" /><span>[% cell.name %]</span></a></td>
 
         [% ELSIF cell.type == 'link'; %]
index e10889d..e19c389 100644 (file)
@@ -15,7 +15,7 @@
     <div class="header_menu">
         <!-- menu rendered in reverse order -->
         [% IF ctx.user %]
-            [% redir = CGI.url('-base' => 1) _ ctx.kpac_root _ '/index' %]
+            [% redir = CGI.url('-base' => 1) _ ctx.kpac_root _ '/home' %]
             <a href="[% mkurl(ctx.logout_page, 
                 {redirect_to => redir.replace('^https:', 'http:')}, 1) %]">[% l('Logout') %]</a>
         [% ELSE %]
index 4522afb..274fce8 100644 (file)
@@ -6,12 +6,12 @@
                 img_src = ctx.media_prefix _ '/opac/extras/ac/jacket/medium/' _ ident;
             END;
         %]
-        <a href="[% mkurl(ctx.kpac_root _ '/detailed/' _ rec_id) %]"><img 
+        <a href="[% mkurl(ctx.kpac_root _ '/record/' _ rec_id) %]"><img 
             alt="[% l('Image of item') %]" width="167"
             src='[% mkurl(img_src, {}, 1) %]' /></a><br />
     </div>
     <div class="item_detail_info">
-        <div class="item_detail_name"><a href="[% mkurl(ctx.kpac_root _ '/detailed/' _ rec_id) %]">[% attrs.title %]</a></div>
+        <div class="item_detail_name"><a href="[% mkurl(ctx.kpac_root _ '/record/' _ rec_id) %]">[% attrs.title %]</a></div>
         <div class="item_detail_author">[% l('by [_1]', attrs.author) %]</div>
         <div class="item_detail_callnumber">[% attrs.holdings.0.label | html %]</div>
         <div class="item_detail_extra_info">
@@ -20,9 +20,9 @@
         </div>
         [% IF show_actions %]
         <div class="item_detail_actions">
-            <div class="button"><a href="[% mkurl(ctx.kpac_root _ '/detailed/' _ rec_id) %]"><img 
+            <div class="button"><a href="[% mkurl(ctx.kpac_root _ '/record/' _ rec_id) %]"><img 
                 src="[% ctx.media_prefix %]/images/kpac/more_info_btn.png" alt="more info" /></a></div>
-            <div class="button"><a href="[% mkurl(ctx.kpac_root _ '/checkout/' _ rec_id) %]"><img 
+            <div class="button"><a href="[% mkurl(ctx.kpac_root _ '/getit/' _ rec_id) %]"><img 
                 src="[% ctx.media_prefix %]/images/kpac/get_it_btn_sm.png" alt="get it" /></a></div>
             <div class="clear">&nbsp;</div>
         </div>
index 714eb92..1d6e39e 100644 (file)
@@ -1,5 +1,5 @@
 <div class="sub_sidebar_header">[% l('New Search') %]</div>
-<form action="[% ctx.kpac_root _ '/search_results' %]">
+<form action="[% ctx.kpac_root _ '/results' %]">
     <div class="sub_sidebar_search_wrapper">
         <input type="text" name='query' value="[% CGI.param('query') | html %]"
             [% seed = l(' Enter Text... ') | html %]
index 29d3a18..175f6b8 100644 (file)
@@ -1,6 +1,6 @@
 [% PROCESS 'kpac/parts/util.tt2'; WRAPPER "kpac/parts/base.tt2" %]
 
-<!-- subpage is the main wrapper page for everything except 'index' -->
+<!-- subpage is the main wrapper page for everything except 'home' -->
 
 <div class="main_top_shadow_sub">
     <div class="main_mid_top_sub">
diff --git a/Open-ILS/src/templates/kpac/record.tt2 b/Open-ILS/src/templates/kpac/record.tt2
new file mode 100644 (file)
index 0000000..8161ebb
--- /dev/null
@@ -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 
+%]
+
+<div class="item_detail_header">
+
+    <div class="item_detail_image">
+        [%  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 %]
+         <a href="[% href | url %]"><img 
+            alt="[% l('Image of item') %]" width="167" src='[% href | url %]' /></a><br />
+    </div>
+
+    <div class="item_detail_info">
+        <div class="item_detail_name">[% attrs.title | html %]</div>
+        <div class="item_detail_author">[% l('by [_1]', attrs.author) | html %]</div>
+        <div class="item_detail_icon_rate">
+            <div class="item_icon_wrapper">
+                <div class="item_icon">
+                    &nbsp;<img width="35" alt="[% attrs.format_label %]" src="[% attrs.format_icon %]" />&nbsp; 
+                    <!-- put a single &nbsp; around each side of the image - for vertical centering -->
+                </div>
+                <div class="item_icon_type_text">[% attrs.format_label %]</div>
+            </div>
+
+            <div class="item_detail_rate_wrapper">
+                <!-- TODO chilifresh, etc. -->
+                <div class="item_detail_rate_starts"><img alt="rating" src="[% ctx.media_prefix %]/images/kpac/stars.png" /></div>
+                <div class="item_detail_rate_link"><a href="javascript:;">Rate this</a></div>
+                <div class="clear">&nbsp;</div>
+
+                <div class="item_detail_cn_wrapper">
+                    <div class="item_detail_callnumber">[% attrs.holdings.0.label | html %]</div>
+                    <div class="item_detail_extra_info">
+                        [% l('[_1], [_2]', attrs.publisher, attrs.pubdate) | html %] <!-- TODO fix commas, etc. -->
+                        [% IF attrs.phys_desc %]<br/>[% attrs.phys_desc | html; END %]
+                    </div>
+                </div>
+            </div>
+            <div class="clear">&nbsp;</div>
+        </div>
+    </div>
+
+    <div class="item_detail_header_buttons">
+        <div class="item_detail_getit_btn"><a href="[% mkurl(ctx.kpac_root _ '/getit/' _ ctx.bre_id) %]"><img 
+            alt="[% l('Get it') | html %]" src="[% ctx.media_prefix %]/images/kpac/get_it_btn.png" /></a>
+        </div>
+        <div class="item_detail_goback_btn">
+            <a href="[% mkurl(ctx.kpac_root _ '/results') %]"><img 
+                alt="[% l('Go Back') | html %]" src="[% ctx.media_prefix %]/images/kpac/go_back_btn.png" /></a>
+        </div>
+    </div>
+    <div class="clear">&nbsp;</div>
+</div>
+
+<div class="sub_header">[% l('You can find this item at these locations:') %]</div>
+    <div class="item_detail_location_wrapper">
+        [% INCLUDE 'kpac/parts/copy_table.tt2' %]
+    </div>
+
+    [% IF attrs.summary %]
+        <div class="sub_header">[% l('About this item:') %]</div>
+        <div class="item_detail_desc">
+            [% FOR sum IN attrs.summary %]
+                [% IF !loop.first; '<br/>'; END %]
+                <p>[% sum | html %] </p>
+            [% END %]
+        </div>
+    [% END %]
+
+    <!-- TODO -->
+
+    <div class="item_detail_extras_tabs">
+        <a href="javascript:;">Reviews</a>
+        <div class="selected">Rate this Item</div>
+        <a href="javascript:;">About the Author</a>
+        <div class="clear">&nbsp;</div>
+    </div>
+
+    <div class="item_detail_rating_top">
+        <table cellpadding="0" cellspacing="0" border="0" class="item_avg_rate_table">
+            <tr>
+                <td class="avg_rate">Average Rating</td>
+                <td class="stars"><img alt="rating" src="[% ctx.media_prefix %]/images/kpac/stars.png" /></td>
+                <td class="total_rates">out of 132 reviews</td>
+            </tr>
+        </table>
+        <div class="clear">&nbsp;</div>
+    </div>
+
+<div class="item_detail_rating">
+    <div class="review_box_top">&nbsp;</div>
+    <div class="review_box_body">
+        <div class="input_boxes">
+            <table cellpadding="0" cellspacing="0" border="0">
+                <tr>
+                    <td class="review_name_cell"><input type="text" class="review_name" style="color:#aaa;" value=" Name " onfocus="if(this.value==' Name '){this.value='';this.style.color='#424242';}" onblur="if(this.value==''){this.value=' Name '; this.style.color='#aaa';}" /></td>
+                    <td class="review_email_cell"><input type="text" class="review_email" style="color:#aaa;" value=" Email Address " onfocus="if(this.value==' Email Address '){this.value='';this.style.color='#424242';}" onblur="if(this.value==''){this.value=' Email Address '; this.style.color='#aaa';}" /></td>
+                    <td class="rating_msg_box">Your email address will not<br />be displayed to other users.</td>
+                </tr>
+            </table>
+        </div>
+        <div class="item_detail_rating2">
+            <table cellpadding="0" cellspacing="0" border="0" class="item_avg_rate_table2"><tr>
+                    <td class="rate">Rating</td>
+                    <td class="stars"><img alt="rating" src="[% ctx.media_prefix %]/images/kpac/stars_gray.png" /></td>
+                    <td class="scale">1 = Poor, 5 = Awesome</td>
+                </tr>
+            </table>
+        </div>
+        <div class="review_comment_box"><textarea class="review_comment" style="color:#aaa;" onfocus="if(this.value==' Write the reasons for your rating here. '){this.value='';this.style.color='#424242';}" onblur="if(this.value==''){this.value=' Write the reasons for your rating here. '; this.style.color='#aaa';}"> Write the reasons for your rating here. </textarea></div>
+        <div class="clear">&nbsp;</div>
+    </div>
+    <div class="review_submit_box"><a href="javascript:;"><img alt="submit review" src="[% ctx.media_prefix %]/images/kpac/review_submit_btn.png" /></a></div>
+</div>
+  
+<div class="sub_navigation1">
+    <table cellpadding="0" cellspacing="0" border="0" width="100%">
+        <tr>
+            <td><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/go_back_btn.png" /></a></td>
+            <td width="100%" class="nav_mid_bg"></td>
+            <td class="to_top_btn"><a href="javascript:;"><img src="[% ctx.media_prefix %]/images/kpac/to_top_btn.png" /></a></td>
+        </tr>
+    </table>
+</div>
+  
+[% END %]
diff --git a/Open-ILS/src/templates/kpac/results.tt2 b/Open-ILS/src/templates/kpac/results.tt2
new file mode 100644 (file)
index 0000000..8a8dc0d
--- /dev/null
@@ -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') %]
+        
+<h2 class="sub_header2">Search Results</h2>
+
+<div class="sub_navigation2">
+    [% INCLUDE 'kpac/parts/paginate.tt2' %]
+</div>
+
+<div id="search_results_parent">
+
+[%  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 %]
+</div>
+
+<div class="sub_navigation3">
+    [% INCLUDE 'kpac/parts/paginate.tt2' showtop=1 %]
+</div>
+
+[% 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 (file)
index 8a8dc0d..0000000
+++ /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') %]
-        
-<h2 class="sub_header2">Search Results</h2>
-
-<div class="sub_navigation2">
-    [% INCLUDE 'kpac/parts/paginate.tt2' %]
-</div>
-
-<div id="search_results_parent">
-
-[%  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 %]
-</div>
-
-<div class="sub_navigation3">
-    [% INCLUDE 'kpac/parts/paginate.tt2' showtop=1 %]
-</div>
-
-[% END %]
diff --git a/Open-ILS/web/images/kpac/stars!.png b/Open-ILS/web/images/kpac/stars!.png
deleted file mode 100755 (executable)
index 9fd8310..0000000
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 (executable)
index bf38a47..0000000
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 (executable)
index 0000000..9fd8310
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 (executable)
index 0000000..bf38a47
Binary files /dev/null and b/Open-ILS/web/images/kpac/stars_grey.png differ