kmain-9. Partial fix - still needs fix to xul <End> button modified: openils/var...

    Cross-port: 57123d4

diff --git a/KCLS/openils/var/templates_kcls/opac/parts/record/extras.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/record/extras.tt2
index e676b91..5f91f5c 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/parts/record/extras.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/record/extras.tt2
@@ -43,10 +43,10 @@
             <div class="rdetail_extras_link">
                 [%  
                     IF tab_is_active(name);
-                        href = mkurl('', {}, ['expand']);
+                        href = mkurl(ctx.opac_root _ '/record/' _ ctx.bre_id, {}, ['expand']);
                         img_url = ctx.media_prefix _ '/images/kcls_rdetail_arrow_down.png';
                     ELSE;
-                        href = mkurl('', {expand => name}) _ '#' _ name; 
+                        href = mkurl(ctx.opac_root _ '/record/' _ ctx.bre_id, {expand => name}) _ '#' _ name; 
                         img_url = ctx.media_prefix _ '/images/kcls_rdetail_arrow.png';
                     END;
                 %]

diff --git a/KCLS/openils/var/templates_kcls/opac/parts/record/summary.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/record/summary.tt2
index bca479e..2a8d8c9 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/parts/record/summary.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/record/summary.tt2
@@ -246,10 +246,10 @@
             <td>
                 [% IF CGI.param('expand') == 'all' %]
                     <img src="[% ctx.media_prefix %]/images/kcls_minus_sign.png" />
-                    <a href="[% mkurl('', {}, ['expand']) %]">[% l('Collapse all tabs') %]</a>
+                    <a href="[% mkurl(ctx.opac_root _ '/record/' _ ctx.bre_id, {}, ['expand']) %]">[% l('Collapse all tabs') %]</a>
                 [% ELSE %]
                     <img src="[% ctx.media_prefix %]/images/kcls_plus_sign.png" />
-                    <a href="[% mkurl('', {expand => 'all'}) %]">[% l('Expand all tabs') %]</a>
+                    <a href="[% mkurl(ctx.opac_root _ '/record/' _ ctx.bre_id, {expand => 'all'}) %]">[% l('Expand all tabs') %]</a>
                 [% END %]
             </td>
         </tr>

diff --git a/KCLS/openils/var/templates_kcls/opac/parts/result/paginate.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/result/paginate.tt2
index 6582c01..75a3f18 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/parts/result/paginate.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/result/paginate.tt2
@@ -17,7 +17,7 @@
                     [%  class = 'search_page_nav_link';
                         href = '#';
                         IF page > 0;
-                            href = mkurl('', {page => page - 1});
+                            href = mkurl(ctx.opac_root _ '/results', {page => page - 1});
                         ELSE; class = class _ ' invisible'; END;
                     %]
                     <a class='[% class %]' href='[% href %]' 
@@ -33,7 +33,7 @@
                                     IF pageitr == page; %]
                                         <span class='results-paginator-selected'>[% pageitr + 1%]</span>
                                     [% ELSE %]
-                                        <a href="[% mkurl('', {page => pageitr}) %]">[% pageitr + 1%]</a>
+                                        <a href="[% mkurl(ctx.opac_root _ '/results', {page => pageitr}) %]">[% pageitr + 1%]</a>
                                 [%  END;
                                     added = added + 1;
                                     IF added == 8; LAST; END;
@@ -45,7 +45,7 @@
                     [%  class = 'search_page_nav_link';
                         href = '#';
                         IF (page + 1) < page_count;
-                            href = mkurl('', {page => page + 1});
+                            href = mkurl(ctx.opac_root _ '/results', {page => page + 1});
                         ELSE; class = class _ ' invisible'; END;
                     %]
                     <a class='[% class %]' href='[% href %]' 

diff --git a/KCLS/openils/var/templates_kcls/opac/results.tt2 b/KCLS/openils/var/templates_kcls/opac/results.tt2
index 13a3746..c4fedb1 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/results.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/results.tt2
@@ -55,9 +55,9 @@
 
                     <div class='results_header_sel' id='simple-detail-view-links'>
                         [% IF CGI.param('detail_record_view') %]
-                        <a href="[% mkurl('', {detail_record_view => ''}) %]">[% l('Simple View') %]</a>
+                        <a href="[% mkurl(ctx.opac_root _ '/results', {detail_record_view => ''}) %]">[% l('Simple View') %]</a>
                         [% ELSE %]
-                        <a href="[% mkurl('', {detail_record_view => 1}) %]">[% l('Detailed View') %]</a>
+                        <a href="[% mkurl(ctx.opac_root _ '/results', {detail_record_view => 1}) %]">[% l('Detailed View') %]</a>
                         [% END %]
                     </div>
                     <div class="results_header_div"></div>