wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.

Browse source
This commit is contained in:
Stephen Rees-Carter 2011-10-06 10:31:05 +11:00
parent 08c38c8158
commit c853fc75a1
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
apps/calendar/templates/settings.php
View file

@ -11,34 +11,36 @@ OC_UTIL::addStyle('', 'jquery.multiselect');
?> ?>
<form id="calendar"> <form id="calendar">
<fieldset class="personalblock"> <fieldset class="personalblock">
<table class="nostyle"> <table class="nostyle">
<tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone"> <tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
<?php <?php
$continent = ''; $continent = '';
foreach($_['timezones'] as $timezone): foreach($_['timezones'] as $timezone):
if ( preg_match( '/^(America|Antartica|Arctic|Asia|Atlantic|Europe|Indian|Pacific)\//', $timezone ) ): $ex=explode('/', $timezone, 2);//obtain continent,city
$ex=explode('/', $timezone, 2);//obtain continent,city if (!isset($ex[1])) {
if ($continent!=$ex[0]): $ex[1] = $ex[0];
if ($continent!="") echo '</optgroup>'; $ex[0] = "Other";
echo '<optgroup label="'.$ex[0].'">'; }
endif; if ($continent!=$ex[0]):
$city=$ex[1]; if ($continent!="") echo '</optgroup>';
$continent=$ex[0]; echo '<optgroup label="'.$ex[0].'">';
echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>'; endif;
endif; $city=$ex[1];
$continent=$ex[0];
echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
endforeach;?> endforeach;?>
</select></td></tr> </select></td></tr>
<tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td> <tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
<select style="display: none;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat"> <select style="display: none;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
<option value="24" id="24h"><?php echo $l->t("24h"); ?></option> <option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
<option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option> <option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
</select> </select>
</td></tr> </td></tr>
</table> </table>
<?php echo $l->t('Calendar CalDAV syncing address:');?> <?php echo $l->t('Calendar CalDAV syncing address:');?>
<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br /> <?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br />
</fieldset> </fieldset>
</form> </form>