mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-14 07:55:28 +00:00
(html) Move 'Delete' button with action buttons
In appointment and task viewers.
This commit is contained in:
Francis Lachapelle
@@ -17,32 +17,6 @@
|
||||
<!-- priority -->
|
||||
<md-icon ng-repeat="i in ::editor.component.priority | range">star</md-icon>
|
||||
</div>
|
||||
<md-button class="md-icon-button"
|
||||
label:aria-label="Delete Event"
|
||||
ng-show="editor.component.isEditable() || editor.component.isInvitation()"
|
||||
ng-click="editor.deleteAllOccurrences()">
|
||||
<md-icon>delete</md-icon>
|
||||
</md-button>
|
||||
<md-menu ng-show="editor.component.isEditableOccurrence() || editor.component.isInvitationOccurrence()">
|
||||
<md-button type="button" class="md-icon-button"
|
||||
label:aria-label="Delete Event"
|
||||
ng-click="$mdOpenMenu()"
|
||||
md-menu-origin="md-menu-origin"><md-icon>delete</md-icon></md-button>
|
||||
<md-menu-content>
|
||||
<md-menu-item>
|
||||
<md-button type="button" class="md-warn"
|
||||
ng-click="editor.deleteOccurrence()">
|
||||
<var:string label:value="Delete This Occurrence"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
<md-menu-item>
|
||||
<md-button type="button" class="md-warn"
|
||||
ng-click="editor.deleteAllOccurrences()">
|
||||
<var:string label:value="Delete All Occurrences"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
</md-menu-content>
|
||||
</md-menu>
|
||||
<md-menu>
|
||||
<md-button label:aria-label="More options" class="sg-icon-button" ng-click="$mdOpenMenu($event)">
|
||||
<md-icon>more_vert</md-icon>
|
||||
@@ -213,32 +187,96 @@
|
||||
<span ng-show="editor.component.$hasAlarm"><var:component className="UIxReminderEditor" /></span>
|
||||
</div>
|
||||
</md-dialog-content>
|
||||
|
||||
<!-- actions -->
|
||||
<div class="md-actions" ng-show="editor.component.isEditable()">
|
||||
|
||||
<!-- editable but not recurrent -->
|
||||
<md-dialog-actions ng-show="editor.component.isEditable()">
|
||||
<md-button class="md-warn"
|
||||
label:aria-label="Delete Event"
|
||||
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()">
|
||||
<var:string label:value="Edit"/>
|
||||
</md-button>
|
||||
</div>
|
||||
<div class="md-actions" ng-show="editor.component.isEditableOccurrence()">
|
||||
</md-dialog-actions>
|
||||
<!-- editable and recurrent -->
|
||||
<md-dialog-actions ng-show="editor.component.isEditableOccurrence()">
|
||||
<md-menu>
|
||||
<md-button class="md-warn"
|
||||
label:aria-label="Delete Event"
|
||||
ng-click="$mdOpenMenu()"
|
||||
md-menu-origin="md-menu-origin">
|
||||
<var:string label:value="Delete"/> <md-icon>arrow_drop_down</md-icon>
|
||||
</md-button>
|
||||
<md-menu-content>
|
||||
<md-menu-item>
|
||||
<md-button class="md-warn"
|
||||
ng-click="editor.deleteOccurrence()">
|
||||
<var:string label:value="Delete This Occurrence"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
<md-menu-item>
|
||||
<md-button class="md-warn"
|
||||
ng-click="editor.deleteAllOccurrences()">
|
||||
<var:string label:value="Delete All Occurrences"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
</md-menu-content>
|
||||
</md-menu>
|
||||
<div class="md-flex"><!-- spacer --></div>
|
||||
<md-button type="button" ng-click="editor.editAllOccurrences()">
|
||||
<var:string label:value="Edit All Occurrences"/>
|
||||
</md-button>
|
||||
<md-button type="button" ng-click="editor.edit()">
|
||||
<var:string label:value="Edit This Occurrence"/>
|
||||
</md-button>
|
||||
</div>
|
||||
<div class="md-actions" ng-show="editor.component.isInvitation()">
|
||||
</md-dialog-actions>
|
||||
<!-- invitation but not recurrent -->
|
||||
<md-dialog-actions ng-show="editor.component.isInvitation()">
|
||||
<md-button class="md-warn"
|
||||
label:aria-label="Delete Event"
|
||||
ng-click="editor.deleteAllOccurrences()">
|
||||
<var:string label:value="Delete"/>
|
||||
</md-button>
|
||||
<div class="md-flex"><!-- spacer --></div>
|
||||
<md-button type="button" ng-click="editor.reply()">
|
||||
<var:string label:value="Update"/>
|
||||
</md-button>
|
||||
</div>
|
||||
<div class="md-actions" ng-show="editor.component.isInvitationOccurrence()">
|
||||
</md-dialog-actions>
|
||||
<!-- invitation and recurrent -->
|
||||
<md-dialog-actions ng-show="editor.component.isInvitationOccurrence()">
|
||||
<md-menu>
|
||||
<md-button class="md-warn"
|
||||
label:aria-label="Delete Event"
|
||||
ng-click="$mdOpenMenu()"
|
||||
md-menu-origin="md-menu-origin">
|
||||
<var:string label:value="Delete"/>
|
||||
</md-button>
|
||||
<md-menu-content>
|
||||
<md-menu-item>
|
||||
<md-button class="md-warn"
|
||||
ng-click="editor.deleteOccurrence()">
|
||||
<var:string label:value="Delete This Occurrence"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
<md-menu-item>
|
||||
<md-button class="md-warn"
|
||||
ng-click="editor.deleteAllOccurrences()">
|
||||
<var:string label:value="Delete All Occurrences"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
</md-menu-content>
|
||||
</md-menu>
|
||||
<div class="md-flex"><!-- spacer --></div>
|
||||
<md-button type="button" ng-click="editor.replyAllOccurrences()">
|
||||
<var:string label:value="Update All Occurrences"/>
|
||||
</md-button>
|
||||
<md-button type="button" ng-click="editor.reply()">
|
||||
<var:string label:value="Update This Occurrence"/>
|
||||
</md-button>
|
||||
</div>
|
||||
</md-dialog-actions>
|
||||
</md-dialog>
|
||||
</container>
|
||||
|
||||
@@ -13,36 +13,10 @@
|
||||
<md-icon ng-if="editor.component.classification == 'confidential'">visibility_off</md-icon>
|
||||
<md-icon ng-if="editor.component.classification == 'private'">vpn_key</md-icon>
|
||||
<!-- summary -->
|
||||
{{editor.component.summary}}
|
||||
{{::editor.component.summary}}
|
||||
<!-- priority -->
|
||||
<md-icon ng-repeat="i in editor.component.priority | range">star</md-icon>
|
||||
<md-icon ng-repeat="i in ::editor.component.priority | range">star</md-icon>
|
||||
</div>
|
||||
<md-button class="md-icon-button"
|
||||
label:aria-label="Delete Task"
|
||||
ng-show="editor.component.isEditable() || editor.component.isInvitation()"
|
||||
ng-click="editor.deleteAllOccurrences()">
|
||||
<md-icon>delete</md-icon>
|
||||
</md-button>
|
||||
<md-menu ng-show="editor.component.isEditableOccurrence() || editor.component.isInvitationOccurrence()">
|
||||
<md-button type="button" class="md-icon-button"
|
||||
label:aria-label="Delete Task"
|
||||
ng-click="$mdOpenMenu()"
|
||||
md-menu-origin="md-menu-origin"><md-icon>delete</md-icon></md-button>
|
||||
<md-menu-content>
|
||||
<md-menu-item>
|
||||
<md-button type="button" class="md-warn"
|
||||
ng-click="editor.deleteOccurrence()">
|
||||
<var:string label:value="Delete This Occurrence"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
<md-menu-item>
|
||||
<md-button type="button" class="md-warn"
|
||||
ng-click="editor.deleteAllOccurrences()">
|
||||
<var:string label:value="Delete All Occurrences"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
</md-menu-content>
|
||||
</md-menu>
|
||||
<md-menu>
|
||||
<md-button label:aria-label="More options" class="sg-icon-button" ng-click="$mdOpenMenu($event)">
|
||||
<md-icon>more_vert</md-icon>
|
||||
@@ -56,7 +30,7 @@
|
||||
</md-menu-item>
|
||||
</md-menu-content>
|
||||
</md-menu>
|
||||
<md-button class="md-icon-button" ng-click="editor.close()">
|
||||
<md-button class="sg-icon-button" ng-click="editor.close()">
|
||||
<md-icon label:aria-label="Close">close</md-icon>
|
||||
</md-button>
|
||||
</div>
|
||||
@@ -130,10 +104,37 @@
|
||||
</md-list>
|
||||
</md-dialog-content>
|
||||
<!-- edit -->
|
||||
<div class="md-actions" ng-show="editor.component.isEditable()">
|
||||
<md-dialog-actions ng-show="editor.component.isEditable()">
|
||||
<md-button class="md-warn" label:aria-label="Delete Task"
|
||||
ng-show="editor.component.isEditable() || editor.component.isInvitation()"
|
||||
ng-click="editor.deleteAllOccurrences()">
|
||||
<var:string label:value="Delete"/>
|
||||
</md-button>
|
||||
<md-menu ng-show="editor.component.isEditableOccurrence() || editor.component.isInvitationOccurrence()">
|
||||
<md-button class="md-warn" label:aria-label="Delete Task"
|
||||
ng-click="$mdOpenMenu()"
|
||||
md-menu-origin="md-menu-origin">
|
||||
<var:string label:value="Delete"/><md-icon>arrow_drop_down</md-icon>
|
||||
</md-button>
|
||||
<md-menu-content>
|
||||
<md-menu-item>
|
||||
<md-button class="md-warn"
|
||||
ng-click="editor.deleteOccurrence()">
|
||||
<var:string label:value="Delete This Occurrence"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
<md-menu-item>
|
||||
<md-button class="md-warn"
|
||||
ng-click="editor.deleteAllOccurrences()">
|
||||
<var:string label:value="Delete All Occurrences"/>
|
||||
</md-button>
|
||||
</md-menu-item>
|
||||
</md-menu-content>
|
||||
</md-menu>
|
||||
<div class="md-flex"><!-- spacer --></div>
|
||||
<md-button ng-click="editor.edit()">
|
||||
<var:string label:value="Edit"/>
|
||||
</md-button>
|
||||
</div>
|
||||
</md-dialog-actions>
|
||||
</md-dialog>
|
||||
</container>
|
||||
|
||||
Reference in New Issue
Block a user