Merge pull request #961 from okkez/adjust-showing-timezone

Adjust showing timezone
owncloud · Nov 4, 2018 · 3faec10 · 3faec10
2 parents 8be960f + 68b2106
commit 3faec10
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/templates/editor.sidebar.php b/templates/editor.sidebar.php
@@ -23,13 +23,13 @@ class="advanced--input h2 advanced--textarea"
 					<div class="event-time-interior pull-left">
 						<span><?php p($l->t('Starts')); ?></span>
 						<ocdatetimepicker ng-model="properties.dtstart.value" disabletime="properties.allDay" datetabindex="203" timetabindex="204" readonly="readOnly"></ocdatetimepicker>
-						<select ng-options="timezone.value as timezone.displayname | timezoneWithoutContinentFilter group by timezone.group for timezone in timezones" ng-model="properties.dtstart.parameters.zone" ng-show="edittimezone || readOnly" ng-disabled="properties.allDay"
+						<select ng-options="timezone.value as timezone.displayname | timezoneWithoutContinentFilter group by timezone.group for timezone in timezones" ng-model="properties.dtstart.parameters.zone" ng-show="(edittimezone || readOnly) && !properties.allDay" ng-disabled="properties.allDay"
 								ng-change="loadTimezone(properties.dtstart.parameters.zone)" class="timezone-select" tabindex="205"></select>
 					</div>
 					<div class="event-time-interior pull-right">
 						<span><?php p($l->t('Ends')); ?></span>
 						<ocdatetimepicker ng-model="properties.dtend.value" disabletime="properties.allDay" datetabindex="206" timetabindex="207" readonly="readOnly"></ocdatetimepicker>
-						<select ng-options="timezone.value as timezone.displayname | timezoneWithoutContinentFilter group by timezone.group for timezone in timezones" ng-model="properties.dtend.parameters.zone" ng-show="edittimezone || readOnly" ng-disabled="properties.allDay"
+						<select ng-options="timezone.value as timezone.displayname | timezoneWithoutContinentFilter group by timezone.group for timezone in timezones" ng-model="properties.dtend.parameters.zone" ng-show="(edittimezone || readOnly) && !properties.allDay" ng-disabled="properties.allDay"
 							ng-change="loadTimezone(properties.dtend.parameters.zone)" class="timezone-select" tabindex="208"></select>
 					</div>
 					<div class="advanced--checkbox pull-left pull-half">
@@ -41,7 +41,7 @@ class="checkbox"
 						<label for="alldayeventcheckbox"><?php p($l->t('All day Event'))?></label>
 					</div>
 					<div class="pull-right pull-half timezone-container">
-						<button class="button btn-default btn-timezone" ng-click="edittimezone = !edittimezone" ng-show="!readOnly" type="button" tabindex="209">
+						<button class="button btn-default btn-timezone" ng-click="edittimezone = !edittimezone" ng-show="!readOnly" ng-disabled="properties.allDay" type="button" tabindex="209">
 							<span class="icon-timezone"></span>
 						</button>
 					</div>