From e718df3c1b3fafc2971412357d0593a71d51684e Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 28 Oct 2014 11:54:48 -0400 Subject: [PATCH] update jquery calls --- Toolkit/Schedule/EditSchedule.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Toolkit/Schedule/EditSchedule.php b/Toolkit/Schedule/EditSchedule.php index 96d7454..9a0d63c 100644 --- a/Toolkit/Schedule/EditSchedule.php +++ b/Toolkit/Schedule/EditSchedule.php @@ -476,11 +476,9 @@ class Toolkit_Schedule_EditSchedule $GLOBALS['bottomScripts'][] = MEDIA_BASE_URL . 'libjs/foundation.min.js'; $GLOBALS['styleSheets'][] - = GLM_APP_BASE_URL . - 'libjs/jqueryui/1.8.13/development-bundle/themes/cupertino/jquery.ui.all.css'; + = '//code.jquery.com/ui/1.11.2/themes/smoothness/jquery-ui.css'; $GLOBALS['bottomScripts'][] - = GLM_APP_BASE_URL . - 'libjs/jqueryui/1.8.13/js/jquery-ui-1.8.13.custom.min.js'; + = '//code.jquery.com/ui/1.11.2/jquery-ui.js'; // css and js for "Really Simple Color Picker" $GLOBALS['styleSheets'][] = BASE_URL . 'css/colorPicker.css'; @@ -495,12 +493,14 @@ class Toolkit_Schedule_EditSchedule 'id', FILTER_SANITIZE_NUMBER_INT ); + $saved = filter_var($_REQUEST['saved'], FILTER_VALIDATE_BOOLEAN); $tpl = new HTML_Template_Flexy($registry->flexyOptions); $tpl->compile('editSchedule.html'); - $page = new stdClass(); - $page->appBase = GLM_APP_BASE_URL; - $page->baseUrl = BASE_URL; + $page = new stdClass(); + $page->appBase = GLM_APP_BASE_URL; + $page->baseUrl = BASE_URL; $page->scheduleId = $scheduleId; + $page->saved = $saved; if ($scheduleId) { $page->departures = $this->getDepartures($registry, $scheduleId); } @@ -519,17 +519,18 @@ class Toolkit_Schedule_EditSchedule $page->name = $scheduleData['name']; $page->year = $scheduleData['schedule_year']; $page->backUrl = BASE_URL . 'admin/schedules.php'; + $page->formUrl = BASE_URL . 'schedules/Edit/updateSchedule/'; $page->monthsHeight = (int)$registry->config->months->height; $page->monthsWidth = (int)$registry->config->months->width; $elements = $tpl->getElements(); - $startingYear = 2011; + $startingYear = date('Y'); $endingYear = $startingYear + 5; $years = array(); for ($i = $startingYear; $i <= $endingYear; ++$i) { $years[$i] = $i; } - //$elements['schedule_year']->setOptions($years); - //$elements['schedule_year']->setValue($scheduleData['schedule_year']); + $elements['schedule_year']->setOptions($years); + $elements['schedule_year']->setValue($scheduleData['schedule_year']); $html .= $tpl->bufferedOutputObject($page, $elements); return $html; } -- 2.17.1