KMAIN-1616 let mkurl() build the URL for us

Instead of manually mangling the URL, let the existing mkurl() routine
handle that for us.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/KCLS/openils/var/templates_kcls/opac/parts/searchbar.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/searchbar.tt2
index 6ad823d..24ca6ab 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/parts/searchbar.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/searchbar.tt2
@@ -8,15 +8,15 @@
             <td colspan="3">
                 <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
                 [% IF took_care_of_form %]
-                    <a href="[% mkurl(ctx.opac_root _ '/advanced').remove('pane=(expert|browse|numeric|advanced)') %];pane=advanced"
+                    <a href="[% mkurl(ctx.opac_root _ '/advanced', {pane => 'advanced'}) %]"
                         id="home_adv_search_link"><span class="adv_search_font">[% l('Advanced Search') %]</span></a>
                 [% ELSE %]
-                    <a href="[% mkurl(ctx.opac_root _ '/advanced').remove('pane=(expert|browse|numeric|advanced)') %]?pane=advanced"
+                    <a href="[% mkurl(ctx.opac_root _ '/advanced', {pane => 'advanced'}) %]"
                         id="home_adv_search_link"><span class="adv_search_font">[% l('Advanced Search') %]</span></a>
                 [% END %]
                 |
                 <span class="browse_the_catalog_lbl adv_search_font">
-                    <a href="[% mkurl(ctx.opac_root _ '/advanced', {}, ['fi:has_browse_entry']).remove('pane=(expert|browse|numeric|advanced)') %];pane=browse"><span class="adv_search_font">[% l('Browse the Catalog') %]</span></a>
+                    <a href="[% mkurl(ctx.opac_root _ '/advanced', {pane => 'browse'}, ['fi:has_browse_entry'])%]"><span class="adv_search_font">[% l('Browse the Catalog') %]</span></a>
                 </span>
             </td>
         </tr>

diff --git a/KCLS/openils/var/templates_kcls/opac/parts/searchbar_browse.tt2 b/KCLS/openils/var/templates_kcls/opac/parts/searchbar_browse.tt2
index b866cbb..c1d908b 100644 (file)
--- a/KCLS/openils/var/templates_kcls/opac/parts/searchbar_browse.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/parts/searchbar_browse.tt2
@@ -11,7 +11,7 @@
         </span>
         |
         <span class="adv_search_catalog_lbl">
-            <a href="[% mkurl(ctx.opac_root _ '/advanced', {}, depart_list).remove('pane=(expert|browse|numeric|advanced)') %];pane=advanced" id="home_adv_search_link">
+            <a href="[% mkurl(ctx.opac_root _ '/advanced', {pane => 'advanced'}, depart_list) %]" id="home_adv_search_link">
                 [%l('Advanced Search')%]
             </a>
         </span>