amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-17 12:35:57 +00:00
Code Issues Projects Releases Wiki Activity

(js,html) Improve IMAP subscriptions manager

Browse Source
This commit is contained in:
Francis Lachapelle
2016-09-30 12:02:46 -04:00
parent f233b2a9a7
commit 268b8ea1c3
4 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
UI/MailerUI/English.lproj/Localizable.strings
View File

@@ -367,5 +367,8 @@
/* Subscriptions Dialog */
"Manage Subscriptions" = "Manage Subscriptions";
/* Label of filter input field in subscriptions dialog */
"Filter" = "Filter";
/* Hotkey to write a new message */
"hotkey_compose" = "w";

20
UI/Templates/MailerUI/UIxMailFolderSubscriptions.wox
View File

@@ -22,15 +22,20 @@
</md-toolbar>
<md-dialog-content class="md-dialog-content" layout="column">
<div layout="row" layout-align="center center"
ng-if="subscriptions.loading">
<md-progress-circular class="md-accent"
md-mode="indeterminate"><!-- progress --></md-progress-circular>
</div>
<md-list>
<md-list-item ng-repeat="folder in subscriptions.account.$flattenMailboxes({all: true })"
<md-list-item ng-repeat="folder in subscriptions.account.$flattenMailboxes({all: true }) | filter:subscriptions.filter"
md-item-size="48"
ng-hide="subscriptions.app.metadataForFolder(folder).special">
ng-hide="subscriptions.metadataForFolder(folder).special">
<div ng-class="'sg-child-level-' + folder.level">
<md-icon>{{subscriptions.app.metadataForFolder(folder).icon}}</md-icon>
<md-icon>{{subscriptions.metadataForFolder(folder).icon}}</md-icon>
</div>
<p class="sg-item-name">
{{subscriptions.app.metadataForFolder(folder).name}}
{{subscriptions.metadataForFolder(folder).name}}
</p>
<md-checkbox class="md-secondary"
ng-model="folder.subscribed"
@@ -42,8 +47,11 @@
</md-list>
</md-dialog-content>
<md-dialog-actions>
<md-button type="button" ng-click="subscriptions.close()"><var:string label:value="Close"/></md-button>
<md-dialog-actions ng-hide="subscriptions.loading">
<md-input-container class="md-flex" md-no-float="md-no-float">
<md-icon>search</md-icon>
<input ng-model="subscriptions.filter.name" type="search" label:placeholder="Filter"/>
</md-input-container>
</md-dialog-actions>
</md-dialog>

10
UI/WebServerResources/js/Mailer/Account.service.js
View File

@@ -8,7 +8,7 @@
* @constructor
* @param {object} futureAccountData
*/
function Account(futureAccountData, fetchAll) {
function Account(futureAccountData) {
// Data is immediately available
if (typeof futureAccountData.then !== 'function') {
angular.extend(this, futureAccountData);
@@ -24,14 +24,6 @@
// The promise will be unwrapped first
//this.$unwrap(futureAccountData);
}
this.fetchAll = false;
// Check if we're displaying the IMAP subscription management dialog
if (angular.isDefined(fetchAll) && fetchAll) {
this.fetchAll = true;
this.$getMailboxes();
}
}
/**

23
UI/WebServerResources/js/Mailer/MailboxesController.js
View File

@@ -187,7 +187,7 @@
clickOutsideToClose: true,
escapeToClose: true,
locals: {
srcApp: vm,
metadataForFolder: metadataForFolder,
srcAccount: account
}
}).finally(function() {
@@ -197,16 +197,25 @@
/**
* @ngInject
*/
SubscriptionsDialogController.$inject = ['$scope', '$mdDialog', 'srcApp', 'srcAccount'];
function SubscriptionsDialogController($scope, $mdDialog, srcApp, srcAccount) {
SubscriptionsDialogController.$inject = ['$scope', '$mdDialog', 'metadataForFolder', 'srcAccount'];
function SubscriptionsDialogController($scope, $mdDialog, metadataForFolder, srcAccount) {
var vm = this;
vm.app = srcApp;
vm.account = new Account({id: srcAccount.id,
name: srcAccount.name},
true);
vm.loading = true;
vm.filter = { name: '' };
vm.metadataForFolder = metadataForFolder;
vm.account = new Account({
id: srcAccount.id,
name: srcAccount.name
});
vm.close = close;
vm.account.$getMailboxes().then(function() {
vm.loading = false;
});
function close() {
$mdDialog.cancel();
}