Merge branch 'Alinto:master' into master

This commit is contained in:
adetk
2022-08-19 09:55:09 +06:00
committed by GitHub
608 changed files with 2027 additions and 1208 deletions
@@ -35,7 +35,7 @@
<label><var:string label:value="Calendar"/></label>
<md-select ng-model="editor.component.destinationCalendar"
ng-change="editor.changeCalendar()">
<md-option ng-repeat="calendar in editor.service.$findAll(null, true)"
<md-option ng-repeat="calendar in editor.destinationCalendars()"
ng-value="calendar.id">
<div layout="row" layout-align="start center">
<div class="sg-color-chip"
@@ -49,7 +49,7 @@
</md-menu-content>
</md-menu>
</md-menu-item>
<md-menu-item ng-show="editor.component.isMovable()">
<md-menu-item ng-show="editor.component.isErasable">
<md-menu>
<md-button label:aria-label="Move To" ng-click="$mdMenu.open($event)">
<var:string label:value="Move To"/>
@@ -272,20 +272,23 @@
<!-- actions -->
<!-- editable but not recurrent -->
<md-dialog-actions ng-show="::editor.component.isEditable()">
<md-dialog-actions ng-show="::editor.component.isActionable()">
<md-button class="md-warn"
label:aria-label="Delete Event"
ng-show="::editor.component.isErasable"
ng-click="editor.deleteAllOccurrences()">
<var:string label:value="Delete"/>
</md-button>
<div class="md-flex"><!-- spacer --></div>
<md-button type="button" ng-click="editor.edit()">
<md-button type="button"
ng-show="::editor.component.isEditable"
ng-click="editor.edit()">
<var:string label:value="Edit"/>
</md-button>
</md-dialog-actions>
<!-- editable and recurrent -->
<md-dialog-actions ng-show="::editor.component.isEditableOccurrence()">
<md-menu>
<md-dialog-actions ng-show="::editor.component.isActionableOccurrence()">
<md-menu ng-show="::editor.component.isErasable">
<md-button class="md-warn"
label:aria-label="Delete Event"
ng-click="$mdMenu.open()"
@@ -310,7 +313,7 @@
</md-menu-content>
</md-menu>
<div class="md-flex"><!-- spacer --></div>
<md-menu>
<md-menu ng-show="::editor.component.isEditable">
<md-button label:aria-label="Edit"
ng-click="$mdMenu.open()"
md-menu-origin="md-menu-origin">
@@ -79,9 +79,10 @@
<var:string label:value="When I modify my calendar, send a mail to"/>
</md-checkbox>
<md-input-container flex-offset="5" md-no-float="md-no-float">
<input type="email"
<input type="text"
label:placeholder="Email Address"
ng-model="properties.calendar.notifiedUserOnPersonalModifications"
ng-pattern="properties.emailRE"
ng-required="properties.calendar.notifications.notifyUserOnPersonalModifications"
ng-disabled="!properties.calendar.notifications.notifyUserOnPersonalModifications"/>
</md-input-container>
@@ -34,7 +34,7 @@
<md-input-container flex="50" flex-xs="100">
<label><var:string label:value="Calendar"/></label>
<md-select ng-model="editor.component.destinationCalendar">
<md-option ng-repeat="calendar in editor.service.$findAll(null, true)"
<md-option ng-repeat="calendar in editor.destinationCalendars()"
ng-value="calendar.id">
<div layout="row" layout-align="start center">
<div class="sg-color-chip"
@@ -125,19 +125,22 @@
<!-- actions -->
<!-- editable but not recurrent -->
<md-dialog-actions ng-show="::editor.component.isEditable()">
<md-dialog-actions ng-show="::editor.component.isActionable()">
<md-button class="md-warn" label:aria-label="Delete Task"
ng-show="::editor.component.isErasable"
ng-click="editor.deleteAllOccurrences()">
<var:string label:value="Delete"/>
</md-button>
<div class="md-flex"><!-- spacer --></div>
<md-button ng-click="editor.edit()">
<md-button type="button"
ng-show="::editor.component.isEditable"
ng-click="editor.edit()">
<var:string label:value="Edit"/>
</md-button>
</md-dialog-actions>
<!-- editable and recurrent -->
<md-dialog-actions ng-show="::editor.component.isEditableOccurrence()">
<md-menu>
<md-dialog-actions ng-show="::editor.component.isActionableOccurrence()">
<md-menu ng-show="::editor.component.isErasable">
<md-button class="md-warn"
label:aria-label="Delete Task"
ng-click="$mdMenu.open()"
@@ -162,7 +165,7 @@
</md-menu-content>
</md-menu>
<div class="md-flex"><!-- spacer --></div>
<md-menu>
<md-menu ng-show="::editor.component.isEditable">
<md-button label:aria-label="Edit"
ng-click="$mdMenu.open()"
md-menu-origin="md-menu-origin">