From 287d022bf2ef74d85c57b438b565e183fe52858f Mon Sep 17 00:00:00 2001 From: Aleisha <aleishaamohia@hotmail.com> Date: Tue, 17 May 2016 04:35:46 +0000 Subject: [PATCH] Bug 16530: Adding a circ sidebar navigation menu This adds a sidebar to circ/branchoverdues.tt circ/circulation.tt (I also fixed up some of the indentation in this file to make it easier to see where the divs started and ended) circ/renew.tt circ/returns.tt circ/selectbranchprinter.tt circ/transferstoreceive.tt circ/view_holdsqueue.tt circ/waitingreserves.tt offline_circ/list.tt offline_circ/process_koc.tt To test: 1) Go to all of the above pages and confirm the sidebar menu shows up. 2) Trigger any error messages you can possibly think of (i.e. on renew.pl: barcode does not exist). Confirm that this does not mess up the layout of the page 3) Go to a user account page, Check out tab. (Since this is a circ/circulation.pl page). Ensure the circ nav sidebar doesn't show up (confirm it looks as it usually does) 4) Decide if you like how things look or not! Sponsored-by: Catalyst IT Signed-off-by: Jan Kissig <jkissig@th-wildau.de> --- .../intranet-tmpl/prog/en/includes/circ-nav.inc | 67 ++++++++++ .../prog/en/modules/circ/branchoverdues.tt | 7 +- .../prog/en/modules/circ/circulation.tt | 18 ++- .../intranet-tmpl/prog/en/modules/circ/renew.tt | 12 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 129 ++++++++++---------- .../prog/en/modules/circ/selectbranchprinter.tt | 7 +- .../prog/en/modules/circ/transferstoreceive.tt | 7 +- .../prog/en/modules/circ/view_holdsqueue.tt | 7 +- .../prog/en/modules/circ/waitingreserves.tt | 7 +- .../prog/en/modules/offline_circ/list.tt | 14 ++- .../prog/en/modules/offline_circ/process_koc.tt | 11 +- 11 files changed, 203 insertions(+), 83 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc new file mode 100644 index 0000000..d84ddab --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc @@ -0,0 +1,67 @@ +<script type="text/javascript">//<![CDATA[ + $(document).ready(function() { + var path = location.pathname.substring(1); + var url = window.location.toString(); + var params = ''; + if ( url.match(/\?(.+)$/) ) { + params = "?" + RegExp.$1; + } + $('#navmenulist a[href$="/' + path + params + '"]').css('font-weight','bold'); + }); +//]]> +</script> + +<div id="navmenu"> + <div id="navmenulist"> + + <ul> + <li><a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation home</a></li> + </ul> + + <h5>Circulation</h5> + <ul> + <li><a href="/cgi-bin/koha/circ/circulation.pl">Check out</a></li> + <li><a href="/cgi-bin/koha/circ/returns.pl">Check in</a></li> + <li><a href="/cgi-bin/koha/circ/renew.pl">Renew</a></li> + [% IF ( display_transfer ) %] + <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li> + [% END %] + [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %] + <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li> + [% END %][% END %] + [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %] + <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li> + [% END %][% END %] + </ul> + + <h5>Offline circulation</h5> + <ul> + [% IF (AllowOfflineCirculation) %] + <li><a href="/cgi-bin/koha/circ/offline.pl">Built-in offline circulation interface</a></li> + [% END %] + <li><a href="/cgi-bin/koha/offline_circ/process_koc.pl">Upload offline circulation file (.koc)</a></li> + <li><a href="/cgi-bin/koha/offline_circ/list.pl">Pending offline circulation actions</a> + <ul> + <li><a href="https://github.com/bywatersolutions/koha-offline-circulation/releases">Get desktop application</a></li> + <li><a href="https://addons.mozilla.org/[% lang %]/firefox/addon/koct/">Get Firefox add-on</a></li> + </ul> + </ul> + + <h5>Circulation reports</h5> + <ul> + <li><a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds queue</a></li> + <li><a href="/cgi-bin/koha/circ/pendingreserves.pl">Holds to pull</a></li> + <li><a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a></li> + <li><a href="/cgi-bin/koha/circ/reserveratios.pl">Hold ratios</a></li> + <li><a href="/cgi-bin/koha/circ/transferstoreceive.pl">Transfers to receive</a></li> + [% IF ( CAN_user_circulate_overdues_report ) %] + <li><a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li> + [% END %] + <li><a href="/cgi-bin/koha/circ/branchoverdues.pl">Overdues with fines</a></li> + [% IF Koha.Preference('OnSiteCheckouts') %] + <li><a href="/cgi-bin/koha/circ/on-site_checkouts.pl">Pending on-site checkouts</a></li> + [% END %] + </ul> + + </div> +</div> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt index ff3424d..ca0c0e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tt @@ -8,10 +8,11 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Overdues at [% LoginBranchname %]</div> -<div id="doc" class="yui-t7"> +<div id="doc3" class="yui-t2"> <div id="bd"> <div id="yui-main"> + <div class="yui-b"> <div class="yui-g"> @@ -163,4 +164,8 @@ </div> </div> </div> +<div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] +</div> +</div> [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index cd3fc35..d0689ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1045,12 +1045,22 @@ No patron matched <span class="ex">[% message %]</span> [% END %] <!-- borrowernumber and borrower--> </div></div> [% END %] - +[% UNLESS ( borrowers ) %] + [% IF not( borrowernumber and borrower ) %] + <div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] + </div> + [% END %] +[% END %] </div> </div> -[% UNLESS ( borrowers ) %][% IF borrowernumber and borrower %]<div class="yui-b"> -[% INCLUDE 'circ-menu.inc' %] -</div>[% END %][% END %] +[% UNLESS ( borrowers ) %] + [% IF borrowernumber and borrower %] + <div class="yui-b"> + [% INCLUDE 'circ-menu.inc' %] + </div> + [% END %] +[% END %] </div> <!-- Modal --> <div id="barcodeSubmittedModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="barcodeSubmittedModalLabel" aria-hidden="true"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index 7c481f4..26c88d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -26,9 +26,10 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Renew</div> -<div id="doc" class="yui-t7"> +<div id="doc3" class="yui-t2"> <div id="bd"> - + <div id="yui-main"> + <div class="yui-b"> [% IF error %] <div class="dialog alert"> <h3>Cannot renew:</h3> @@ -128,7 +129,6 @@ </p> </div> [% END %] - </div> <div class="yui-g"> @@ -151,8 +151,12 @@ [% END %] </div> - </div> +</div> + +<div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] +</div> <div> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 6a9f868..2431846 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -125,11 +125,11 @@ $(document).ready(function () { <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Check in</div> -<div id="doc" class="yui-t7"> - - <div id="bd"> - <div id="yui-main"> +<div id="doc3" class="yui-t2"> +<div id="bd"> +<div id="yui-main"> +<div class="yui-b"> <div class="yui-g"> [% IF privacy == 2 AND NOT Koha.Preference('AnonymousPatron') %] @@ -442,66 +442,64 @@ $(document).ready(function () { <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p> [% END %] [% FOREACH errmsgloo IN errmsgloop %] - [% IF ( errmsgloo.NotForLoanStatusUpdated ) %] - <p class="problem"> - Not for loan status updated. - <br />Old value: - [% IF errmsgloo.NotForLoanStatusUpdated.from %] - [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]. - [% ELSE %] - Available for loan. - [% END %] - <br />New value: - [% IF errmsgloo.NotForLoanStatusUpdated.to %] - [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %]. - [% ELSE %] - Available for loan. - [% END %] - </p> - [% END %] - [% IF ( errmsgloo.badbarcode ) %] - <p class="problem">No item with barcode: [% errmsgloo.msg %]</p> - [% END %] - [% IF ( errmsgloo.ispermanent ) %] - <p class="problem">Please return item to: [% errmsgloo.msg %]</p> - [% END %] - [% IF ( errmsgloo.notissued ) %] - <p class="problem">Not checked out.</p> - [% END %] - [% IF ( errmsgloo.localuse) %] - <p class="problem">Local use recorded</p> - [% END %] - [% IF ( errmsgloo.waslost ) %] - <p class="problem">Item was lost, now found.</p> - [% IF ( LostItemFeeRefunded ) %] - <p class="problem">A refund has been applied to the borrowing patron's account.</p> - [% ELSE %] - <p class="problem">Any lost item fees for this item will remain on the patron's account.</p> - [% END %] - [% END %] - [% IF ( errmsgloo.withdrawn ) %] - [% IF BlockReturnOfWithdrawnItems %] - <h5>Cannot check in</h5> - <p><strong>NOT CHECKED IN</strong></p> - <p class="problem">Item is withdrawn.</p> - [% ELSE %] - <p class="problem">Item is withdrawn.</p> - [% END %] - [% END %] - [% IF ( errmsgloo.debarred ) %] - <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p> - [% END %] - [% IF ( errmsgloo.prevdebarred ) %] - <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p> + [% IF ( errmsgloo.NotForLoanStatusUpdated ) %] + <p class="problem"> + Not for loan status updated. + <br />Old value: + [% IF errmsgloo.NotForLoanStatusUpdated.from %] + [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]. + [% ELSE %] + Available for loan. [% END %] - [% IF ( errmsgloo.foreverdebarred ) %] - <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p> + <br />New value: + [% IF errmsgloo.NotForLoanStatusUpdated.to %] + [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %]. + [% ELSE %] + Available for loan. [% END %] - + </p> + [% END %] + [% IF ( errmsgloo.badbarcode ) %] + <p class="problem">No item with barcode: [% errmsgloo.msg %]</p> + [% END %] + [% IF ( errmsgloo.ispermanent ) %] + <p class="problem">Please return item to: [% errmsgloo.msg %]</p> + [% END %] + [% IF ( errmsgloo.notissued ) %] + <p class="problem">Not checked out.</p> + [% END %] + [% IF ( errmsgloo.localuse) %] + <p class="problem">Local use recorded</p> + [% END %] + [% IF ( errmsgloo.waslost ) %] + <p class="problem">Item was lost, now found.</p> + [% IF ( LostItemFeeRefunded ) %] + <p class="problem">A refund has been applied to the borrowing patron's account.</p> + [% ELSE %] + <p class="problem">Any lost item fees for this item will remain on the patron's account.</p> + [% END %] + [% END %] + [% IF ( errmsgloo.withdrawn ) %] + [% IF BlockReturnOfWithdrawnItems %] + <h5>Cannot check in</h5> + <p><strong>NOT CHECKED IN</strong></p> + <p class="problem">Item is withdrawn.</p> + [% ELSE %] + <p class="problem">Item is withdrawn.</p> + [% END %] + [% END %] + [% IF ( errmsgloo.debarred ) %] + <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p> + [% END %] + [% IF ( errmsgloo.prevdebarred ) %] + <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p> + [% END %] + [% IF ( errmsgloo.foreverdebarred ) %] + <p class="problem"><b>Reminder: </b>Patron has an indefinite restriction.</p> [% END %] - [% ELSE %] [% END %] </div> +[% END %] [% IF ( checkinmsg ) %] [% IF ( checkinmsgtype == 'alert' ) %] @@ -523,7 +521,7 @@ $(document).ready(function () { <p>Book drop mode. (Effective checkin date is [% dropboxdate %] ).</p> </div> </div> - <div class="yui-g"> +<div class="yui-g"> <form id="checkin-form" method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off" > <div class="yui-u first"> <fieldset> @@ -636,9 +634,14 @@ $(document).ready(function () { </td> </tr> [% END %] - </table></div> + </table> [% END %] - - +</div> +</div> +<div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] +</div> +</div> +</div> </div> [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt index faaa963..40859cf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt @@ -15,7 +15,7 @@ › <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a> </div> -<div id="doc" class="yui-t7"> +<div id="doc3" class="yui-t2"> <div id="bd"> <div id="yui-main"> <div class="yui-b"> @@ -94,5 +94,8 @@ Updated:<ul> </div> </div> - </div> +<div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] +</div> +</div> [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt index 6c2f533..5e77c29 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt @@ -29,10 +29,11 @@ $(document).ready(function() { <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Transfers to your library</div> -<div id="doc" class="yui-t7"> +<div id="doc3" class="yui-t2"> <div id="bd"> <div id="yui-main"> + <div class="yui-b"> <div class="yui-g"> <h1>Transfers made to your library as of [% show_date %]</h1> @@ -96,4 +97,8 @@ $(document).ready(function() { </div> </div> </div> +<div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] +</div> +</div> [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt index 541ddbd..44368f7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt @@ -52,10 +52,11 @@ $(document).ready(function() { [% IF ( run_report ) %] › Results[% END %] </div> -<div id="doc2" class="yui-t7"> +<div id="doc3" class="yui-t2"> <div id="bd"> <div id="yui-main"> + <div class="yui-b"> <div class="yui-g"> <h1>Holds queue</h1> @@ -221,4 +222,8 @@ $(document).ready(function() { </div> </div> </div> +<div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] +</div> +</div> [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index 3183442..f64d65a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -31,10 +31,11 @@ › <a href="/cgi-bin/koha/circ/waitingreserves.pl">Holds awaiting pickup</a> </div> -<div id="doc3" class="yui-t7"> +<div id="doc3" class="yui-t2"> <div id="bd"> <div id="yui-main"> + <div class="yui-b"> <div class="yui-g"> <h2>Holds awaiting pickup for your library on: [% show_date %] @@ -194,4 +195,8 @@ </div> </div> </div> +<div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] +</div> +</div> [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt index 033c61b..bda9875 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/list.tt @@ -59,9 +59,11 @@ <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › Offline circulation</div> - <div id="doc" class="yui-t7"> + <div id="doc3" class="yui-t2"> - <div id="bd"> + <div id="bd"> + <div id="yui-main"> + <div class="yui-b"> <h2>Offline circulation</h2> @@ -121,6 +123,12 @@ [% END %] - </div> + </div></div> + +<div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] +</div> + +</div> [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt index 6fdf5ce..6ee57df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt @@ -66,9 +66,11 @@ function CheckForm(f) { <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> › [% IF ( transactions_loaded ) %] <a href="/cgi-bin/koha/offline_circ/process_koc.pl">Offline circulation file upload</a> › Results[% ELSE %] Offline circulation file upload[% END %]</div> -<div id="doc" class="yui-t7"> +<div id="doc3" class="yui-t2"> <div id="bd"> + <div id="yui-main"> + <div class="yui-b"> [% IF ( transactions_loaded ) %] <h2>Koha offline circulation</h2> @@ -114,7 +116,10 @@ function CheckForm(f) { <div id="jobfailed" style="display:none"></div> </form> [% END %] - - +</div> +</div> +<div class="yui-b noprint"> + [% INCLUDE 'circ-nav.inc' %] +</div> </div> [% INCLUDE 'intranet-bottom.inc' %] -- 1.7.10.4