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)
committerMartin Renvoize <martin.renvoize@ptfs-europe.com>
Mon, 4 May 2020 12:45:31 +0000 (13:45 +0100)
commita6985d167e11eaafee985b51cb0188a693405af5
tree3acdfdc167ae79dcf880a61189033bed7974b68f
parent164b8127e719628aa9013dd2b30fb6511fbc4bf9
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>
koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc
koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc