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)
committerJoy Nelson <joy@bywatersolutions.com>
Mon, 11 May 2020 20:24:42 +0000 (20:24 +0000)
commitf5c7e3fd76f3d08b7b7ed2090f4d822bd3f2e3de
tree4bbcd2fef6a50bb9edff1951131b9f72b8232b89
parent7202498771468b9263474e1255039e3845da64c0
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>
koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc