]> git.koha-community.org Git - koha.git/commit
Bug 25133: (follow-up) Move changes to timepicker.inc
authorNick Clemens <nick@bywatersolutions.com>
Mon, 4 May 2020 11:33:11 +0000 (11:33 +0000)
committerLucas Gass <lucas@bywatersolutions.com>
Fri, 15 May 2020 19:51:00 +0000 (19:51 +0000)
commit8d1412aff4fb880018c3081cc00d9707df2cc635
tree88010f836cf7b8d9eb586861cc709cff8ad4f4ba
parent26e550332e2af0e41656a6ec2634d21aaf1db3d8
Bug 25133: (follow-up) Move changes to timepicker.inc

Witht the changes in calendar.inc there can be a js error where the timepicker is not
included. Moving the changes to timepicker.inc should resolve this

Note: in previous patches the amnames/pmnames were removed. It is possible they had
no effect because they were declared in two files, so I have left them in timepicker.inc

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Joy Nelson <joy@bywatersolutions.com>
(cherry picked from commit f5c7e3fd76f3d08b7b7ed2090f4d822bd3f2e3de)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc