[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17422] booking and bookingfrontend: refactor javascr
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17422] booking and bookingfrontend: refactor javascript-location to reflect template-sets |
|
Date: |
Sun, 10 Dec 2017 07:05:50 -0500 (EST) |
Revision: 17422
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17422
Author: sigurdne
Date: 2017-12-10 07:05:50 -0500 (Sun, 10 Dec 2017)
Log Message:
-----------
booking and bookingfrontend: refactor javascript-location to reflect
template-sets
Modified Paths:
--------------
trunk/booking/inc/class.uiaccount_code_set.inc.php
trunk/booking/inc/class.uiallocation.inc.php
trunk/booking/inc/class.uiapplication.inc.php
trunk/booking/inc/class.uibooking.inc.php
trunk/booking/inc/class.uibuilding.inc.php
trunk/booking/inc/class.uicommon.inc.php
trunk/booking/inc/class.uicompleted_reservation.inc.php
trunk/booking/inc/class.uicompleted_reservation_export.inc.php
trunk/booking/inc/class.uidocument.inc.php
trunk/booking/inc/class.uidocument_view.inc.php
trunk/booking/inc/class.uidocumentation.inc.php
trunk/booking/inc/class.uievent.inc.php
trunk/booking/inc/class.uimassbooking.inc.php
trunk/booking/inc/class.uipermission.inc.php
trunk/booking/inc/class.uipermission_root.inc.php
trunk/booking/inc/class.uireports.inc.php
trunk/booking/inc/class.uiresource.inc.php
trunk/booking/inc/class.uiseason.inc.php
trunk/booking/inc/class.uisend_email.inc.php
trunk/booking/inc/class.uisystem_message.inc.php
trunk/bookingfrontend/inc/class.uiallocation.inc.php
trunk/bookingfrontend/inc/class.uibooking.inc.php
trunk/bookingfrontend/inc/class.uibuilding.inc.php
trunk/bookingfrontend/inc/class.uievent.inc.php
trunk/bookingfrontend/inc/class.uiresource.inc.php
trunk/bookingfrontend/inc/class.uisearch.inc.php
Added Paths:
-----------
trunk/booking/js/base/
trunk/bookingfrontend/js/base/
Removed Paths:
-------------
trunk/booking/js/booking/
trunk/bookingfrontend/js/bookingfrontend/
Modified: trunk/booking/inc/class.uiaccount_code_set.inc.php
===================================================================
--- trunk/booking/inc/class.uiaccount_code_set.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uiaccount_code_set.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -66,8 +66,8 @@
$config = CreateObject('phpgwapi.config', 'booking');
$config->read();
- self::add_javascript('booking', 'booking',
'account_code_set.js');
-// self::add_javascript('booking', 'booking',
'datatable.js');
+ self::add_javascript('booking', 'base',
'account_code_set.js');
+// self::add_javascript('booking', 'base', 'datatable.js');
$data = array(
'form' => array(
'toolbar' => array(
Modified: trunk/booking/inc/class.uiallocation.inc.php
===================================================================
--- trunk/booking/inc/class.uiallocation.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uiallocation.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -44,7 +44,7 @@
{
return $this->query();
}
- self::add_javascript('booking', 'booking',
'allocation_list.js');
+ self::add_javascript('booking', 'base',
'allocation_list.js');
phpgwapi_jquery::load_widget('menu');
phpgwapi_jquery::load_widget('autocomplete');
@@ -469,7 +469,7 @@
}
$this->flash_form_errors($errors);
- self::add_javascript('booking', 'booking',
'allocation.js');
+ self::add_javascript('booking', 'base',
'allocation.js');
$allocation['resources_json'] =
json_encode(array_map('intval', $allocation['resources']));
$allocation['cancel_link'] =
self::link(array('menuaction' => 'booking.uiallocation.index'));
array_set_default($allocation, 'cost', '0');
@@ -612,7 +612,7 @@
$allocation['to_'] =
pretty_timestamp($allocation['to_']);
$this->flash_form_errors($errors);
- self::add_javascript('booking', 'booking',
'allocation.js');
+ self::add_javascript('booking', 'base',
'allocation.js');
$allocation['resources_json'] =
json_encode(array_map('intval', $allocation['resources']));
$allocation['cancel_link'] =
self::link(array('menuaction' => 'booking.uiallocation.show',
'id' => $allocation['id']));
@@ -731,7 +731,7 @@
}
$this->flash_form_errors($errors);
- self::add_javascript('booking', 'booking',
'allocation.js');
+ self::add_javascript('booking', 'base',
'allocation.js');
$allocation['from_'] =
pretty_timestamp($allocation['from_']);
$allocation['to_'] =
pretty_timestamp($allocation['to_']);
Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uiapplication.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -805,11 +805,11 @@
$active_tab = 'generic';
$application['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- self::add_javascript('booking', 'booking',
'application.js');
+ self::add_javascript('booking', 'base',
'application.js');
}
else
{
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'application.js');
+ self::add_javascript('bookingfrontend', 'base',
'application.js');
}
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
@@ -910,12 +910,12 @@
$tabs = array();
$tabs['generic'] = array('label' =>
lang('Application Edit'), 'link' => '#application_edit');
$active_tab = 'generic';
- self::add_javascript('booking', 'booking',
'application.js');
+ self::add_javascript('booking', 'base',
'application.js');
$application['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
}
else
{
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'application.js');
+ self::add_javascript('bookingfrontend', 'base',
'application.js');
}
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
Modified: trunk/booking/inc/class.uibooking.inc.php
===================================================================
--- trunk/booking/inc/class.uibooking.inc.php 2017-12-10 12:04:04 UTC (rev
17421)
+++ trunk/booking/inc/class.uibooking.inc.php 2017-12-10 12:05:50 UTC (rev
17422)
@@ -53,7 +53,7 @@
{
return $this->query();
}
- self::add_javascript('booking', 'booking',
'allocation_list.js');
+ self::add_javascript('booking', 'base',
'allocation_list.js');
phpgwapi_jquery::load_widget('autocomplete');
$data = array(
@@ -585,7 +585,7 @@
}
$this->flash_form_errors($errors);
unset($errors['cost']);
- self::add_javascript('booking', 'booking',
'booking.js');
+ self::add_javascript('booking', 'base', 'booking.js');
if (phpgw::get_var('resource') == 'null')
{
@@ -766,7 +766,7 @@
$booking['to_'] = pretty_timestamp($booking['to_']);
$this->flash_form_errors($errors);
- self::add_javascript('booking', 'booking',
'booking.js');
+ self::add_javascript('booking', 'base', 'booking.js');
$booking['resources_json'] =
json_encode(array_map('intval', $booking['resources']));
$booking['cancel_link'] = self::link(array('menuaction'
=> 'booking.uibooking.show',
'id' => $booking['id']));
@@ -923,7 +923,7 @@
$this->flash_form_errors($errors);
phpgwapi_jquery::load_widget('autocomplete');
- self::add_javascript('booking', 'booking',
'booking.js');
+ self::add_javascript('booking', 'base', 'booking.js');
$booking['from_'] = pretty_timestamp($booking['from_']);
$booking['to_'] = pretty_timestamp($booking['to_']);
Modified: trunk/booking/inc/class.uibuilding.inc.php
===================================================================
--- trunk/booking/inc/class.uibuilding.inc.php 2017-12-10 12:04:04 UTC (rev
17421)
+++ trunk/booking/inc/class.uibuilding.inc.php 2017-12-10 12:05:50 UTC (rev
17422)
@@ -317,7 +317,7 @@
'building_id' => $building['id'],
'phpgw_return_as' => 'json',
));
- self::add_javascript('booking', 'booking',
'schedule.js');
+ self::add_javascript('booking', 'base', 'schedule.js');
phpgwapi_jquery::load_widget("datepicker");
$building['picker_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi', 'cal');
Modified: trunk/booking/inc/class.uicommon.inc.php
===================================================================
--- trunk/booking/inc/class.uicommon.inc.php 2017-12-10 12:04:04 UTC (rev
17421)
+++ trunk/booking/inc/class.uicommon.inc.php 2017-12-10 12:05:50 UTC (rev
17422)
@@ -146,7 +146,7 @@
parent::__construct();
$GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
- self::add_javascript('booking', 'booking', 'common');
+ self::add_javascript('booking', 'base', 'common');
$this->ui_session_key = $this->current_app() .
'_uicommon';
//$this->restore_flash_msgs();
Modified: trunk/booking/inc/class.uicompleted_reservation.inc.php
===================================================================
--- trunk/booking/inc/class.uicompleted_reservation.inc.php 2017-12-10
12:04:04 UTC (rev 17421)
+++ trunk/booking/inc/class.uicompleted_reservation.inc.php 2017-12-10
12:05:50 UTC (rev 17422)
@@ -127,7 +127,7 @@
$GLOBALS['phpgw']->jqcal2->add_listener('filter_to');
phpgwapi_jquery::load_widget('datepicker');
- self::add_javascript('booking', 'booking',
'completed_reservation.js');
+ self::add_javascript('booking', 'base',
'completed_reservation.js');
$data = array(
'datatable_name' => lang('booking') . ': ' .
lang('Completed'),
Modified: trunk/booking/inc/class.uicompleted_reservation_export.inc.php
===================================================================
--- trunk/booking/inc/class.uicompleted_reservation_export.inc.php
2017-12-10 12:04:04 UTC (rev 17421)
+++ trunk/booking/inc/class.uicompleted_reservation_export.inc.php
2017-12-10 12:05:50 UTC (rev 17422)
@@ -102,7 +102,7 @@
$GLOBALS['phpgw']->jqcal2->add_listener('filter_to');
phpgwapi_jquery::load_widget('datepicker');
- self::add_javascript('booking', 'booking',
'completed_reservation_export.js');
+ self::add_javascript('booking', 'base',
'completed_reservation_export.js');
$data = array(
'datatable_name' => lang('booking') . ': ' .
lang('Exported Files'),
Modified: trunk/booking/inc/class.uidocument.inc.php
===================================================================
--- trunk/booking/inc/class.uidocument.inc.php 2017-12-10 12:04:04 UTC (rev
17421)
+++ trunk/booking/inc/class.uidocument.inc.php 2017-12-10 12:05:50 UTC (rev
17422)
@@ -310,7 +310,7 @@
}
}
- self::add_javascript('booking', 'booking',
'document.js');
+ self::add_javascript('booking', 'base', 'document.js');
phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($document);
@@ -359,7 +359,7 @@
}
}
- self::add_javascript('booking', 'booking',
'document.js');
+ self::add_javascript('booking', 'base', 'document.js');
phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($document);
Modified: trunk/booking/inc/class.uidocument_view.inc.php
===================================================================
--- trunk/booking/inc/class.uidocument_view.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uidocument_view.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -64,7 +64,7 @@
return $this->query();
}
- self::add_javascript('booking', 'booking',
'datatable.js');
+ self::add_javascript('booking', 'base', 'datatable.js');
$data = array(
'form' => array(
Modified: trunk/booking/inc/class.uidocumentation.inc.php
===================================================================
--- trunk/booking/inc/class.uidocumentation.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uidocumentation.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -167,7 +167,7 @@
}
}
- self::add_javascript('booking', 'booking',
'document.js');
+ self::add_javascript('booking', 'base', 'document.js');
$this->add_default_display_data($document);
@@ -200,7 +200,7 @@
}
}
- self::add_javascript('booking', 'booking',
'document.js');
+ self::add_javascript('booking', 'base', 'document.js');
$this->flash_form_errors($errors);
$this->add_default_display_data($document);
Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php 2017-12-10 12:04:04 UTC (rev
17421)
+++ trunk/booking/inc/class.uievent.inc.php 2017-12-10 12:05:50 UTC (rev
17422)
@@ -557,7 +557,7 @@
$this->flash_form_errors($errors);
}
- self::add_javascript('booking', 'booking', 'event.js');
+ self::add_javascript('booking', 'base', 'event.js');
array_set_default($event, 'resources', array());
$event['resources_json'] =
json_encode(array_map('intval', $event['resources']));
$event['cancel_link'] = self::link(array('menuaction'
=> 'booking.uievent.index'));
@@ -995,7 +995,7 @@
phpgwapi_jquery::load_widget('datepicker');
- self::add_javascript('booking', 'booking', 'event.js');
+ self::add_javascript('booking', 'base', 'event.js');
$event['resources_json'] =
json_encode(array_map('intval', $event['resources']));
$event['application_link'] =
self::link(array('menuaction' => 'booking.uiapplication.show',
'id' => $event['application_id']));
Modified: trunk/booking/inc/class.uimassbooking.inc.php
===================================================================
--- trunk/booking/inc/class.uimassbooking.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uimassbooking.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -134,7 +134,7 @@
$building['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- self::add_javascript('booking', 'booking',
'schedule.js');
+ self::add_javascript('booking', 'base', 'schedule.js');
phpgwapi_jquery::load_widget("datepicker");
self::render_template_xsl('massbooking_schedule',
array('building' => $building,
'backend' => $backend));
Modified: trunk/booking/inc/class.uipermission.inc.php
===================================================================
--- trunk/booking/inc/class.uipermission.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uipermission.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -282,7 +282,7 @@
}
}
- self::add_javascript('booking', 'booking',
'permission.js');
+ self::add_javascript('booking', 'base',
'permission.js');
phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($permission);
@@ -331,7 +331,7 @@
}
}
- self::add_javascript('booking', 'booking',
'permission.js');
+ self::add_javascript('booking', 'base',
'permission.js');
phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($permission);
Modified: trunk/booking/inc/class.uipermission_root.inc.php
===================================================================
--- trunk/booking/inc/class.uipermission_root.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uipermission_root.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -168,7 +168,7 @@
}
}
- self::add_javascript('booking', 'booking',
'permission_root.js');
+ self::add_javascript('booking', 'base',
'permission_root.js');
phpgwapi_jquery::load_widget('autocomplete');
$this->add_default_display_data($permission);
@@ -204,7 +204,7 @@
// }
// }
//
- // self::add_javascript('booking', 'booking',
'permission_root.js');
+ // self::add_javascript('booking', 'base',
'permission_root.js');
//
// $this->add_default_display_data($permission);
//
Modified: trunk/booking/inc/class.uireports.inc.php
===================================================================
--- trunk/booking/inc/class.uireports.inc.php 2017-12-10 12:04:04 UTC (rev
17421)
+++ trunk/booking/inc/class.uireports.inc.php 2017-12-10 12:05:50 UTC (rev
17422)
@@ -122,7 +122,7 @@
phpgwapi_cache::message_set($error, 'error');
}
- self::add_javascript('booking', 'booking', 'report.js');
+ self::add_javascript('booking', 'base', 'report.js');
array_set_default($report, 'resources', array());
$report['resources_json'] =
json_encode(array_map('intval', $report['resources']));
$report['cancel_link'] = self::link(array('menuaction'
=> 'booking.uireports.index'));
Modified: trunk/booking/inc/class.uiresource.inc.php
===================================================================
--- trunk/booking/inc/class.uiresource.inc.php 2017-12-10 12:04:04 UTC (rev
17421)
+++ trunk/booking/inc/class.uiresource.inc.php 2017-12-10 12:05:50 UTC (rev
17422)
@@ -163,7 +163,7 @@
$resource['type'] = 'Location';
}
$this->flash_form_errors($errors);
- self::add_javascript('booking', 'booking',
'resource_new.js');
+ self::add_javascript('booking', 'base',
'resource_new.js');
phpgwapi_jquery::load_widget('autocomplete');
self::rich_text_editor('field_description');
@@ -230,7 +230,7 @@
}
$this->flash_form_errors($errors);
- self::add_javascript('booking', 'booking',
'resource_new.js');
+ self::add_javascript('booking', 'base',
'resource_new.js');
phpgwapi_jquery::load_widget('autocomplete');
self::rich_text_editor('field_description');
$activity_data = $this->activity_bo->fetch_activities();
@@ -433,7 +433,7 @@
'datatable_def' =>
self::get_building_datatable_def($id),
'resource' => $resource
);
- self::add_javascript('booking', 'booking',
'resource_new.js'); // to render custom fields
+ self::add_javascript('booking', 'base',
'resource_new.js'); // to render custom fields
self::render_template_xsl(array('resource',
'datatable_inline'), $data);
}
@@ -476,7 +476,7 @@
$resource['cancel_link'] =
self::link(array('menuaction' => 'booking.uiresource.show',
'id' => $resource['id']));
- self::add_javascript('booking', 'booking',
'schedule.js');
+ self::add_javascript('booking', 'base', 'schedule.js');
phpgwapi_jquery::load_widget("datepicker");
Modified: trunk/booking/inc/class.uiseason.inc.php
===================================================================
--- trunk/booking/inc/class.uiseason.inc.php 2017-12-10 12:04:04 UTC (rev
17421)
+++ trunk/booking/inc/class.uiseason.inc.php 2017-12-10 12:05:50 UTC (rev
17422)
@@ -185,7 +185,7 @@
$season['to_'] = pretty_timestamp($season['to_']);
$this->flash_form_errors($errors);
- self::add_javascript('booking', 'booking', 'season.js');
+ self::add_javascript('booking', 'base', 'season.js');
array_set_default($season, 'resources', array());
$season['resources_json'] =
json_encode(array_map('intval', $season['resources']));
@@ -248,7 +248,7 @@
}
}
$this->flash_form_errors($errors);
- self::add_javascript('booking', 'booking', 'season.js');
+ self::add_javascript('booking', 'base', 'season.js');
$season['from_'] = pretty_timestamp($season['from_']);
$season['to_'] = pretty_timestamp($season['to_']);
@@ -411,8 +411,8 @@
$season['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
- self::add_javascript('booking', 'booking',
'schedule.js');
- //self::add_javascript('booking', 'booking',
'season.wtemplate.js');
+ self::add_javascript('booking', 'base', 'schedule.js');
+ //self::add_javascript('booking', 'base',
'season.wtemplate.js');
phpgwapi_jquery::load_widget("datepicker");
self::render_template_xsl('season_wtemplate',
array('season' => $season));
}
@@ -528,7 +528,7 @@
JS;
$GLOBALS['phpgw']->js->add_code('', $jscode);
- self::add_javascript('booking', 'booking',
'season.wtemplate.js');
+ self::add_javascript('booking', 'base',
'season.wtemplate.js');
self::render_template('season_wtemplate_allocation',
array('season' => $season));
}
Modified: trunk/booking/inc/class.uisend_email.inc.php
===================================================================
--- trunk/booking/inc/class.uisend_email.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uisend_email.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -78,7 +78,7 @@
}
$this->flash_form_errors($errors);
- self::add_javascript('booking', 'booking',
'email_send.js');
+ self::add_javascript('booking', 'base',
'email_send.js');
phpgwapi_jquery::load_widget('autocomplete');
$tabs = array();
Modified: trunk/booking/inc/class.uisystem_message.inc.php
===================================================================
--- trunk/booking/inc/class.uisystem_message.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/booking/inc/class.uisystem_message.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -37,7 +37,7 @@
}
$GLOBALS['phpgw_info']['apps']['manual']['section'] =
'booking_manual';
-// self::add_javascript('booking', 'booking',
'datatable.js');
+// self::add_javascript('booking', 'base', 'datatable.js');
phpgwapi_jquery::load_widget('autocomplete');
$data = array(
Modified: trunk/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uiallocation.inc.php 2017-12-10
12:04:04 UTC (rev 17421)
+++ trunk/bookingfrontend/inc/class.uiallocation.inc.php 2017-12-10
12:05:50 UTC (rev 17422)
@@ -310,7 +310,7 @@
}
}
$this->flash_form_errors($errors);
-// self::add_javascript('booking', 'booking',
'allocation.js');
+// self::add_javascript('booking', 'base',
'allocation.js');
$allocation['resources_json'] =
json_encode(array_map('intval', $allocation['resources']));
# $allocation['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uiallocation.show', 'id' =>
$allocation['id']));
Modified: trunk/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uibooking.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/bookingfrontend/inc/class.uibooking.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -245,7 +245,7 @@
}
$this->flash_form_errors($errors);
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'booking.js');
+ self::add_javascript('bookingfrontend', 'base',
'booking.js');
array_set_default($booking, 'resources', array());
if (!$activity_id)
@@ -501,7 +501,7 @@
}
}
$this->flash_form_errors($errors);
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'booking.js');
+ self::add_javascript('bookingfrontend', 'base',
'booking.js');
if ($step < 2)
{
$booking['resources_json'] =
json_encode(array_map('intval', $booking['resources']));
@@ -671,7 +671,7 @@
$activities = $this->activity_bo->fetch_activities();
$activities = $activities['results'];
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'booking_massupdate.js');
+ self::add_javascript('bookingfrontend', 'base',
'booking_massupdate.js');
phpgwapi_jquery::formvalidator_generate(array('location', 'date', 'security',
'file'), 'booking_form');
@@ -1114,7 +1114,7 @@
$booking['from_'] =
pretty_timestamp($booking['from_']);
$booking['to_'] =
pretty_timestamp($booking['to_']);
-// self::add_javascript('booking', 'booking',
'booking.js');
+// self::add_javascript('booking', 'base',
'booking.js');
$booking['resources_json'] =
json_encode(array_map('intval', $booking['resources']));
# $booking['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibooking.show', 'id' =>
$booking['id']));
$booking['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibuilding.schedule',
Modified: trunk/bookingfrontend/inc/class.uibuilding.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uibuilding.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/bookingfrontend/inc/class.uibuilding.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -338,7 +338,7 @@
$building['date'] = phpgw::get_var('date',
'string', 'GET');
}
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'schedule.js');
+ self::add_javascript('bookingfrontend', 'base',
'schedule.js');
phpgwapi_jquery::load_widget("datepicker");
$building['picker_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi', 'cal');
@@ -366,7 +366,7 @@
$building['date'] = phpgw::get_var('date',
'string', 'GET');
}
$building['deactivate_application'] = 1;
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'schedule.js');
+ self::add_javascript('bookingfrontend', 'base',
'schedule.js');
phpgwapi_jquery::load_widget("datepicker");
$building['picker_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi', 'cal');
self::render_template_xsl('building_schedule',
array('building' => $building,
Modified: trunk/bookingfrontend/inc/class.uievent.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uievent.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/bookingfrontend/inc/class.uievent.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -143,7 +143,7 @@
}
$date = substr($event['from_'], 0, 10);
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'event.js');
+ self::add_javascript('bookingfrontend', 'base',
'event.js');
$event['resources_json'] =
json_encode(array_map('intval', $event['resources']));
$event['cancel_link'] = self::link(array('menuaction'
=> 'bookingfrontend.uibuilding.schedule',
'id' => $event['building_id'], 'date'
=> $date));
@@ -252,7 +252,7 @@
}
$this->flash_form_errors($errors);
$date = substr($event['from_'], 0, 10);
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'event.js');
+ self::add_javascript('bookingfrontend', 'base',
'event.js');
$event['resources_json'] =
json_encode(array_map('intval', $event['resources']));
$event['cancel_link'] = self::link(array('menuaction'
=> 'bookingfrontend.uibuilding.schedule',
'id' => $event['building_id'], 'date'
=> $date));
Modified: trunk/bookingfrontend/inc/class.uiresource.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uiresource.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/bookingfrontend/inc/class.uiresource.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -177,7 +177,7 @@
'resource_id' => $resource['id'],
'phpgw_return_as' => 'json',
));
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'schedule.js');
+ self::add_javascript('bookingfrontend', 'base',
'schedule.js');
phpgwapi_jquery::load_widget("datepicker");
$resource['picker_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi', 'cal');
Modified: trunk/bookingfrontend/inc/class.uisearch.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uisearch.inc.php 2017-12-10 12:04:04 UTC
(rev 17421)
+++ trunk/bookingfrontend/inc/class.uisearch.inc.php 2017-12-10 12:05:50 UTC
(rev 17422)
@@ -25,7 +25,7 @@
phpgwapi_jquery::load_widget('autocomplete');
phpgwapi_jquery::load_widget('treeview');
- self::add_javascript('bookingfrontend',
'bookingfrontend', 'search.js');
+ self::add_javascript('bookingfrontend', 'base',
'search.js');
$config = CreateObject('phpgwapi.config', 'booking');
$config->read();
$searchterm = trim(phpgw::get_var('searchterm',
'string', 'REQUEST', null));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17422] booking and bookingfrontend: refactor javascript-location to reflect template-sets,
sigurdne <=