update settings dialog
This commit is contained in:
Georg Ehrke
parent
98f368275c
commit
d0b0147413
4 changed files with 36 additions and 176 deletions
|
|
@ -1,14 +1,13 @@
|
|||
<?php
|
||||
|
||||
$l10n = OC_L10N::get('calendar');
|
||||
OCP\JSON::checkLoggedIn();
|
||||
OCP\JSON::checkAppEnabled('calendar');
|
||||
|
||||
$tmpl = new OCP\Template('calendar', 'part.choosecalendar.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());
|
||||
$tmpl->assign('calendars', OC_Calendar_Calendar::allCalendars(OCP\USER::getUser()), false);
|
||||
|
||||
OCP\Util::addscript('calendar','settings');
|
||||
$tmpl->printPage();
|
||||
$tmpl->printPage();
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<form id="calendar">
|
||||
<p><b><?php p($l->t('Your calendars')); ?>:</b></p>
|
||||
<table width="100%" style="border: 0;">
|
||||
<?php
|
||||
$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
|
||||
for($i = 0; $i < count($option_calendars); $i++) {
|
||||
print_unescaped("<tr data-id='".OC_Util::sanitizeHTML($option_calendars[$i]['id'])."'>");
|
||||
$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
|
||||
$tmpl->assign('calendar', $option_calendars[$i]);
|
||||
if ($option_calendars[$i]['userid'] != OCP\User::getUser()) {
|
||||
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $option_calendars[$i]['id']);
|
||||
$shared = true;
|
||||
} else {
|
||||
$shared = false;
|
||||
}
|
||||
$tmpl->assign('shared', $shared);
|
||||
$tmpl->printpage();
|
||||
print_unescaped("</tr>");
|
||||
}
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="6">
|
||||
<input type="button" value="<?php p($l->t('New Calendar')) ?>" id="newCalendar">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="6">
|
||||
<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" title="<?php p($l->t("CalDav Link")); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php p(OCP\Util::imagePath('core', 'actions/delete.svg')) ?>" alt="close"/></p>
|
||||
</td>
|
||||
</tr>
|
||||
</table><br>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
|
@ -1,130 +0,0 @@
|
|||
<form id="calendar">
|
||||
<p><b><?php p($l->t('Your calendars')); ?>:</b></p>
|
||||
<table width="100%" style="border: 0;">
|
||||
<?php
|
||||
$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
|
||||
for($i = 0; $i < count($option_calendars); $i++) {
|
||||
print_unescaped("<tr data-id='".OC_Util::sanitizeHTML($option_calendars[$i]['id'])."'>");
|
||||
$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
|
||||
$tmpl->assign('calendar', $option_calendars[$i]);
|
||||
if ($option_calendars[$i]['userid'] != OCP\User::getUser()) {
|
||||
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $option_calendars[$i]['id']);
|
||||
$shared = true;
|
||||
} else {
|
||||
$shared = false;
|
||||
}
|
||||
$tmpl->assign('shared', $shared);
|
||||
$tmpl->printpage();
|
||||
print_unescaped("</tr>");
|
||||
}
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="6">
|
||||
<input type="button" value="<?php p($l->t('New Calendar')) ?>" id="newCalendar">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="6">
|
||||
<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" title="<?php p($l->t("CalDav Link")); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php p(OCP\Util::imagePath('core', 'actions/delete.svg')) ?>" alt="close"/></p>
|
||||
</td>
|
||||
</tr>
|
||||
</table><br>
|
||||
</fieldset>
|
||||
</form>
|
||||
<h2 id="title_general"><?php p($l->t('General')); ?></h2>
|
||||
<div id="general">
|
||||
<table class="nostyle">
|
||||
<tr>
|
||||
<td>
|
||||
<label for="timezone" class="bold"><?php p($l->t('Timezone'));?></label>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<select style="display: none;" id="timezone" name="timezone">
|
||||
<?php
|
||||
$continent = '';
|
||||
foreach($_['timezones'] as $timezone):
|
||||
$ex=explode('/', $timezone, 2);//obtain continent,city
|
||||
if (!isset($ex[1])) {
|
||||
$ex[1] = $ex[0];
|
||||
$ex[0] = "Other";
|
||||
}
|
||||
if ($continent!=$ex[0]):
|
||||
if ($continent!="") print_unescaped('</optgroup>');
|
||||
print_unescaped('<optgroup label="'.OC_Util::sanitizeHTML($ex[0]).'">');
|
||||
endif;
|
||||
$city=strtr($ex[1], '_', ' ');
|
||||
$continent=$ex[0];
|
||||
print_unescaped('<option value="'.OC_Util::sanitizeHTML($timezone).'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.OC_Util::sanitizeHTML($city).'</option>');
|
||||
endforeach;?>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" name="timezonedetection" id="timezonedetection">
|
||||
|
||||
<label for="timezonedetection"><?php p($l->t('Update timezone automatically')); ?></label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<label for="timeformat" class="bold"><?php p($l->t('Time format'));?></label>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<select style="display: none; width: 60px;" id="timeformat" title="<?php p("timeformat"); ?>" name="timeformat">
|
||||
<option value="24" id="24h"><?php p($l->t("24h")); ?></option>
|
||||
<option value="ampm" id="ampm"><?php p($l->t("12h")); ?></option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<label for="firstday" class="bold"><?php p($l->t('Start week on'));?></label>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<select style="display: none;" id="firstday" title="<?php p("First day"); ?>" name="firstday">
|
||||
<option value="mo" id="mo"><?php p($l->t("Monday")); ?></option>
|
||||
<option value="su" id="su"><?php p($l->t("Sunday")); ?></option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr class="advancedsettings">
|
||||
<td>
|
||||
<label for="" class="bold"><?php p($l->t('Cache'));?></label>
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<input id="cleancalendarcache" type="button" class="button" value="<?php p($l->t('Clear cache for repeating events'));?>">
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<h2 id="title_urls"><?php p($l->t('URLs')); ?></h2>
|
||||
<div id="urls">
|
||||
<?php p($l->t('Calendar CalDAV syncing addresses')); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php p($l->t('more info')); ?></a>)
|
||||
<dl>
|
||||
<dt><?php p($l->t('Primary address (Kontact et al)')); ?></dt>
|
||||
<dd><code><?php print_unescaped(OCP\Util::linkToRemote('caldav')); ?></code></dd>
|
||||
<dt><?php p($l->t('iOS/OS X')); ?></dt>
|
||||
<dd><code><?php print_unescaped(OCP\Util::linkToRemote('caldav')); ?>principals/<?php p(OCP\USER::getUser()); ?></code>/</dd>
|
||||
<dt><?php p($l->t('Read only iCalendar link(s)')); ?></dt>
|
||||
<dd>
|
||||
<?php foreach($_['calendars'] as $calendar) {
|
||||
if($calendar['userid'] == OCP\USER::getUser()){
|
||||
$uri = rawurlencode(html_entity_decode($calendar['uri'], ENT_QUOTES, 'UTF-8'));
|
||||
}else{
|
||||
$uri = rawurlencode(html_entity_decode($calendar['uri'], ENT_QUOTES, 'UTF-8')) . '_shared_by_' . $calendar['userid'];
|
||||
}
|
||||
?>
|
||||
<a href="<?php p(OCP\Util::linkToRemote('caldav').'calendars/'.OCP\USER::getUser().'/'.$uri) ?>?export"><?php p(OCP\Util::sanitizeHTML($calendar['displayname'])) ?></a><br />
|
||||
<?php } ?>
|
||||
</dd>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,12 +1,36 @@
|
|||
<?php
|
||||
/**
|
||||
* Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
|
||||
* Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
|
||||
* This file is licensed under the Affero General Public License version 3 or
|
||||
* later.
|
||||
* See the COPYING-README file.
|
||||
*/
|
||||
?>
|
||||
<form id="calendar">
|
||||
<p><b><?php p($l->t('Your calendars')); ?>:</b></p>
|
||||
<table width="100%" style="border: 0;">
|
||||
<?php
|
||||
$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
|
||||
for($i = 0; $i < count($option_calendars); $i++) {
|
||||
print_unescaped("<tr data-id='".OC_Util::sanitizeHTML($option_calendars[$i]['id'])."'>");
|
||||
$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
|
||||
$tmpl->assign('calendar', $option_calendars[$i]);
|
||||
if ($option_calendars[$i]['userid'] != OCP\User::getUser()) {
|
||||
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $option_calendars[$i]['id']);
|
||||
$shared = true;
|
||||
} else {
|
||||
$shared = false;
|
||||
}
|
||||
$tmpl->assign('shared', $shared);
|
||||
$tmpl->printpage();
|
||||
print_unescaped("</tr>");
|
||||
}
|
||||
?>
|
||||
<tr>
|
||||
<td colspan="6">
|
||||
<input type="button" value="<?php p($l->t('New Calendar')) ?>" id="newCalendar">
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="6">
|
||||
<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" title="<?php p($l->t("CalDav Link")); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php p(OCP\Util::imagePath('core', 'actions/delete.svg')) ?>" alt="close"/></p>
|
||||
</td>
|
||||
</tr>
|
||||
</table><br>
|
||||
</fieldset>
|
||||
</form>
|
||||
<h2 id="title_general"><?php p($l->t('General')); ?></h2>
|
||||
<div id="general">
|
||||
<table class="nostyle">
|
||||
|
|
@ -104,4 +128,4 @@
|
|||
</dd>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue