Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust showing timezone #961

Merged
merged 2 commits into from
Nov 4, 2018
Merged

Adjust showing timezone #961

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eb1c4d
Disable timezone button when the event is all day
okkez Oct 25, 2018
68b2106
Hide timezone when the event is all day and read only
okkez Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions templates/editor.sidebar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down