Bugzilla – Attachment 29304 Details for
Bug 9303
relative's checkouts in the opac
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9303 [7] [QA Followup 4] - Undo changes to prog and ccsr themes
Bug-9303-7-QA-Followup-4---Undo-changes-to-prog-an.patch (text/plain), 8.70 KB, created by
Kyle M Hall (khall)
on 2014-06-26 18:58:06 UTC
(
hide
)
Description:
Bug 9303 [7] [QA Followup 4] - Undo changes to prog and ccsr themes
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2014-06-26 18:58:06 UTC
Size:
8.70 KB
patch
obsolete
>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 › 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9303
:
22757
|
22770
|
22771
|
22772
|
22783
|
22789
|
22790
|
22809
|
22966
|
22967
|
22968
|
22974
|
22975
|
23086
|
23087
|
23088
|
23089
|
23090
|
23525
|
23526
|
23527
|
24009
|
24010
|
24011
|
24773
|
24774
|
24775
|
24776
|
25008
|
25584
|
25585
|
25586
|
27537
|
27538
|
27539
|
27540
|
27541
|
27542
|
27543
|
27698
|
27699
|
28153
|
28154
|
28155
|
28156
|
28157
|
28158
|
28159
|
28160
|
28161
|
28912
|
29171
|
29172
|
29215
|
29286
|
29287
|
29288
|
29289
|
29290
|
29299
|
29302
|
29303
|
29304
|
29932
|
29933
|
29934
|
29935
|
29936
|
29937
|
30287
|
30288
|
30289
|
30297
|
30298
|
30299
|
30300
|
32053
|
32054
|
32055
|
33049
|
34629
|
34630
|
34631
|
34632
|
34633
|
35519
|
35520
|
35521
|
35522
|
35523
|
35524
|
35525
|
35526
|
35527
|
35528
|
35529
|
35530
|
35531
|
35532
|
35678
|
35679
|
35680
|
35681
|
35682
|
35683
|
35684
|
35686
|
35687
|
35688
|
35689
|
35690
|
35691
|
35832
|
36287
|
36288
|
36289
|
37110
|
37111
|
37112
|
38264
|
38265
|
38266
|
38267
|
38328
|
38329
|
38330
|
38331
|
38446
|
38447
|
38448
|
38449
|
38450
|
38820
|
38821
|
38822
|
38823
|
38824
|
39042
|
39043
|
39044
|
39045
|
39046
|
39047
|
39048
|
39811
|
39817
|
39818
|
39819
|
39820
|
39821
|
39822
|
39823
|
44430
|
44431
|
44432
|
44433
|
44434
|
44435
|
44436
|
44511
|
44512
|
44513
|
44514
|
44515
|
44516
|
44517
|
46136
|
46137
|
46138
|
46139
|
46140
|
46141
|
46142