From 287d022bf2ef74d85c57b438b565e183fe52858f Mon Sep 17 00:00:00 2001 From: Aleisha 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 --- .../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 @@ + + + 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 @@ -
+
+
@@ -163,4 +164,8 @@
+
+ [% INCLUDE 'circ-nav.inc' %] +
+
[% 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 [% message %] [% END %]
[% END %] - +[% UNLESS ( borrowers ) %] + [% IF not( borrowernumber and borrower ) %] +
+ [% INCLUDE 'circ-nav.inc' %] +
+ [% END %] +[% END %] -[% UNLESS ( borrowers ) %][% IF borrowernumber and borrower %]
-[% INCLUDE 'circ-menu.inc' %] -
[% END %][% END %] +[% UNLESS ( borrowers ) %] + [% IF borrowernumber and borrower %] +
+ [% INCLUDE 'circ-menu.inc' %] +
+ [% END %] +[% END %]