rysiek
/
owncalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "timezone for link-shared events - implementation begins" 

This reverts commit 3e1248c0b1.
master
Michał 'rysiek' Woźniak 2014-02-11 00:59:58 +01:00
parent 3e1248c0b1
commit 0b3415bb58
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/style.css
View File

@ -169,7 +169,7 @@ button.category{margin:0 3px;}
float:right;
}
.settings.timezonesettings > .chzn-container {
#controls .settings.timezonesettings > .chzn-container {
position:relative;
top:0.5em;
}

1
share.php
View File

@ -161,7 +161,6 @@ if (isset($rootLinkItem)) {
} elseif ($linkItem['item_type'] === 'event') {
OCP\Util::addStyle('calendar', 'style');
OCP\Util::addStyle('calendar', 'tooltips');
OCP\Util::addscript('calendar','settings');
OCP\App::setActiveNavigationEntry('calendar_index');
$tmpl = new OCP\Template('calendar', 'event', 'base');
$tmpl->assign('link_shared_event', $linkItem);

2
templates/event.php
View File

@ -225,8 +225,6 @@ $tmpl = new OCP\Template('calendar', 'part.showevent');
$tmpl->assign('link_shared_event', $_['link_shared_event']);
$tmpl->assign('link_shared_event_url', $_['link_shared_event_url']);
$tmpl->assign('timezone', $_['timezone']);
$tmpl->assign('timezones', $_['timezones']);
$tmpl->assign('eventid', $id);
$tmpl->assign('permissions', $permissions);

23
templates/part.showevent.php
View File

@ -279,26 +279,5 @@
</div>
<!--<div id="tabs-3">//Alarm</div>
<div id="tabs-4">//Attendees</div>-->
<hr/>
<div class="settings timezonesettings">
<label for="timezone"><?php p($l->t('Timezone')) ?></label>
<select 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>
</div>
</div>