LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

(html) Fix progress indicators of import dialogs

pull/225/head
Francis Lachapelle 2016-10-17 12:04:18 -04:00
parent 069ea4142e
commit 37089e15c1
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -9,7 +9,8 @@ Bug fixes
- [web] fixed tasks list when some weekdays are disabled
- [web] fixed automatic refresh of calendar view
- [web] respect SOGoSearchMinimumWordLength in contacts list editor
- [web] improve memory usage when importing very large address books
- [web] improved memory usage when importing very large address books
- [web] fixed progress indicator while importing cards or events and tasks
- [core] only consider SMTP addresses for AD's proxyAddresses (#3842)

23
UI/Templates/ContactsUI/UIxContactFoldersView.wox
View File

@ -339,7 +339,7 @@
</md-button>
<md-button class="sg-icon-button"
ng-show="addressbook.selectedFolder.acls.objectEraser"
ng-click="addressbook.confirmDeleteSelectedCards()">
ng-click="addressbook.confirmDeleteSelectedCards($event)">
<md-icon>delete</md-icon>
</md-button>
<md-menu>
@ -542,11 +542,22 @@
<p><var:string label:value="Select a vCard or LDIF file."/></p>
</md-dialog-content>
<md-dialog-actions>
<md-progress-circular class="md-accent"
md-mode="determinate"
md-diameter="20px"
ng-disabled="!$CardsImportDialogController.uploader.isUploading"
ng-value="$CardsImportDialogController.uploader.progress"><!-- progress --></md-progress-circular>
<div layout="row" layout-align="space-around" class="md-flex"
ng-if="$CardsImportDialogController.uploader.isUploading">
<md-progress-circular class="md-accent"
md-mode="determinate"
md-diameter="25"
ng-if="$CardsImportDialogController.uploader.progress != 100"
value="{{$CardsImportDialogController.uploader.progress}}">
<!-- while uploading -->
</md-progress-circular>
<md-progress-circular class="md-warn"
md-mode="indeterminate"
md-diameter="25"
ng-if="$CardsImportDialogController.uploader.progress == 100">
<!-- while waiting for server's response -->
</md-progress-circular>
</div>
<label class="md-button" for="file-input" ng-hide="$CardsImportDialogController.uploader.isUploading">
<span><var:string label:value="Upload"/></span>
</label>

21
UI/Templates/SchedulerUI/UIxCalMainView.wox
View File

@ -721,11 +721,22 @@
<p><var:string label:value="Select an ICS file."/></p>
</md-dialog-content>
<md-dialog-actions>
<md-progress-circular class="md-accent"
md-mode="determinate"
md-diameter="20px"
ng-disabled="!$CalendarImportDialogController.uploader.isUploading"
ng-value="$CalendarImportDialogController.uploader.progress"><!-- progress --></md-progress-circular>
<div layout="row" layout-align="space-around" class="md-flex"
ng-if="$CalendarImportDialogController.uploader.isUploading">
<md-progress-circular class="md-accent"
md-mode="determinate"
md-diameter="25"
ng-if="$CalendarImportDialogController.uploader.progress != 100"
value="{{$CalendarImportDialogController.uploader.progress}}">
<!-- while uploading -->
</md-progress-circular>
<md-progress-circular class="md-warn"
md-mode="indeterminate"
md-diameter="25"
ng-if="$CalendarImportDialogController.uploader.progress == 100">
<!-- while waiting for server's response -->
</md-progress-circular>
</div>
<label class="md-button" for="file-input" ng-hide="$CalendarImportDialogController.uploader.isUploading">
<span><var:string label:value="Upload"/></span>
</label>