From 842b46a6046421e36a27c4b9e9e7d06d6bafb1cd Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 26 Jun 2014 14:21:28 -0400
Subject: [PATCH] Bug 9303 [7] [QA Followup 4] - Undo changes to prog and ccsr themes

---
 .../opac-tmpl/prog/en/modules/opac-memberentry.tt  |   35 --------------
 .../opac-tmpl/prog/en/modules/opac-privacy.tt      |   21 +-------
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt   |   50 +-------------------
 3 files changed, 3 insertions(+), 103 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
index 65fe743..0e21010 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-memberentry.tt
@@ -20,20 +20,6 @@
             [% ELSE %]
                 $( "#borrower_dateofbirth" ).datepicker({ yearRange: "c-120:c" });
             [% END %]
-
-            $('#update_privacy_guarantor_checkouts').click( function() {
-                $.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() })
-                 .done(function( data ) {
-                     var message;
-                     if ( data.success ) {
-                         message = _("Your setting has been updated!");
-                     } else {
-                         message = _("Unable to update your setting!");
-                     }
-
-                     $('#update_privacy_guarantor_checkouts_message').fadeIn("slow").text( message ).delay( 5000 ).fadeOut("slow");
-                 });
-            });
         });
     //]]>
     </script>
@@ -76,27 +62,6 @@
                                 <div class="dialog alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
                             [% END %]
 
-                            <fieldset class="rows" id="memberentry_privacy">
-                                <legend id="privacy_legend">Privacy</legend>
-                                <ol>
-                                    <li>
-                                        <label>Show checkouts to relatives</label>
-                                        <select id="privacy_guarantor_checkouts">
-                                            <option value="0">No</option>
-                                            [% IF borrower.privacy_guarantor_checkouts %]
-                                                <option value="1" selected="selected">Yes</option>
-                                            [% ELSE %]
-                                                <option value="1">Yes</option>
-                                            [% END %]
-                                        </select>
-                                        <span class="hint">
-                                            <button id="update_privacy_guarantor_checkouts" onclick="return false;">Update</button>
-                                            <span id="update_privacy_guarantor_checkouts_message" class="alert" style="display:none"></span>
-                                        </span>
-                                    </li>
-                                </ol>
-                            </fieldset>
-
                                 [% UNLESS
                                     hidden.defined('branchcode')
                                 %]
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
index b45514b..1106973 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
@@ -35,8 +35,7 @@
     </div>
     <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-update-form">
             <input type="hidden" name="op" value="update_privacy" />
-
-            <label for="privacy">Please choose your privacy rule:</label>
+            <label for:"privacy">Please choose your privacy rule:</label>
             <select name="privacy">
                 [% IF ( privacy0 ) %]
                     <option value="0" selected="1" class="privacy0">Forever</option>
@@ -54,23 +53,7 @@
                     <option value="2" class="privacy2">Never</option>
                 [% END %]
             </select>
-
-            <p/>
-
-            <label for="privacy_guarantor_checkouts">Allow relatives to view your current checkouts?</label>
-            <select name="privacy_guarantor_checkouts">
-                [% IF borrower.privacy_guarantor_checkouts %]
-                    <option value="0">No</option>
-                    <option value="1" selected>Yes</option>
-                [% ELSE %]
-                    <option value="0" selected>No</option>
-                    <option value="1">Yes</option>
-                [% END %]
-            </select>
-
-            <p/>
-
-            <input type="Submit" value="Save" />
+            <input type="Submit" value="Submit" />
         </form>
         <h2>Immediate deletion</h2>
         <form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-delete-form">
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index 65bf175..9f1478e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -1,6 +1,5 @@
 [% USE Koha %]
 [% USE KohaDates %]
-[% USE EncodeUTF8 %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home
 [% INCLUDE 'doc-head-close.inc' %]
@@ -16,7 +15,7 @@ var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended
 
         $('#opac-user-views').tabs();
 
-        var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table");
+        var dTables = $("#checkoutst,#holdst,#overduest");
         dTables.each(function(){
             var thIndex = $(this).find("th.psort").index();
             $(this).dataTable($.extend(true, {}, dataTablesDefaults, {
@@ -147,7 +146,6 @@ var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended
 <div id="opac-user-views" class="toptabs">
         <ul>
             <li><a href="#opac-user-checkouts">Checked out</a></li>
-            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
             [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue</a></li>[% END %]
 [% IF ( OPACFinesTab ) %]
             [% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines</a></li>[% END %]
@@ -327,52 +325,6 @@ var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended
         [% END %]
     [% END %]
 
-    [% IF relatives && Koha.Preference('borrowerRelationship') %]
-        <div id="opac-user-relative-issues">
-            <table id="opac-user-relative-issues-table">
-                <thead>
-                    <tr>
-                        <th class="anti-the">Title</th>
-                        <th>Due</th>
-                        <th>Barcode</th>
-                        <th>Call No.</th>
-                        <th class="psort">Relative</th>
-                    </tr>
-                </thead>
-
-                <tbody>
-                    [% FOREACH r IN relatives %]
-                        [% FOREACH i IN r.issues %]
-                            <tr>
-                                <td>
-                                    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
-                                        [% i.item.biblio.title | $EncodeUTF8 %]
-                                    </a>
-                                </td>
-
-                                <td>
-                                    [% i.date_due | $KohaDates %]
-                                </td>
-
-                                <td>
-                                    [% i.item.barcode %]
-                                </td>
-
-                                <td>
-                                    [% i.item.itemcallnumber | $EncodeUTF8 %]
-                                </td>
-
-                                <td>
-                                    [% r.firstname | $EncodeUTF8 %] [% r.surname | $EncodeUTF8 %]
-                                </td>
-                            </tr>
-                        [% END %]
-                    [% END %]
-                </tbody>
-            </table>
-        </div>
-    [% END %]
-
 [% IF ( overdues_count ) %]
 <div id="opac-user-overdues"><table id="overduest">
 <caption>Overdues <span class="count">([% overdues_count %] total)</span></caption>
-- 
1.7.2.5