[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14537]
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [14537] |
|
Date: |
Mon, 07 Dec 2015 17:53:06 +0000 |
Revision: 14537
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14537
Author: psaul
Date: 2015-12-07 17:53:06 +0000 (Mon, 07 Dec 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uigroup.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uiorganization.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uiresource.inc.php
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
2015-12-07 17:17:53 UTC (rev 14536)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiallocation.inc.php
2015-12-07 17:53:06 UTC (rev 14537)
@@ -112,7 +112,7 @@
// $this->use_yui_editor();
phpgwapi_jquery::init_ckeditor('field-message');
- self::render_template('allocation_cancel',
array('allocation'=>$allocation));
+ self::render_template_xsl('allocation_cancel',
array('allocation'=>$allocation));
} else {
@@ -298,7 +298,7 @@
if ($step < 2)
{
phpgwapi_jquery::init_ckeditor('field-message');
- self::render_template('allocation_delete',
array('allocation' => $allocation,
+ self::render_template_xsl('allocation_delete',
array('allocation' => $allocation,
'recurring' => $recurring,
'outseason' => $outseason,
'interval' => $field_interval,
@@ -307,7 +307,7 @@
}
elseif ($step == 2)
{
-
self::render_template('allocation_delete_preview', array('allocation' =>
$allocation,
+
self::render_template_xsl('allocation_delete_preview', array('allocation' =>
$allocation,
'step' => $step,
'recurring' =>
$_POST['recurring'],
'outseason' =>
$_POST['outseason'],
@@ -359,7 +359,7 @@
$allocation['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uiallocation.cancel',
'allocation_id'=>$allocation['id'], 'from_'=>$allocation['from_'],
'to_'=>$allocation['to_'], 'resource'=>$allocation['resource']));
}
$allocation['when'] =
pretty_timestamp($allocation['from_']).' -
'.pretty_timestamp($allocation['to_']);
- self::render_template('allocation_info',
array('allocation'=>$allocation, 'user_can_delete_allocations' =>
$user_can_delete_allocations));
+ self::render_template_xsl('allocation_info',
array('allocation'=>$allocation, 'user_can_delete_allocations' =>
$user_can_delete_allocations));
$GLOBALS['phpgw']->xslttpl->set_output('wml'); // Evil
hack to disable page chrome
}
}
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
2015-12-07 17:17:53 UTC (rev 14536)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiapplication.inc.php
2015-12-07 17:53:06 UTC (rev 14537)
@@ -83,7 +83,7 @@
$agegroups = $agegroups['results'];
$audience =
$this->audience_bo->fetch_target_audience($top_level_activity);
$audience = $audience['results'];
- self::render_template('application',
array('application' => $application, 'audience' => $audience, 'agegroups' =>
$agegroups, 'frontend'=>'true'));
+ self::render_template_xsl('application',
array('application' => $application, 'audience' => $audience, 'agegroups' =>
$agegroups, 'frontend'=>'true'));
}
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-12-07 17:17:53 UTC (rev 14536)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibooking.inc.php
2015-12-07 17:53:06 UTC (rev 14537)
@@ -268,7 +268,7 @@
if ($step < 2)
{
- self::render_template('booking_new',
array('booking' => $booking,
+ self::render_template_xsl('booking_new',
array('booking' => $booking,
'activities' => $activities,
'agegroups' => $agegroups,
'audience' => $audience,
@@ -285,7 +285,7 @@
}
else if ($step == 2)
{
- self::render_template('booking_new_preview',
array('booking' => $booking,
+
self::render_template_xsl('booking_new_preview', array('booking' => $booking,
'activities' => $activities,
'agegroups' => $agegroups,
'audience' => $audience,
@@ -319,7 +319,7 @@
if ($booking['secret'] != phpgw::get_var('secret',
'string'))
{
$step = -1; // indicates that an error message
should be displayed in the template
- self::render_template('report_numbers',
array('event_object' => $booking, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
+ self::render_template_xsl('report_numbers',
array('event_object' => $booking, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
return false;
}
@@ -348,7 +348,7 @@
$step++;
}
}
- self::render_template('report_numbers',
array('event_object' => $booking, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
+ self::render_template_xsl('report_numbers',
array('event_object' => $booking, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
}
public function edit()
@@ -512,7 +512,7 @@
if ($step < 2)
{
- self::render_template('booking_edit',
array('booking' => $booking,
+ self::render_template_xsl('booking_edit',
array('booking' => $booking,
'activities' => $activities,
'agegroups' => $agegroups,
'audience' => $audience,
@@ -526,7 +526,7 @@
}
else if ($step >= 2)
{
- self::render_template('booking_edit_preview',
array('booking' => $booking,
+
self::render_template_xsl('booking_edit_preview', array('booking' => $booking,
'bookings' => $bookings,
'agegroups' => $agegroups,
'audience' => $audience,
@@ -640,7 +640,7 @@
phpgwapi_jquery::formvalidator_generate(array('location', 'date',
'security', 'file'), 'booking_form');
- self::render_template('booking_massupdate',
+ self::render_template_xsl('booking_massupdate',
array('booking' => $booking,
'agegroups' => $agegroups,
'audience' => $audience,
@@ -805,7 +805,7 @@
// $this->use_yui_editor();
phpgwapi_jquery::init_ckeditor('field-message');
- self::render_template('booking_cancel',
array('booking'=>$booking));
+ self::render_template_xsl('booking_cancel',
array('booking'=>$booking));
} else {
@@ -1044,7 +1044,7 @@
if ($step < 2)
{
phpgwapi_jquery::init_ckeditor('field-message');
- self::render_template('booking_delete',
array('booking' => $booking,
+ self::render_template_xsl('booking_delete',
array('booking' => $booking,
'recurring' => $recurring,
'outseason' => $outseason,
'interval' => $field_interval,
@@ -1055,7 +1055,7 @@
}
elseif ($step == 2)
{
-
self::render_template('booking_delete_preview', array('booking' => $booking,
+
self::render_template_xsl('booking_delete_preview', array('booking' => $booking,
'step' => $step,
'recurring' =>
$_POST['recurring'],
'outseason' =>
$_POST['outseason'],
@@ -1109,7 +1109,7 @@
$booking['cancel_link'] =
self::link(array('menuaction' => 'bookingfrontend.uibooking.cancel', 'id' =>
$booking['id']));
}
$booking['when'] =
pretty_timestamp($booking['from_']).' - '.pretty_timestamp($booking['to_']);
- self::render_template('booking_info',
array('booking'=>$booking, 'user_can_delete_bookings' =>
$user_can_delete_bookings));
+ self::render_template_xsl('booking_info',
array('booking'=>$booking, 'user_can_delete_bookings' =>
$user_can_delete_bookings));
$GLOBALS['phpgw']->xslttpl->set_output('wml'); // Evil
hack to disable page chrome
}
}
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
2015-12-07 17:17:53 UTC (rev 14536)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uibuilding.inc.php
2015-12-07 17:53:06 UTC (rev 14537)
@@ -339,7 +339,7 @@
$building['picker_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','cal');
- self::render_template('building_schedule', array('building' =>
$building, 'backend' => $backend));
+ self::render_template_xsl('building_schedule', array('building' =>
$building, 'backend' => $backend));
}
public function extraschedule()
@@ -362,7 +362,7 @@
self::add_javascript('bookingfrontend', 'bookingfrontend',
'schedule.js');
phpgwapi_jquery::load_widget("datepicker");
$building['picker_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','cal');
- self::render_template('building_schedule', array('building' =>
$building, 'backend' => $backend));
+ self::render_template_xsl('building_schedule', array('building' =>
$building, 'backend' => $backend));
}
public function show()
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
2015-12-07 17:17:53 UTC (rev 14536)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uievent.inc.php
2015-12-07 17:53:06 UTC (rev 14537)
@@ -157,7 +157,7 @@
phpgwapi_jquery::formvalidator_generate(array('location', 'date',
'security', 'file'), 'event_form');
- self::render_template('event_edit', array('event' => $event,
'activities' => $activities, 'agegroups' => $agegroups, 'audience' =>
$audience, 'comments' => $comments));
+ self::render_template_xsl('event_edit', array('event' => $event,
'activities' => $activities, 'agegroups' => $agegroups, 'audience' =>
$audience, 'comments' => $comments));
}
public function cancel()
@@ -235,7 +235,7 @@
phpgwapi_jquery::init_ckeditor('field-message');
- self::render_template('event_delete', array('event' => $event,
'activities' => $activities, 'can_delete_events' => $can_delete_events));
+ self::render_template_xsl('event_delete', array('event' => $event,
'activities' => $activities, 'can_delete_events' => $can_delete_events));
}
public function building_users($building_id, $type=false,
$activities=array()) {
@@ -348,7 +348,7 @@
$event['cancel_link'] = self::link(array('menuaction' =>
'bookingfrontend.uievent.cancel', 'id' => $event['id']));
}
- self::render_template('event_info',
array('event'=>$event,'orginfo' => $orginfo, 'user_can_delete_bookings' =>
$user_can_delete_bookings));
+ self::render_template_xsl('event_info',
array('event'=>$event,'orginfo' => $orginfo, 'user_can_delete_bookings' =>
$user_can_delete_bookings));
$GLOBALS['phpgw']->xslttpl->set_output('wml'); // Evil hack to
disable page chrome
}
@@ -370,7 +370,7 @@
if ($event['secret'] != phpgw::get_var('secret',
'string'))
{
$step = -1; // indicates that an error message
should be displayed in the template
- self::render_template('report_numbers',
array('event_object' => $event, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
+ self::render_template_xsl('report_numbers',
array('event_object' => $event, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
return false;
}
@@ -399,6 +399,6 @@
$step++;
}
}
- self::render_template('report_numbers',
array('event_object' => $event, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
+ self::render_template_xsl('report_numbers',
array('event_object' => $event, 'agegroups' => $agegroups, 'building' =>
$building, 'step' => $step));
}
}
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uigroup.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uigroup.inc.php
2015-12-07 17:17:53 UTC (rev 14536)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uigroup.inc.php
2015-12-07 17:53:06 UTC (rev 14537)
@@ -37,7 +37,7 @@
$group['logoff_link'] = 'logoff.php'.$auth_forward;
if ($bouser->is_organization_admin())
$group['logged_on'] = true;
- self::render_template('group', array('group' => $group,
'loggedin' => $loggedin, 'edit_self_link' => $edit_self_link));
+ self::render_template_xsl('group', array('group' =>
$group, 'loggedin' => $loggedin, 'edit_self_link' => $edit_self_link));
}
}
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uiorganization.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiorganization.inc.php
2015-12-07 17:17:53 UTC (rev 14536)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiorganization.inc.php
2015-12-07 17:53:06 UTC (rev 14537)
@@ -38,7 +38,7 @@
}
else
{
- self::render_template('access_denied');
+ self::render_template_xsl('access_denied');
}
}
@@ -65,6 +65,6 @@
phpgwapi_jquery::load_widget("core");
- self::render_template('organization',
array('organization' => $organization));
+ self::render_template_xsl('organization',
array('organization' => $organization));
}
}
Modified: branches/dev-syncromind/bookingfrontend/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uiresource.inc.php
2015-12-07 17:17:53 UTC (rev 14536)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uiresource.inc.php
2015-12-07 17:53:06 UTC (rev 14537)
@@ -49,7 +49,7 @@
'resource' => $resource
);
- self::render_template('resource', $data);
+ self::render_template_xsl('resource', $data);
}
public function schedule()
Modified:
branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-12-07 17:17:53 UTC (rev 14536)
+++ branches/dev-syncromind/bookingfrontend/inc/class.uisystem_message.inc.php
2015-12-07 17:53:06 UTC (rev 14537)
@@ -64,6 +64,6 @@
phpgwapi_jquery::formvalidator_generate(array('location', 'date',
'security', 'file'));
// $this->use_yui_editor();
- self::render_template('system_message',
array('system_message' => $system_message));
+ self::render_template_xsl('system_message',
array('system_message' => $system_message));
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14537],
Saul <=