From: Bill Erickson <berickxx@gmail.com>
Date: Mon, 16 May 2016 14:22:57 +0000 (-0400)
Subject: JBAS-1326 C/O history TPAC cross-port
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=902612ad5248df4b70db10fd98fde38c7db5f70d;p=working%2FEvergreen.git

JBAS-1326 C/O history TPAC cross-port

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

diff --git a/KCLS/openils/var/templates_kcls/opac/myopac/circ_history.tt2 b/KCLS/openils/var/templates_kcls/opac/myopac/circ_history.tt2
index 895356be12..ee43670aec 100644
--- a/KCLS/openils/var/templates_kcls/opac/myopac/circ_history.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/myopac/circ_history.tt2
@@ -39,10 +39,36 @@
     </div>
     [% ELSE %]
 
+        <form method="post" id="circ-form"
+            onsubmit="return confirm('[% l("Are you sure you wish to delete the selected item(s)?") %]');">
+        <table cellpadding='0' cellspacing='0' class="item_list_padding">
+            <tr>
+                <td>
+                    <select name="action">
+                        <option value="delete">[% l('Delete Selected Titles') %]</option>
+                    </select>
+                </td>
+                <td style="padding-left:9px;">
+                    <input type="submit"
+                        value="[% l('Go') %]"
+                        alt="[% l('Go') %]" title="[% l('Go') %]"
+                        class="opac-button" />
+                </td>
+                <!--
+                <td style="padding-left:5px;">
+                    <a href="#"><img alt="[% l('Deleting Help') %]"
+                        src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
+                </td>
+                -->
+            </tr>
+        </table>
     <div id='checked_main'>
         <table style='border-collapse:collapse;'>
             <thead id="acct_checked_main_header">
                 <tr>
+                    <td align="center">
+                        <input type="checkbox" onclick="var inputs=document.getElementsByTagName('input'); for (i = 0; i < inputs.length; i++) { if (inputs[i].name == 'circ_id' && !inputs[i].disabled) inputs[i].checked = this.checked;}"/>
+                    </td>
                     <td width="25%" style="padding-left:5px;">
                         <span title="Click to sort" class='pointer'>[% l('Title') %]</span>
                     </td>
@@ -71,6 +97,9 @@
                     attrs = {marc_xml => circ.marc_xml};
                     PROCESS get_marc_attrs args=attrs; %]
                     <tr>
+                        <td align="center" style="text-align:center;">
+                          <input type="checkbox" name="circ_id" value="[% circ.circ.id %]" />
+                        </td>
                         <td style="padding-left:5px;padding-bottom:10px;">
                             <a href="[% ctx.opac_root %]/record/[% circ.circ.target_copy.call_number.record.id %]" 
                                 name="[% l('Catalog record') %]">[% attrs.title | html %]</a>
@@ -105,6 +134,7 @@
             </tbody>
         </table>
     </div>
+    </form>
     [% END %]
 </div>
 [% END %]
diff --git a/KCLS/openils/var/templates_kcls/opac/myopac/prefs_settings.tt2 b/KCLS/openils/var/templates_kcls/opac/myopac/prefs_settings.tt2
index 4fa1e540d9..396929a62c 100644
--- a/KCLS/openils/var/templates_kcls/opac/myopac/prefs_settings.tt2
+++ b/KCLS/openils/var/templates_kcls/opac/myopac/prefs_settings.tt2
@@ -7,6 +7,7 @@
 
     <form method='POST'>
 
+        [% IF !ctx.confirm_history_delete %]
         <div style="float:right;width:65px;">
             <div style="position:absolute">
                 <div style="position:relative;top:75px;">
@@ -14,11 +15,23 @@
                 </div>
             </div>
         </div>
+        [% END %]
 
         <table class="full-width data_grid" id="acct_search_main">
             <tbody>
 
-                [% IF ctx.updated_user_settings %]
+                [% IF ctx.confirm_history_delete %]
+                <tr><td colspan='2'>
+                  <div id='clear-history-confirm' class='renew-summary'>
+                  [% l('Disabling checkout or holds history will permanently remove all items from your history.') %]
+                  <br/>
+                  [% l('Are you sure you wish to continue?') %]
+                  </div>
+                  <a href="[% mkurl() %]">[% l('Cancel') %]</a>
+                  <input type='hidden' name='history_delete_confirmed' value='1'/>
+                  <input type="submit" value="[% l('Confirm') %]" class="opac-button"/>
+                </td></tr>
+                [% ELSIF ctx.updated_user_settings %]
                 <tr><td colspan='2'>
                     <div class='renew-summary'>
                         [% l('Account Successfully Updated') %]
@@ -26,7 +39,7 @@
                 </td></tr>
                 [% END %]
 
-                <tr >
+                <tr>
                     <td width='20%'>[% l("Search hits per page") %]</td>
                     <td>
                         <div style="position:absolute">
@@ -76,7 +89,8 @@
                     <td>
                         [% setting = 'history.circ.retention_start' %]
                         <input name='[% setting %]' type="checkbox"
-                            [% IF ctx.user_setting_map.$setting; %] checked='checked' [% END %]/>
+                            [% IF ctx.user_setting_map.$setting 
+                              AND !ctx.clear_circ_history %] checked='checked' [% END %]/>
                     </td>
                 </tr>
                 <tr>
@@ -84,7 +98,8 @@
                     <td>
                         [% setting = 'history.hold.retention_start' %]
                         <input name='[% setting %]' type="checkbox"
-                            [% IF ctx.user_setting_map.$setting; %] checked='checked' [% END %]/>
+                            [% IF ctx.user_setting_map.$setting
+                              AND !ctx.clear_hold_history %] checked='checked' [% END %]/>
                     </td>
                 </tr>