kcls / tpac 2.2 : merged updated rdetail staff client paging

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates_kcls/opac/parts/js.tt2 b/Open-ILS/src/templates_kcls/opac/parts/js.tt2
index cf7ff9f..91f3d42 100644 (file)
--- a/Open-ILS/src/templates_kcls/opac/parts/js.tt2
+++ b/Open-ILS/src/templates_kcls/opac/parts/js.tt2
@@ -1,8 +1,7 @@
 <!-- JS imports, etc.  -->
-
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/simple.js"></script>
 
-[% IF ctx.is_staff %]
+[%- IF ctx.is_staff %]
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/staff.js"></script>
     [% IF ctx.page == 'record' %]
         [% IF ctx.search_result_index >= 0 %]
@@ -13,7 +12,8 @@
                 "[% ctx.prev_rec_url || '' %]",
                 "[% ctx.next_rec_url || '' %]",
                 "[% mkurl(ctx.first_search_record, {page => 0}) %]",
-                "[% mkurl(ctx.last_search_record, {page => POSIX.floor(ctx.hit_count / ctx.page_size)}) %]"
+                "[% mkurl(ctx.opac_root _ '/results', {find_last => 1, page => POSIX.floor(ctx.hit_count / ctx.page_size)}) %]",
+                "[% mkurl(ctx.opac_root _ '/results', {}, ['expand','cnoffset']) %]"
             );
         </script>
         [% END %]
@@ -34,7 +34,7 @@
     [% END %]
 [%- END %]
 
-[% IF ENV.OILS_NOVELIST_URL AND ctx.page == 'record';
+[%- IF ENV.OILS_NOVELIST_URL AND ctx.page == 'record';
     url = ENV.OILS_NOVELIST_URL;
     IF CGI.https; url = url.replace('^http:', 'https:'); END; %]
 <script type='text/javascript' id='EIT' src='[% url %]'></script>

diff --git a/Open-ILS/src/templates_kcls/opac/parts/record/body.tt2 b/Open-ILS/src/templates_kcls/opac/parts/record/body.tt2
index 8c7e77b..d685d92 100644 (file)
--- a/Open-ILS/src/templates_kcls/opac/parts/record/body.tt2
+++ b/Open-ILS/src/templates_kcls/opac/parts/record/body.tt2
@@ -1,29 +1,31 @@
-<!-- ****************** page_rdetail.xml ***************************** -->
-[%  attrs = {marc_xml => ctx.marc_xml};
+[%-  attrs = {marc_xml => ctx.marc_xml};
     PROCESS "opac/parts/misc_util.tt2";
-    PROCESS get_marc_attrs args=attrs %]
-
-<div id='canvas_main' class='canvas'>
+    PROCESS get_marc_attrs args=attrs;
+    stop_parms = ['expand','cnoffset'];
+%]
+<div id='canvas_main' class='canvas' itemscope itemtype='[% attrs.schema.itemtype %]'>
 
     [% IF ctx.search_result_index >= 0 %]
     <div id="rdetail_header">
-        <div style="float:left;">
-            <a href='[% mkurl(ctx.opac_root _ '/results') %]'>[% l('&#9668; Search Results') %]</a>
+        <span id="rdetail_results">
+            <a href='[% mkurl(ctx.opac_root _ '/results', {}, stop_parms); %]'>[% l('&#9668; Search Results') %]</a>
             <span id="rdetail_result_count">
                 [% l('Showing Item [_1] of [_2]', ctx.search_result_index + 1, ctx.hit_count) %]
             </span>
-        </div>
+        </span>
+        [%#- INCLUDE "opac/parts/pref_lib_display.tt2" %] <!-- not used by KCLS -->
         <div id="rdetail_result_nav">
             [%
                 IF ctx.prev_search_record;
                     prev_args = {};
-                    IF ctx.search_result_index % (ctx.page_size + 1) == 0; # first record in the page
+                    IF ctx.search_page > 0 AND 
+                            ctx.search_result_index % ((ctx.page_size * ctx.search_page)) == 0; # first record in the page
                         prev_args.page = ctx.search_page - 1;
                     END;
-                    ctx.prev_rec_url = mkurl(ctx.prev_search_record, prev_args);
+                    ctx.prev_rec_url = mkurl(ctx.prev_search_record, prev_args, stop_parms);
             %]
             <a class='np_nav_link classic_link' title='[% l("Previous Record") %]'
-                href='[% ctx.prev_rec_url %]'><span class="nav_arrow_fix">&#9668; </span>[% l('Previous') %]</a>
+                href='[% ctx.prev_rec_url %]'>&#9668; [% l('Previous') %]</a>
             [% END %]
 
             <span style="padding:0px 10px;"> </span>
@@ -31,26 +33,25 @@
             [% 
                 IF ctx.next_search_record;
                     next_args = {};
-                    IF ctx.page_size == ctx.search_result_index + 1;
+                    IF (ctx.page_size * (ctx.search_page + 1)) == ctx.search_result_index + 1;
                         next_args.page = ctx.search_page + 1;
                     END;
-                    ctx.next_rec_url = mkurl(ctx.next_search_record, next_args);
+                    ctx.next_rec_url = mkurl(ctx.next_search_record, next_args, stop_parms);
             %]
             <a class='np_nav_link classic_link' title='[% l("Next Record") %]'
-                href='[% ctx.next_rec_url %]'>[% l('Next') %]<span class="nav_arrow_fix"> &#9658;</span></a>
+                href='[% ctx.next_rec_url %]'>[% l('Next') %] &#9658;</a>
             [% END %]
 
         </div>
         <div class="clear-both"></div>
     </div>
     [% END %]
-
-    <div style='font-weight: bold; padding: 5px; margin: 5px; width: 100%;'
-        class='hide_me color_4' id='rdetail_deleted_exp'>
+    [%- IF ctx.bib_is_dead %]
+    <div id='rdetail_deleted_exp'>
         [% l("This record has been deleted from the database.  We recommend that you remove this title from any bookbags it may have been added to.") %]
     </div>
+    [%- END %]
     [% INCLUDE "opac/parts/record/summary.tt2" %]
-    <br />
+    <br/>
     [% INCLUDE "opac/parts/record/extras.tt2" %]
 </div>
-<!-- ****************** end; page_rdetail.xml ***************************** -->