[koha-commits] main Koha release repository branch master updated. v16.11.00-556-g7963796

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  796379697849d6ca0364a736aa72dfecf28134e6 (commit)
       via  1edb8cbeee2f89c7fb4cd1f643b23cb20d91d35d (commit)
      from  84e48d03238ce2446e7ea24401bda0a8f4e4422d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 796379697849d6ca0364a736aa72dfecf28134e6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Feb 1 17:54:43 2017 +0100

    Bug 16530: Add a new method to the Branches TT Plugin to avoid c/p
    
    We should do the same for the other check (FA exists), but cannot find a
    good and quick way to implement.
    
    Doing it this way will avoid regression later, we will no have to check
    if the variable is correctly passed to the template.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 1edb8cbeee2f89c7fb4cd1f643b23cb20d91d35d
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue May 17 04:35:46 2016 +0000

    Bug 16530: Adding a circ sidebar navigation menu and circSidebar syspref to activate/deactivate
    
    Edit: Fast cataloging link should now show on all pages, removed offline circulation links
    Edit 2: Creates the syspref to activate or deactivate the sidebar
    Edit 3: Fixing merge conflicts, using Koha::BiblioFrameworks to find FA
    framework and adding sidebar to on-site checkouts
    
    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
    circ/branchtransfers.tt
    circ/on-site_checkouts.tt
    
    To test:
    1) Confirm syspref CircSidebar is activated
    2) Go to all of the above pages and confirm the sidebar menu shows up
    3) Confirm fast cataloguing link and transfer link are there
    4) 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
    5) 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)
    6) Deactivate circSidebar
    7) Confirm pages all look normal
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Jan Kissig <jkissig at th-wildau.de>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 Koha/Template/Plugin/Branches.pm                   |    5 ++
 circ/branchoverdues.pl                             |    6 +-
 circ/branchtransfers.pl                            |    8 ++-
 circ/circulation-home.pl                           |    2 -
 circ/on-site_checkouts.pl                          |    8 ++-
 circ/renew.pl                                      |    7 +-
 circ/returns.pl                                    |    6 +-
 circ/selectbranchprinter.pl                        |    7 +-
 circ/transferstoreceive.pl                         |    8 ++-
 circ/view_holdsqueue.pl                            |    6 +-
 circ/waitingreserves.pl                            |    8 ++-
 .../bug_16530-add_CircSidebar_syspref.sql          |    1 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 .../intranet-tmpl/prog/en/includes/circ-nav.inc    |   55 ++++++++++++++++
 .../en/modules/admin/preferences/circulation.pref  |    6 ++
 .../prog/en/modules/circ/branchoverdues.tt         |   10 ++-
 .../prog/en/modules/circ/branchtransfers.tt        |   13 +++-
 .../prog/en/modules/circ/circulation-home.tt       |    3 +-
 .../prog/en/modules/circ/circulation.tt            |   20 ++++--
 .../prog/en/modules/circ/on-site_checkouts.tt      |    3 +-
 .../intranet-tmpl/prog/en/modules/circ/renew.tt    |   14 ++--
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   68 ++++++++++++++++----
 .../prog/en/modules/circ/selectbranchprinter.tt    |   10 ++-
 .../prog/en/modules/circ/transferstoreceive.tt     |   10 ++-
 .../prog/en/modules/circ/view_holdsqueue.tt        |   10 ++-
 .../prog/en/modules/circ/waitingreserves.tt        |   10 ++-
 26 files changed, 257 insertions(+), 48 deletions(-)
 create mode 100644 installer/data/mysql/atomicupdate/bug_16530-add_CircSidebar_syspref.sql
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc


hooks/post-receive
-- 
main Koha release repository