[koha-commits] main Koha release repository branch master updated. v17.11.00-609-gfad518e
Git repo owner
gitmaster at git.koha-community.org
Thu Feb 15 17:46:45 CET 2018
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 fad518ed7de058937177c59fbc24f0fbcf30fe67 (commit)
via 32efe993617f578773f62b7e9c82195bf34653ec (commit)
via 027daeff56eea3baf48cc09f75e5dff100ddaa30 (commit)
via ae56b6bcc162e5ca15f9c5c63f09f00feb770122 (commit)
via 2f22633033107b3ebcd9f7c77df638d98006e1db (commit)
via 3e2936a37e08e6c669a969984361f7d761efd074 (commit)
via b5ee90225a5581ff77f2e055066b27eda91a5505 (commit)
via 908cf7f4ba94b4b97a2439a628d3af088d660c8b (commit)
via 9293e428b4e8809dcae1d1011a578550c860db7e (commit)
via 609f2f1fc70742eeec2c491cfcb1806ef65ba4c3 (commit)
via 6b2da53bc1dac0ef7f5db62e77e41ed16fc58be8 (commit)
via de454ff55282f31f1d273f0be1481224613ecd2d (commit)
via 4fc473e04db151d346429caa144b6051094ffeaf (commit)
via a06d3d428f7a769fedb57bcac0d04f54cdafdc5c (commit)
via 047ca33a937962c60278bb85398d83f26aaf3db6 (commit)
from ebccf7424efdc9378077d3d1b1f0ec6c9f9b80a1 (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 fad518ed7de058937177c59fbc24f0fbcf30fe67
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 18 19:41:45 2018 +0000
Bug 20038: Switch single-column templates to Bootstrap grid: Acquisitions
This patch updates several acquisitions module templates to use the
Bootstrap grid.
- acqui/z3950_search.tt - Acquisitions -> Vendor -> View basket -> Add
to basket -> From an external source. The Z39.50 search form should
look correct.
- Search for a title. The search results page should look correct.
- acqui/addorder.tt - Acquisitions -> Vendor -> View basket -> Add to
basket. Add an order to the basket which costs more than is available
in the fund you select. The error/confirmation screen should look
correct.
- acqui\modordernotes.tt - Acquisitions -> Vendor -> View basket -> Add
internal or vendor note. The note add form should look correct.
- acqui/cancelorder.tt - Acquisitions -> Vendor -> View basket -> Cancel
order (from an open basket which has existing orders). The
confirmation screen should look correct.
- acqui\basketheader.tt - Acquisitions -> Vendor -> New basket. The new
basket edit form should look correct.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 32efe993617f578773f62b7e9c82195bf34653ec
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 18 18:00:20 2018 +0000
Bug 20036: Switch single-column templates to Bootstrap grid: Offline circulation
This patch updates three single-column offline circulation templates to
use the Bootstrap grid.
- offline_circ\process_koc.tt - Circulation -> Upload offline
circulation.
- offline_circ\enqueue_koc.tt - After uploading offline circulation
file -> Add to offline circulation queue. The confirmation page is the
page to be tested.
- offline_circ\list.tt - From the confirmation page -> View pending
offline circulation actions.
Each of these pages should look correct, with a single centered column
with wide margins on either side. At lower browser widths the margins
should disappear.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 027daeff56eea3baf48cc09f75e5dff100ddaa30
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 18 17:33:00 2018 +0000
Bug 20035: Switch single-column templates to Bootstrap grid: Patron clubs
This patch updates two single-column Patron clubs templates to
use the Bootstrap grid.
- clubs/clubs-add-modify.tt - Tools -> Patron clubs -> New club.
- clubs/templates-add-modify.tt - Tools -> Patron clubs -> New club
template. Also changed in this file: Markup corrections. Label "for"
attribute should match the form field's id attribute.
Each of these pages should look correct, with a single centered column
with wide margins on either side. At lower browser widths the margins
should disappear.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ae56b6bcc162e5ca15f9c5c63f09f00feb770122
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 18 16:45:05 2018 +0000
Bug 20034: Switch single-column templates to Bootstrap grid: Circulation
This patch updates two single-column circulation templates to
use the Bootstrap grid.
- circulation-home.tt - Circulation home page. This patch corrects what
appears to have been a long-broken three-column layout.
- article-requests.tt - Article requests list. Turn on the
ArticleRequests system preference if necessary. Go to Circulation ->
Article requests.
Each of these pages should look correct, with a single centered column
with wide margins on either side. At lower browser widths the margins
should disappear.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2f22633033107b3ebcd9f7c77df638d98006e1db
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 18 16:08:26 2018 +0000
Bug 20033: Switch single-column templates to Bootstrap grid: Catalog
This patch updates a few catalog-related single-column templates to use
the Bootstrap grid.
- basket/basket.tt - The staff client cart. Add some items to the cart
and open the cart.
- catalogue/advsearch.tt - The advanced search page.
- catalogue/itemsearch.tt - The item search page, both the initial form
and the search results.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3e2936a37e08e6c669a969984361f7d761efd074
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 18 15:32:56 2018 +0000
Bug 20032: Switch single-column templates to Bootstrap grid: Tools
This patch updates several single-column Tools templates to
use the Bootstrap grid.
- batchMod-del.tt - Tools -> Batch item deletion -> Submit barcodes or
item numbers for deletion. The grid is changed for the results and
confirmation screens.
- batchMod-edit.tt - Tools -> Batch item modification -> Submit barcodes
or item numbers for modification. The grid is changed for the results
and confirmation screens.
- koha-news.tt - Tools -> News -> Edit or create a new news item. The
grid is changed for the edit screen.
- letter.tt - Tools -> Notices and Slips -> Edit or create a notice. The
grid is changed for the edit screen.
Each of these pages should look correct. The News and Notices page
should have a single centered column with wide margins on either side.
At lower browser widths the margins should disappear.
The batch mod screens should be displayed at full screen width.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b5ee90225a5581ff77f2e055066b27eda91a5505
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jan 16 16:00:23 2018 +0000
Bug 19982: Switch single-column templates to Bootstrap grid: Patrons
This patch updates two single-column patron module templates to use
the Bootstrap grid:
- discharges.tt - The list of pending discharges. One or more
discharges must have been made via the OPAC. From the staff client
home page, look for "Discharge requests pending."
- members-update.tt - The list of pending patron updates. One or more
updates must have been submitted via the OPAC. From the staff client
home page, look for "Patrons requesting modifications."
Each of these pages should look correct, with a single centered column
with wide margins on either side. At lower browser widths the margins
should disappear.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 908cf7f4ba94b4b97a2439a628d3af088d660c8b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 11 18:53:33 2018 +0000
Bug 19960: Update popup window templates to use Bootstrap grid: Add to list
This patch updates add-to-list template to use the Bootstrap grid
instead of the YUI grid.
To test, open the detail page for a bibliographic record in the staff
client and choose "Add to -> List." The resulting pop-up window should
look correct.
Signed-off-by: Zoe Bennett <zoebennett1308 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 9293e428b4e8809dcae1d1011a578550c860db7e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Jan 10 19:21:46 2018 +0000
Bug 19950: Update popup window templates to use Bootstrap grid: Serials
This patch updates the two serials templates to use the Bootstrap grid
instead of the YUI grid.
Apply the patch and go to Serials and locate an existing
subscription.
- Click the "Edit routing list" in the sidebar.
- Save the routing list, and click "Save and preview routing slip."
- The routing slip preview should look correct and buttons should work
correctly.
- When viewing the details of a subscription, click the "Renew" button
in the toolbar. The popup window should look correct.
Signed-off-by: Zoe Bennett <zoebennett1308 at gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 609f2f1fc70742eeec2c491cfcb1806ef65ba4c3
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 5 18:30:08 2017 +0000
Bug 19755: Move template JavaScript to the footer: Acquisitions, part 3
This patch modifies even more staff client acquisitions templates so
that JavaScript is included in the footer instead of the header.
To test, apply the patch and test the JavaScript-driven features of the
modified templates: All button controls, DataTables functionality, tabs,
etc.
- Acquisitions -> Vendor -> Vendor details
- Contracts datatable
- Edit vendor
- Add contacts, form validation
- Acquisitions -> Vendor -> Invoices -> Invoice -> "Go to receipt"
- Datatables, MARC and Card previews
- Transfer
- Confirmation of transfer, window closes
- Acquisitions -> Vendor -> Receive shipments
- Datatables, date pickers
- Acquisitions -> Available funds table -> Spent report
- Datatables
- Acquisitions -> Vendor -> Uncertain prices
- Datatables, form validation
- Acquisitions -> Vendor -> Basket -> Add to basket from external source
- Select and clear all on search form
- Search results
- Datatables, MARC and Card previews, in-table pop-up controls
(click any table cell)
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 6b2da53bc1dac0ef7f5db62e77e41ed16fc58be8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 22 19:33:48 2017 +0000
Bug 19682: Move JS to the footer: Two patron-related tools
This patch modifies two patron-related tools templates in the staff
client so that JavaScript is included in the footer instead of the
header.
To test, apply the patch and test the JavaScript-driven features of
each modified template: All button controls, DataTables functionality,
form validation, etc.
- Import patrons
- Upload patron images
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Edit for QA: Fixed datepickers on import patron form
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit de454ff55282f31f1d273f0be1481224613ecd2d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jan 26 13:12:16 2018 +0000
Bug 19641: (follow-up) Fix update child menu option
This follow-up corrects handling of clicks on the "Update child" menu
option when the patron is an adult. Previously the click handler was
conditionally added via template markup. This patch modifies it to use
the data-tooltip attribute as an indicator that the option is disabled.
To test, apply the patch and clear your browser cache if necessary.
- Open an adult patron's record for viewing.
- Choose More -> Update child from the toolbar menu.
- The menu item should be disabled, and should show a tooltip.
- Clicking the menu item should do nothing.
- Open a child patron's record for viewing.
- Choose More -> Update child from the toolbar menu.
- The patron should be updated to an adult category.
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 4fc473e04db151d346429caa144b6051094ffeaf
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 11 17:37:49 2018 +0000
Bug 19641: (follow-up) Correct popup templates
This patch corrects the footer include for two patron-related popup
windows. popup-bottom.inc should be considered obsolete, and
"'intranet-bottom.inc' popup_window=1" used in its place.
To test you must have more than one adult-type patron category defined.
- Locate and view a child-type patron record.
- From the "More" menu in the toolbar, choose "Update child to adult
patron."
- The popup window which appears should look correct and work
correctly.
- Add a new patron and enter the first and last names of an existing
patron.
- When Koha asks to confirm a possible duplicate record, click the
"View existing record" link. The popup which is triggered should
look correct.
Signed-off-by: Zoe Bennett <zoebennett1308 at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit a06d3d428f7a769fedb57bcac0d04f54cdafdc5c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jan 11 16:15:01 2018 +0000
Bug 19641: (follow-up) Update circulation.tt too
This patch makes the same JS-to-footer changes to circulation.tt.
Inclusion of this template in this bug is necessary because it includes
members-toolbar.inc.
To test, apply the patch and clear your browser cache if necessary.
- Enter a patron card for checkout
- Test any JavaScript-driven actions on the checkout page, for instance:
- Select all/clear all controls
- Datepicker/timepickers
- Datatable sorting, columns configuration
- Renewals, check-ins
- Patron message interactions, print slip, and other toolbar actions
- Checkout exports
- Search to hold
- Tab loading: Restrictions, Holds, Clubs
Signed-off-by: Zoe Bennett <zoebennett1308 at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 047ca33a937962c60278bb85398d83f26aaf3db6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Nov 16 16:08:07 2017 +0000
Bug 19641: Move patron templates to the footer
This patch modifies the staff client patron module templates so that
JavaScript is included in the footer instead of the header.
This patch touches a lot of files because the changes are all
interdependent, affecting a couple of module-wide include files.
To test, apply the patch and test the JavaScript-driven features of the
modified templates: All button controls, DataTables functionality, tabs,
etc.
Patrons -> Patrons home, patron search results
-> Manage pending modification requests
-> Patron detail page
-> Edit patron
-> Set guarantor
-> Fines
-> Account, Pay fines, Create manual invoice, Create manual
credit
-> Print receipts for different kinds of charges
-> Routing lists
-> Circulation history
-> Holds history
-> Notices
-> Statistics
-> Files
-> Purchase suggestions
-> Discharges
-> Housebound
-> Set permissions
-> Change password
-> Print summary, slips, and overdues
-> Update child to adult patron type
Patron toolbar and patron search bar operations should work correctly on
all pages.
This patch also updates the template for searching the Norwegian
national patron database, but it has NOT been tested.
Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
Signed-off-by: Zoe Bennett <zoebennett1308 at gmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
.../prog/en/includes/borrower_debarments.inc | 28 -
.../prog/en/includes/members-toolbar.inc | 128 ----
.../prog/en/includes/messaging-preference-form.inc | 25 +-
.../prog/en/includes/patron-search.inc | 44 +-
.../prog/en/modules/acqui/addorder.tt | 10 +-
.../prog/en/modules/acqui/basketheader.tt | 7 +-
.../prog/en/modules/acqui/cancelorder.tt | 9 +-
.../prog/en/modules/acqui/modordernotes.tt | 7 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 267 +++++----
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 61 +-
.../intranet-tmpl/prog/en/modules/acqui/spent.tt | 33 +-
.../prog/en/modules/acqui/supplier.tt | 154 ++---
.../prog/en/modules/acqui/transferorder.tt | 47 +-
.../prog/en/modules/acqui/uncertainprice.tt | 45 +-
.../prog/en/modules/acqui/z3950_search.tt | 100 ++--
.../prog/en/modules/admin/categories.tt | 1 +
.../intranet-tmpl/prog/en/modules/basket/basket.tt | 9 +-
.../prog/en/modules/catalogue/advsearch.tt | 12 +-
.../prog/en/modules/catalogue/itemsearch.tt | 11 +-
.../prog/en/modules/circ/article-requests.tt | 11 +-
.../prog/en/modules/circ/circulation-home.tt | 30 +-
.../prog/en/modules/circ/circulation.tt | 269 +++++----
.../prog/en/modules/clubs/clubs-add-modify.tt | 7 +-
.../prog/en/modules/clubs/templates-add-modify.tt | 24 +-
.../prog/en/modules/common/patron_search.tt | 331 +++++------
.../prog/en/modules/members/boraccount.tt | 73 +--
.../prog/en/modules/members/deletemem.tt | 6 +
.../prog/en/modules/members/discharge.tt | 6 +
.../prog/en/modules/members/discharges.tt | 16 +-
.../intranet-tmpl/prog/en/modules/members/files.tt | 33 +-
.../prog/en/modules/members/holdshistory.tt | 42 +-
.../prog/en/modules/members/housebound.tt | 25 +-
.../prog/en/modules/members/mancredit.tt | 21 +-
.../prog/en/modules/members/maninvoice.tt | 37 +-
.../prog/en/modules/members/member-flags.tt | 212 +++----
.../prog/en/modules/members/member-password.tt | 129 ++--
.../prog/en/modules/members/member.tt | 623 ++++++++++----------
.../prog/en/modules/members/memberentrygen.tt | 352 +++++------
.../prog/en/modules/members/members-update.tt | 24 +-
.../prog/en/modules/members/moremember-brief.tt | 4 +-
.../prog/en/modules/members/moremember-print.tt | 7 +-
.../prog/en/modules/members/moremember-receipt.tt | 9 +-
.../prog/en/modules/members/moremember.tt | 251 ++++----
.../prog/en/modules/members/nl-search.tt | 6 +
.../prog/en/modules/members/notices.tt | 44 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 82 +--
.../prog/en/modules/members/paycollect.tt | 124 ++--
.../prog/en/modules/members/printfeercpt.tt | 10 +-
.../prog/en/modules/members/printinvoice.tt | 8 +-
.../en/modules/members/purchase-suggestions.tt | 28 +-
.../prog/en/modules/members/readingrec.tt | 60 +-
.../prog/en/modules/members/routing-lists.tt | 7 +
.../prog/en/modules/members/statistics.tt | 25 +-
.../prog/en/modules/members/update-child.tt | 87 ++-
.../prog/en/modules/offline_circ/enqueue_koc.tt | 8 +-
.../prog/en/modules/offline_circ/list.tt | 7 +-
.../prog/en/modules/offline_circ/process_koc.tt | 7 +-
.../en/modules/serials/routing-preview-slip.tt | 15 +-
.../prog/en/modules/serials/subscription-renew.tt | 8 +-
.../prog/en/modules/tools/batchMod-del.tt | 6 +-
.../prog/en/modules/tools/batchMod-edit.tt | 10 +-
.../prog/en/modules/tools/import_borrowers.tt | 25 +-
.../prog/en/modules/tools/koha-news.tt | 14 +-
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 16 +-
.../prog/en/modules/tools/picture-upload.tt | 50 +-
.../en/modules/virtualshelves/addbybiblionumber.tt | 9 +-
koha-tmpl/intranet-tmpl/prog/js/members-menu.js | 158 +++++
.../prog/js/messaging-preference-form.js | 20 +
.../intranet-tmpl/prog/js/pages/circulation.js | 24 +
69 files changed, 2295 insertions(+), 2103 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/members-menu.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/messaging-preference-form.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list