[koha-commits] main Koha release repository branch master updated. v19.05.00-554-g46a9a7c
Git repo owner
gitmaster at git.koha-community.org
Thu Aug 22 16:47:08 CEST 2019
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 46a9a7c8ef4a20ae8e01f199ba051fbc2c9597c0 (commit)
via 247dca306407ac9568344a0a37aca3bbcffc2468 (commit)
from 12f583dd2c580cad046605531c79c1a90bf91436 (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 46a9a7c8ef4a20ae8e01f199ba051fbc2c9597c0
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Aug 22 15:24:30 2019 +0100
Bug 23013: Compiled CSS
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 247dca306407ac9568344a0a37aca3bbcffc2468
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Jun 6 16:48:08 2019 +0000
Bug 23013: Upgrade DataTables in the staff client
This patch upgrades DataTables and makes some style changes to the
default DataTables toolbar style. DataTables assets are now combined and
minified using their download customizer, bundling together these
elements:
- JSZip 2.5.0
- pdfmake 0.1.36
- DataTables 1.10.18
- Buttons 1.5.6
- Column visibility 1.5.6
- HTML5 export 1.5.6
- Print view 1.5.6
- FixedHeader 3.1.4
DataTables assets have been moved from lib/jquery/plugins to
lib/datatables. The global header and footer include files are updated
correspondingly.
This patch removes the custom "four_button" pagination configuration and
updates pages which used it to use the built-in "full" type instead.
This is done for the sake of consistency and upgradability. This change
touches a lot of files.
Table-specific CSS has been moved from staff-global.scss to a new
include, _tables.scss. A second common include, _mixins.scss has some
variable definitions used in both files.
Many images have been made obsolete by this change and have been
removed.
To test, apply the patch and regenerate the staff client CSS. View
various pages in the staff client with tables:
- Not formatted by DataTables:
- Reports -> Most circulated items
- Catalog -> Search results
- Formatted by DataTables without column configuration
- Acquisitions -> Vendor search
- Lists
- Formatted by DataTables with column configuration
- Administration -> Libraries
- Administration -> Item types
- Reports -> Saved SQL reports
- Non-standard DataTables configurations:
- Circulation -> Checkouts
- Administration -> System preferences
- Reports -> Lost items
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
.../intranet-tmpl/lib/datatables/datatables.css | 852 +
.../intranet-tmpl/lib/datatables/datatables.js |79490 ++++++++++++++++++++
.../lib/datatables/datatables.min.css | 19 +
.../intranet-tmpl/lib/datatables/datatables.min.js | 332 +
.../lib/jquery/plugins/buttons.colVis.min.js | 6 -
.../lib/jquery/plugins/buttons.html5.min.js | 26 -
.../lib/jquery/plugins/buttons.print.min.js | 4 -
.../lib/jquery/plugins/dataTables.buttons.min.js | 37 -
.../lib/jquery/plugins/jquery.dataTables.min.js | 164 -
.../prog/css/buttons.dataTables.min.css | 1 -
koha-tmpl/intranet-tmpl/prog/css/datatables.css | 427 -
.../intranet-tmpl/prog/css/itemsearchform.css | 8 -
koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss | 32 +
koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss | 755 +
.../intranet-tmpl/prog/css/src/staff-global.scss | 295 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
.../intranet-tmpl/prog/en/includes/datatables.inc | 8 +-
.../prog/en/includes/doc-head-close.inc | 3 +-
.../en/includes/mana/mana-report-search-result.inc | 1 -
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 +-
.../prog/en/modules/acqui/basketgroup.tt | 2 +-
.../prog/en/modules/acqui/edifactmsgs.tt | 2 +-
.../prog/en/modules/acqui/histsearch.tt | 2 +-
.../prog/en/modules/acqui/lateorders.tt | 2 +-
.../prog/en/modules/acqui/newordersubscription.tt | 2 +-
.../prog/en/modules/acqui/newordersuggestion.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +-
.../intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +-
.../prog/en/modules/acqui/uncertainprice.tt | 2 +-
.../prog/en/modules/admin/additional-fields.tt | 2 +-
.../prog/en/modules/admin/aqbudgetperiods.tt | 2 +-
.../prog/en/modules/admin/auth_tag_structure.tt | 2 +-
.../prog/en/modules/admin/authorised_values.tt | 2 +-
.../prog/en/modules/admin/authtypes.tt | 2 +-
.../prog/en/modules/admin/branches.tt | 2 +-
.../prog/en/modules/admin/itemtypes.tt | 2 +-
.../prog/en/modules/admin/marctagstructure.tt | 2 +-
.../prog/en/modules/admin/overdrive.tt | 2 +-
.../prog/en/modules/admin/printers.tt | 2 +-
.../prog/en/modules/admin/z3950servers.tt | 2 +-
.../prog/en/modules/cataloguing/additem.tt | 1 -
.../prog/en/modules/circ/checkout-notes.tt | 2 +-
.../prog/en/modules/circ/on-site_checkouts.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 +-
.../prog/en/modules/circ/reserveratios.tt | 2 +-
.../prog/en/modules/circ/waitingreserves.tt | 2 +-
.../prog/en/modules/clubs/club-enrollments.tt | 2 +-
.../intranet-tmpl/prog/en/modules/clubs/clubs.tt | 4 +-
.../en/modules/course_reserves/course-details.tt | 2 +-
.../en/modules/course_reserves/course-reserves.tt | 2 +-
.../prog/en/modules/labels/label-edit-batch.tt | 2 +-
.../prog/en/modules/labels/label-manage.tt | 2 +-
.../prog/en/modules/members/boraccount.tt | 2 +-
.../prog/en/modules/members/holdshistory.tt | 2 +-
.../prog/en/modules/members/notices.tt | 2 +-
.../prog/en/modules/members/readingrec.tt | 2 +-
.../prog/en/modules/patron_lists/list.tt | 2 +-
.../prog/en/modules/patron_lists/lists.tt | 2 +-
.../prog/en/modules/patroncards/edit-batch.tt | 2 +-
.../en/modules/reports/guided_reports_start.tt | 4 +-
.../prog/en/modules/serials/serials-search.tt | 6 +-
.../prog/en/modules/serials/subscription-add.tt | 1 -
.../modules/serials/subscription-numberpatterns.tt | 2 +-
.../prog/en/modules/suggestion/suggestion.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tags/list.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tools/upload.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/img/asc.gif | Bin 250 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/ascdesc.gif | Bin 264 -> 0 bytes
.../prog/img/datatables/back_disabled.jpg | Bin 612 -> 0 bytes
.../prog/img/datatables/back_enabled.jpg | Bin 807 -> 0 bytes
.../prog/img/datatables/forward_disabled.jpg | Bin 635 -> 0 bytes
.../prog/img/datatables/forward_enabled.jpg | Bin 852 -> 0 bytes
.../intranet-tmpl/prog/img/datatables/sort_asc.png | Bin 263 -> 0 bytes
.../prog/img/datatables/sort_asc_disabled.png | Bin 252 -> 0 bytes
.../prog/img/datatables/sort_both.png | Bin 282 -> 0 bytes
.../prog/img/datatables/sort_desc.png | Bin 260 -> 0 bytes
.../prog/img/datatables/sort_desc_disabled.png | Bin 251 -> 0 bytes
.../intranet-tmpl/prog/img/first-disabled.png | Bin 843 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/first.png | Bin 720 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/last-disabled.png | Bin 826 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/last.png | Bin 737 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/next-disabled.png | Bin 866 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/next.png | Bin 736 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/prev-disabled.png | Bin 862 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/prev.png | Bin 745 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/js/addorderiso2709.js | 2 +-
.../intranet-tmpl/prog/js/biblio_framework.js | 2 +-
koha-tmpl/intranet-tmpl/prog/js/categories.js | 2 +-
koha-tmpl/intranet-tmpl/prog/js/datatables.js | 108 +-
.../intranet-tmpl/prog/js/pages/stockrotation.js | 4 +-
.../intranet-tmpl/prog/js/pages/tags-review.js | 2 +-
.../intranet-tmpl/prog/js/rotating-collections.js | 2 +-
.../intranet-tmpl/prog/js/subscription-add.js | 2 +-
94 files changed, 81549 insertions(+), 1143 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/lib/datatables/datatables.css
create mode 100644 koha-tmpl/intranet-tmpl/lib/datatables/datatables.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/datatables/datatables.min.css
create mode 100644 koha-tmpl/intranet-tmpl/lib/datatables/datatables.min.js
delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/buttons.colVis.min.js
delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/buttons.html5.min.js
delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/buttons.print.min.js
delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.buttons.min.js
delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.min.js
delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/buttons.dataTables.min.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/css/datatables.css
create mode 100644 koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
create mode 100644 koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/asc.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/ascdesc.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/back_disabled.jpg
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/back_enabled.jpg
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/forward_disabled.jpg
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/forward_enabled.jpg
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc_disabled.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_both.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc_disabled.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/first-disabled.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/first.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/last-disabled.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/last.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/next-disabled.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/next.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/prev-disabled.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/prev.png
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list