From 1945cd694636def02a2b2d4fb36720b3f0aeeb10 Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Sun, 6 May 2012 23:00:36 +0200 Subject: ported the oc_template class --- apps/calendar/ajax/calendar/edit.form.php | 2 +- apps/calendar/ajax/calendar/edit.php | 2 +- apps/calendar/ajax/calendar/new.form.php | 2 +- apps/calendar/ajax/calendar/new.php | 2 +- apps/calendar/ajax/calendar/overview.php | 2 +- apps/calendar/ajax/calendar/update.php | 2 +- apps/calendar/ajax/event/edit.form.php | 4 ++-- apps/calendar/ajax/event/new.form.php | 2 +- apps/calendar/ajax/import/dialog.php | 2 +- apps/calendar/ajax/share/dropdown.php | 2 +- apps/calendar/index.php | 2 +- apps/calendar/settings.php | 2 +- apps/calendar/templates/part.choosecalendar.php | 4 ++-- apps/calendar/templates/part.eventform.php | 24 ++++++++++++------------ apps/calendar/templates/part.import.php | 2 +- apps/calendar/templates/part.showevent.php | 22 +++++++++++----------- apps/calendar/templates/share.dropdown.php | 4 ++-- 17 files changed, 41 insertions(+), 41 deletions(-) mode change 100644 => 100755 apps/calendar/templates/part.eventform.php mode change 100644 => 100755 apps/calendar/templates/part.showevent.php (limited to 'apps/calendar') diff --git a/apps/calendar/ajax/calendar/edit.form.php b/apps/calendar/ajax/calendar/edit.form.php index 17118c5165f..77366809311 100755 --- a/apps/calendar/ajax/calendar/edit.form.php +++ b/apps/calendar/ajax/calendar/edit.form.php @@ -12,7 +12,7 @@ OCP\JSON::checkAppEnabled('calendar'); $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions(); $calendar = OC_Calendar_App::getCalendar($_GET['calendarid']); -$tmpl = new OC_Template("calendar", "part.editcalendar"); +$tmpl = new OCP\Template("calendar", "part.editcalendar"); $tmpl->assign('new', false); $tmpl->assign('calendarcolor_options', $calendarcolor_options); $tmpl->assign('calendar', $calendar); diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php index 17118c5165f..77366809311 100755 --- a/apps/calendar/ajax/calendar/edit.php +++ b/apps/calendar/ajax/calendar/edit.php @@ -12,7 +12,7 @@ OCP\JSON::checkAppEnabled('calendar'); $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions(); $calendar = OC_Calendar_App::getCalendar($_GET['calendarid']); -$tmpl = new OC_Template("calendar", "part.editcalendar"); +$tmpl = new OCP\Template("calendar", "part.editcalendar"); $tmpl->assign('new', false); $tmpl->assign('calendarcolor_options', $calendarcolor_options); $tmpl->assign('calendar', $calendar); diff --git a/apps/calendar/ajax/calendar/new.form.php b/apps/calendar/ajax/calendar/new.form.php index fa30b871e42..ee46757f56b 100755 --- a/apps/calendar/ajax/calendar/new.form.php +++ b/apps/calendar/ajax/calendar/new.form.php @@ -15,7 +15,7 @@ $calendar = array( 'displayname' => '', 'calendarcolor' => '', ); -$tmpl = new OC_Template('calendar', 'part.editcalendar'); +$tmpl = new OCP\Template('calendar', 'part.editcalendar'); $tmpl->assign('new', true); $tmpl->assign('calendarcolor_options', $calendarcolor_options); $tmpl->assign('calendar', $calendar); diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php index 4b8688e3d1d..76dbef6b9df 100755 --- a/apps/calendar/ajax/calendar/new.php +++ b/apps/calendar/ajax/calendar/new.php @@ -29,7 +29,7 @@ $calendarid = OC_Calendar_Calendar::addCalendar($userid, strip_tags($_POST['name OC_Calendar_Calendar::setCalendarActive($calendarid, 1); $calendar = OC_Calendar_Calendar::find($calendarid); -$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields'); +$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields'); $tmpl->assign('calendar', $calendar); OCP\JSON::success(array( 'page' => $tmpl->fetchPage(), diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php index 586bf3db814..96312537507 100755 --- a/apps/calendar/ajax/calendar/overview.php +++ b/apps/calendar/ajax/calendar/overview.php @@ -10,6 +10,6 @@ $l10n = OC_L10N::get('calendar'); OCP\JSON::checkLoggedIn(); OCP\JSON::checkAppEnabled('calendar'); -$output = new OC_TEMPLATE("calendar", "part.choosecalendar"); +$output = new OCP\Template("calendar", "part.choosecalendar"); $output -> printpage(); ?> diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php index 408ac900912..3b1cc32b316 100755 --- a/apps/calendar/ajax/calendar/update.php +++ b/apps/calendar/ajax/calendar/update.php @@ -30,7 +30,7 @@ OC_Calendar_Calendar::editCalendar($calendarid, strip_tags($_POST['name']), null OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']); $calendar = OC_Calendar_App::getCalendar($calendarid); -$tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields'); +$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields'); $tmpl->assign('calendar', $calendar); OCP\JSON::success(array( 'page' => $tmpl->fetchPage(), diff --git a/apps/calendar/ajax/event/edit.form.php b/apps/calendar/ajax/event/edit.form.php index 91d07d3897a..f2ea84dd205 100755 --- a/apps/calendar/ajax/event/edit.form.php +++ b/apps/calendar/ajax/event/edit.form.php @@ -206,9 +206,9 @@ $repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions(); $repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions(); if($access == 'owner' || $access == 'rw'){ - $tmpl = new OC_Template('calendar', 'part.editevent'); + $tmpl = new OCP\Template('calendar', 'part.editevent'); }elseif($access == 'r'){ - $tmpl = new OC_Template('calendar', 'part.showevent'); + $tmpl = new OCP\Template('calendar', 'part.showevent'); } $tmpl->assign('eventid', $id); diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php index 42cdb81642e..f47cb6c3e2a 100755 --- a/apps/calendar/ajax/event/new.form.php +++ b/apps/calendar/ajax/event/new.form.php @@ -43,7 +43,7 @@ $repeat_bymonth_options = OC_Calendar_App::getByMonthOptions(); $repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions(); $repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions(); -$tmpl = new OC_Template('calendar', 'part.newevent'); +$tmpl = new OCP\Template('calendar', 'part.newevent'); $tmpl->assign('access', 'owner'); $tmpl->assign('calendar_options', $calendar_options); $tmpl->assign('repeat_options', $repeat_options); diff --git a/apps/calendar/ajax/import/dialog.php b/apps/calendar/ajax/import/dialog.php index e686066a993..3be02d2a6db 100755 --- a/apps/calendar/ajax/import/dialog.php +++ b/apps/calendar/ajax/import/dialog.php @@ -9,7 +9,7 @@ OCP\JSON::checkLoggedIn(); OCP\App::checkAppEnabled('calendar'); -$tmpl = new OC_Template('calendar', 'part.import'); +$tmpl = new OCP\Template('calendar', 'part.import'); $tmpl->assign('path', $_POST['path']); $tmpl->assign('filename', $_POST['filename']); $tmpl->printpage(); diff --git a/apps/calendar/ajax/share/dropdown.php b/apps/calendar/ajax/share/dropdown.php index bac487f0d0b..a3b0faca4bf 100755 --- a/apps/calendar/ajax/share/dropdown.php +++ b/apps/calendar/ajax/share/dropdown.php @@ -13,6 +13,6 @@ if($calendar['userid'] != $user){ OCP\JSON::error(); exit; } -$tmpl = new OC_Template('calendar', 'share.dropdown'); +$tmpl = new OCP\Template('calendar', 'share.dropdown'); $tmpl->assign('calid', $calid); $tmpl->printPage(); \ No newline at end of file diff --git a/apps/calendar/index.php b/apps/calendar/index.php index 5aee5f6ace8..cf03a7a3cd3 100755 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -53,7 +53,7 @@ OCP\Util::addStyle('', 'jquery.multiselect'); OCP\Util::addscript('contacts','jquery.multi-autocomplete'); OCP\Util::addscript('','oc-vcategories'); OCP\App::setActiveNavigationEntry('calendar_index'); -$tmpl = new OC_Template('calendar', 'calendar', 'user'); +$tmpl = new OCP\Template('calendar', 'calendar', 'user'); $tmpl->assign('eventSources', $eventSources); $tmpl->assign('categories', $categories); if(array_key_exists('showevent', $_GET)){ diff --git a/apps/calendar/settings.php b/apps/calendar/settings.php index 981df9ffafd..a18b1ca9f42 100755 --- a/apps/calendar/settings.php +++ b/apps/calendar/settings.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -$tmpl = new OC_Template( 'calendar', 'settings'); +$tmpl = new OCP\Template( 'calendar', 'settings'); $timezone=OCP\Config::getUserValue(OCP\USER::getUser(),'calendar','timezone',''); $tmpl->assign('timezone',$timezone); $tmpl->assign('timezones',DateTimeZone::listIdentifiers()); diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php index af3b82a48fc..a140316ea07 100755 --- a/apps/calendar/templates/part.choosecalendar.php +++ b/apps/calendar/templates/part.choosecalendar.php @@ -5,7 +5,7 @@ $option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser()); for($i = 0; $i < count($option_calendars); $i++){ echo ""; - $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields'); + $tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields'); $tmpl->assign('calendar', $option_calendars[$i]); if(OC_Calendar_Share::allUsersSharedwith($option_calendars[$i]['id'], OC_Calendar_Share::CALENDAR) == array()){ $shared = false; @@ -36,7 +36,7 @@ $count = count($share); for($i = 0; $i < $count; $i++){ $share[$i]['calendar'] = OC_Calendar_App::getCalendar($share[$i]['calendarid'], false, false); echo ''; - $tmpl = new OC_Template('calendar', 'part.choosecalendar.rowfields.shared'); + $tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields.shared'); $tmpl->assign('share', $share[$i]); $tmpl->printpage(); echo ''; diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php old mode 100644 new mode 100755 index 9e54616190c..b3bbf7a375b --- a/apps/calendar/templates/part.eventform.php +++ b/apps/calendar/templates/part.eventform.php @@ -27,7 +27,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid t("Category");?>: - <?php echo $l->t('Edit categories'); ?> + <?php echo $l->t('Edit categories'); ?> 1) { ?>    t("Calendar");?>: @@ -35,7 +35,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid @@ -101,7 +101,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid " onclick="Calendar.UI.showadvancedoptionsforrepeating();" id="advanced_options_button"> @@ -114,7 +114,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid @@ -126,7 +126,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid @@ -138,7 +138,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid @@ -151,7 +151,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid @@ -164,7 +164,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid t('and the events day of year.'); ?> @@ -177,7 +177,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid t('and the events day of month.'); ?> @@ -190,7 +190,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid @@ -203,7 +203,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid t('and the events week of year.'); ?> @@ -222,7 +222,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php index 80375c3ef78..e93ea1af4c9 100755 --- a/apps/calendar/templates/part.import.php +++ b/apps/calendar/templates/part.import.php @@ -8,7 +8,7 @@ 'newcal', 'displayname'=>$l->t('create a new calendar')); -echo html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname')); +echo OCP\html_select_options($calendar_options, $calendar_options[0]['id'], array('value'=>'id', 'label'=>'displayname')); ?>