Bugzilla – Attachment 53008 Details for
Bug 16530
Add a circ sidebar navigation menu
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16530: Adding a circ sidebar navigation menu
Bug-16530-Adding-a-circ-sidebar-navigation-menu.patch (text/plain), 24.74 KB, created by
Aleisha Amohia
on 2016-07-01 02:41:10 UTC
(
hide
)
Description:
Bug 16530: Adding a circ sidebar navigation menu
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2016-07-01 02:41:10 UTC
Size:
24.74 KB
patch
obsolete
>From 50ce48522d1cae8b9403c5d079dd707ed44736e5 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 > >Edit: Fast cataloging link should now show on all pages, removed offline circulation links >Note: This patch does not create the syspref to activate or deactivate the sidebar, will add that in another patch > >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 and fast cataloging link 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> >--- > circ/branchoverdues.pl | 4 + > circ/renew.pl | 5 + > circ/returns.pl | 4 + > circ/selectbranchprinter.pl | 4 + > circ/transferstoreceive.pl | 4 + > circ/view_holdsqueue.pl | 4 + > circ/waitingreserves.pl | 4 + > .../intranet-tmpl/prog/en/includes/circ-nav.inc | 54 ++++++++ > .../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 +- > 18 files changed, 219 insertions(+), 83 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc > >diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl >index d04f5e4..d7ef309 100755 >--- a/circ/branchoverdues.pl >+++ b/circ/branchoverdues.pl >@@ -156,4 +156,8 @@ $template->param( > location => $location, > ); > >+# Checking if there is a Fast Cataloging Framework >+my $fa = getframeworkinfo('FA'); >+$template->param( fast_cataloging => 1 ) if (defined $fa); >+ > output_html_with_http_headers $input, $cookie, $template->output; >diff --git a/circ/renew.pl b/circ/renew.pl >index a87ba76..b8f6f08 100755 >--- a/circ/renew.pl >+++ b/circ/renew.pl >@@ -26,6 +26,7 @@ use C4::Output; > use C4::Circulation; > use Koha::DateUtils; > use Koha::Database; >+use C4::Koha; > > my $cgi = new CGI; > >@@ -109,4 +110,8 @@ if ($barcode) { > ); > } > >+# Checking if there is a Fast Cataloging Framework >+my $fa = getframeworkinfo('FA'); >+$template->param( fast_cataloging => 1 ) if (defined $fa); >+ > output_html_with_http_headers( $cgi, $cookie, $template->output ); >diff --git a/circ/returns.pl b/circ/returns.pl >index c91d784..42ac887 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -657,5 +657,9 @@ if ( $itemnumber ) { > } > } > >+# Checking if there is a Fast Cataloging Framework >+my $fa = getframeworkinfo('FA'); >+$template->param( fast_cataloging => 1 ) if (defined $fa); >+ > # actually print the page! > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl >index 36fd9a5..04c9aa4 100755 >--- a/circ/selectbranchprinter.pl >+++ b/circ/selectbranchprinter.pl >@@ -138,4 +138,8 @@ $template->param( > recycle_loop=> \@recycle_loop, > ); > >+# Checking if there is a Fast Cataloging Framework >+my $fa = getframeworkinfo('FA'); >+$template->param( fast_cataloging => 1 ) if (defined $fa); >+ > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl >index 4be2bcb..1719ba7 100755 >--- a/circ/transferstoreceive.pl >+++ b/circ/transferstoreceive.pl >@@ -124,5 +124,9 @@ $template->param( > latetransfers => $latetransfers ? 1 : 0, > ); > >+# Checking if there is a Fast Cataloging Framework >+my $fa = getframeworkinfo('FA'); >+$template->param( fast_cataloging => 1 ) if (defined $fa); >+ > output_html_with_http_headers $input, $cookie, $template->output; > >diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl >index d21d3e7..d0bab39 100755 >--- a/circ/view_holdsqueue.pl >+++ b/circ/view_holdsqueue.pl >@@ -76,5 +76,9 @@ $template->param( > itemtypeloop => \@itemtypesloop, > ); > >+# Checking if there is a Fast Cataloging Framework >+my $fa = getframeworkinfo('FA'); >+$template->param( fast_cataloging => 1 ) if (defined $fa); >+ > # writing the template > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl >index 0050ce3..d438db7 100755 >--- a/circ/waitingreserves.pl >+++ b/circ/waitingreserves.pl >@@ -164,6 +164,10 @@ $template->param( > ReservesMaxPickUpDelay => $max_pickup_delay, > ); > >+# Checking if there is a Fast Cataloging Framework >+my $fa = getframeworkinfo('FA'); >+$template->param( fast_cataloging => 1 ) if (defined $fa); >+ > if ($item && $tab eq 'holdsover') { > print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover"); > } elsif ($cancelall) { >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..7bcd94c >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc >@@ -0,0 +1,54 @@ >+<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>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 0056dfc..a836bb5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -962,12 +962,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 0c4180c..6628099 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -140,11 +140,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') %] >@@ -461,66 +461,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' ) %] >@@ -542,7 +540,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> >@@ -655,9 +653,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 2500456..e1f7fcb 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> > >@@ -132,6 +134,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 a126288..e4c7041 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 >@@ -77,9 +77,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> >@@ -127,7 +129,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
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 16530
:
51555
|
51777
|
53008
|
53072
|
57869
|
57901
|
59807
|
59808