mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-22 07:14:21 +00:00
Merge branch 'master' into feature/addMissingStrings2
Conflicts: UI/AdministrationUI/English.lproj/Localizable.strings UI/PreferencesUI/English.lproj/Localizable.strings UI/Templates/PreferencesUI/UIxFilterEditor.wox
This commit is contained in:
commit
9b0a2c5fae
390 files changed
+57470
-27697
No files matched your search
@@ -10,7 +10,7 @@
|
||||
className="UIxPageFrame"
|
||||
>
|
||||
<md-dialog flex="50" flex-sm="100">
|
||||
<md-toolbar class="md-padding">
|
||||
<md-toolbar>
|
||||
<div class="md-toolbar-tools">
|
||||
<md-icon class="material-icons sg-icon-toolbar-bg">account_box</md-icon>
|
||||
<md-input-container>
|
||||
@@ -24,7 +24,7 @@
|
||||
</md-button>
|
||||
</div>
|
||||
</md-toolbar>
|
||||
<md-dialog-content>
|
||||
<md-dialog-content class="md-dialog-content">
|
||||
|
||||
<form id="mainForm" name="accountForm" var:href="ownPath">
|
||||
|
||||
@@ -136,8 +136,8 @@
|
||||
|
||||
</form>
|
||||
</md-dialog-content>
|
||||
<div class="md-actions">
|
||||
<md-dialog-actions>
|
||||
<md-button ng-disabled="$AccountDialogController.accountForm.$invalid" ng-click="$AccountDialogController.save()"><var:string label:value="Save"/></md-button>
|
||||
</div>
|
||||
</md-dialog-actions>
|
||||
</md-dialog>
|
||||
</var:component>
|
||||
@@ -8,20 +8,20 @@
|
||||
xmlns:rsrc="OGo:url"
|
||||
xmlns:uix="OGo:uix"><var:string var:value="doctype" const:escapeHTML="NO" />
|
||||
<md-dialog flex="50" flex-sm="100">
|
||||
<form id="mainForm" var:href="ownPath">
|
||||
<md-toolbar class="md-padding">
|
||||
<form name="mainForm" ng-submit="filterEditor.save(mainForm)">
|
||||
<md-toolbar>
|
||||
<div class="md-toolbar-tools">
|
||||
<md-icon class="material-icons sg-icon-toolbar-bg">filter_list</md-icon>
|
||||
<md-input-container>
|
||||
<label><var:string label:value="Filter name"/></label>
|
||||
<input class="md-title" type="text" ng-model="filter.name" required="required"/>
|
||||
<input class="md-title" type="text" ng-model="filterEditor.filter.name" required="required"/>
|
||||
</md-input-container>
|
||||
<md-button type="button" class="sg-icon-button " ng-click="cancel()">
|
||||
<md-button type="button" class="sg-icon-button " ng-click="filterEditor.cancel()">
|
||||
<md-icon>close</md-icon>
|
||||
</md-button>
|
||||
</div>
|
||||
</md-toolbar>
|
||||
<md-dialog-content>
|
||||
<md-dialog-content class="md-dialog-content">
|
||||
<script type="text/javascript">
|
||||
var filterId = '<var:string value="filterId"/>';
|
||||
var sieveFolderEncoding = '<var:string value="sieveFolderEncoding"/>';
|
||||
@@ -29,9 +29,9 @@
|
||||
</script>
|
||||
|
||||
<div layout="row" layout-align="start center">
|
||||
<div><var:string label:value="For incoming messages that"/></div>
|
||||
<var:string label:value="For incoming messages that"/>
|
||||
<md-input-container class="md-flex">
|
||||
<md-select ng-model="filter.match" required="required">
|
||||
<md-select ng-model="filterEditor.filter.match" required="required">
|
||||
<md-option const:value="all">
|
||||
<var:string label:value="match all of the following rules"/>
|
||||
</md-option>
|
||||
@@ -49,10 +49,10 @@
|
||||
<div layout="column">
|
||||
<div id="filterRules"><!-- empty -->
|
||||
<md-list>
|
||||
<md-list-item ng-repeat="rule in filter.rules">
|
||||
<md-list-item ng-repeat="rule in filterEditor.filter.rules">
|
||||
<md-input-container flex="25">
|
||||
<md-select ng-model="rule.field">
|
||||
<md-option ng-value="key" ng-repeat="(key, value) in fieldLabels">{{ value }}</md-option>
|
||||
<md-option ng-value="key" ng-repeat="(key, value) in filterEditor.fieldLabels">{{ value }}</md-option>
|
||||
</md-select>
|
||||
</md-input-container>
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
|
||||
<md-input-container flex="25" ng-show="rule.field == 'size'">
|
||||
<md-select ng-model="rule.operator">
|
||||
<md-option ng-value="key" ng-repeat="(key, value) in numberOperatorLabels">
|
||||
<md-option ng-value="key" ng-repeat="(key, value) in filterEditor.numberOperatorLabels">
|
||||
{{ value }}
|
||||
</md-option>
|
||||
</md-select>
|
||||
@@ -70,18 +70,18 @@
|
||||
|
||||
<md-input-container flex="25" ng-show="rule.field != 'size'">
|
||||
<md-select ng-model="rule.operator">
|
||||
<md-option ng-value="key" ng-repeat="(key, value) in textOperatorLabels">
|
||||
<md-option ng-value="key" ng-repeat="(key, value) in filterEditor.textOperatorLabels">
|
||||
{{ value }}
|
||||
</md-option>
|
||||
</md-select>
|
||||
</md-input-container>
|
||||
|
||||
<md-input-container class="md-flex">
|
||||
<input type="text" ng-model="rule.value"/>
|
||||
<md-input-container class="md-flex" md-no-float="md-no-float">
|
||||
<input type="text" label:placeholder="Value" ng-model="rule.value"/>
|
||||
</md-input-container>
|
||||
|
||||
<md-button class="sg-icon-button" type="button"
|
||||
ng-click="removeMailFilterRule($index)">
|
||||
ng-click="filterEditor.removeMailFilterRule($index)">
|
||||
<md-icon>remove_circle</md-icon>
|
||||
</md-button>
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
|
||||
<div layout="row" layout-align="end center">
|
||||
<md-button class="sg-icon-button" type="button"
|
||||
ng-click="addMailFilterRule($event)">
|
||||
ng-click="filterEditor.addMailFilterRule($event)">
|
||||
<md-icon>add_circle</md-icon>
|
||||
</md-button>
|
||||
</div>
|
||||
@@ -104,10 +104,10 @@
|
||||
|
||||
<md-list>
|
||||
<md-list-item layout="row" layout-align="space-between center"
|
||||
ng-repeat="action in filter.actions">
|
||||
ng-repeat="action in filterEditor.filter.actions">
|
||||
<md-input-container>
|
||||
<md-select ng-model="action.method">
|
||||
<md-option ng-value="key" ng-repeat="(key, value) in methodLabels">{{ value }}</md-option>
|
||||
<md-option ng-value="key" ng-repeat="(key, value) in filterEditor.methodLabels">{{ value }}</md-option>
|
||||
</md-select>
|
||||
</md-input-container>
|
||||
|
||||
@@ -130,8 +130,10 @@
|
||||
<!-- FILE INTO -->
|
||||
<md-input-container ng-show="action.method == 'fileinto'" >
|
||||
<md-select ng-model="action.argument">
|
||||
<md-option ng-value="item.path" ng-repeat="item in mailboxes">
|
||||
{{ item.name }}
|
||||
<md-option ng-value="item.path" ng-repeat="item in filterEditor.mailboxes">
|
||||
<div ng-class="'sg-child-level-' + item.level">
|
||||
{{ item.name }}
|
||||
</div>
|
||||
</md-option>
|
||||
</md-select>
|
||||
</md-input-container>
|
||||
@@ -153,7 +155,7 @@
|
||||
<!-- nada -->
|
||||
|
||||
<md-button class="sg-icon-button" type="button"
|
||||
ng-click="removeMailFilterAction($index)">
|
||||
ng-click="filterEditor.removeMailFilterAction($index)">
|
||||
<md-icon>remove_circle</md-icon>
|
||||
</md-button>
|
||||
|
||||
@@ -162,15 +164,15 @@
|
||||
|
||||
<div layout="row" layout-align="end center">
|
||||
<md-button class="sg-icon-button" type="button"
|
||||
ng-click="addMailFilterAction($event)">
|
||||
ng-click="filterEditor.addMailFilterAction($event)">
|
||||
<md-icon>add_circle</md-icon>
|
||||
</md-button>
|
||||
</div>
|
||||
</div>
|
||||
</md-dialog-content>
|
||||
<div class="md-actions">
|
||||
<md-button type="button" ng-click="save()"><var:string label:value="Save"/></md-button>
|
||||
</div>
|
||||
<md-dialog-actions>
|
||||
<md-button type="submit"><var:string label:value="Save"/></md-button>
|
||||
</md-dialog-actions>
|
||||
</form>
|
||||
</md-dialog>
|
||||
</container>
|
||||
@@ -24,29 +24,33 @@
|
||||
<script type="text/ng-template" id="preferences.html">
|
||||
<md-sidenav id="left-sidenav" class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$mdMedia('gt-md')" layout="column">
|
||||
<var:component className="UIxSidenavToolbarTemplate" />
|
||||
<md-content md-scroll-y="md-scroll-y" class="md-flex">
|
||||
<md-content md-scroll-y="md-scroll-y" class="md-flex md-hue-2">
|
||||
<md-list>
|
||||
<md-list-item ng-click="app.go('general')"
|
||||
ui-sref="preferences.general"
|
||||
ui-sref-active="sg-active">
|
||||
ui-sref-active="md-default-theme md-background md-bg md-hue-1">
|
||||
<md-icon>settings</md-icon>
|
||||
<p class="sg-item-name"><var:string label:value="General"/></p>
|
||||
</md-list-item>
|
||||
<var:if condition="userHasCalendarAccess">
|
||||
<md-list-item ng-click="app.go('calendars')"
|
||||
ui-sref="preferences.calendars"
|
||||
ui-sref-active="sg-active">
|
||||
ui-sref-active="md-default-theme md-background md-bg md-hue-1">
|
||||
<md-icon>event</md-icon>
|
||||
<p class="sg-item-name"><var:string label:value="Calendar"/></p>
|
||||
</md-list-item>
|
||||
</var:if>
|
||||
<md-list-item ng-click="app.go('addressbooks')"
|
||||
ui-sref="preferences.addressbooks"
|
||||
ui-sref-active="sg-active">
|
||||
ui-sref-active="md-default-theme md-background md-bg md-hue-1">
|
||||
<md-icon>contacts</md-icon>
|
||||
<p class="sg-item-name"><var:string label:value="Contacts"/></p>
|
||||
</md-list-item>
|
||||
<var:if condition="userHasMailAccess">
|
||||
<md-list-item ng-click="app.go('mailer')"
|
||||
ui-sref="preferences.mailer"
|
||||
ui-sref-active="sg-active">
|
||||
ui-sref-active="md-default-theme md-background md-bg md-hue-1">
|
||||
<md-icon>email</md-icon>
|
||||
<p class="sg-item-name"><var:string label:value="Mail"/></p>
|
||||
</md-list-item>
|
||||
</var:if>
|
||||
@@ -58,7 +62,7 @@
|
||||
|
||||
<!-- TOP RIGHT TOOLBAR -->
|
||||
<md-toolbar layout="row" layout-align="space-between start" class="md-tall">
|
||||
<div class="md-toolbar-tools md-toolbar-tools-top sg-padded" layout="row" layout-align="space-between start">
|
||||
<div class="md-toolbar-tools md-toolbar-tools-top" layout="row" layout-align="space-between start">
|
||||
<var:component className="UIxTopnavToolbarTemplate" />
|
||||
</div>
|
||||
<md-button type="button" class="md-fab md-fab-bottom-right md-fab-overlap-bottom"
|
||||
@@ -96,7 +100,8 @@
|
||||
<div flex="50">
|
||||
<md-input-container>
|
||||
<label><var:string label:value="Language"/></label>
|
||||
<md-select ng-model="app.preferences.defaults.SOGoLanguage">
|
||||
<md-select ng-model="app.preferences.defaults.SOGoLanguage"
|
||||
ng-change="app.onLanguageChange()">
|
||||
<var:foreach list="languages" item="item">
|
||||
<md-option var:value="item">
|
||||
<var:string value="languageText"/>
|
||||
@@ -180,6 +185,17 @@
|
||||
</var:foreach>
|
||||
</md-select>
|
||||
</md-input-container>
|
||||
|
||||
<md-input-container>
|
||||
<label><var:string label:value="Alternate Avatar"/></label>
|
||||
<md-select ng-model="app.preferences.defaults.SOGoAlternateAvatar">
|
||||
<var:foreach list="alternateAvatar" item="item">
|
||||
<md-option var:value="item">
|
||||
<var:string value="itemAlternateAvatarText"/>
|
||||
</md-option>
|
||||
</var:foreach>
|
||||
</md-select>
|
||||
</md-input-container>
|
||||
</div>
|
||||
</md-content>
|
||||
</md-tab>
|
||||
@@ -345,11 +361,10 @@
|
||||
ng-repeat="item in
|
||||
app.preferences.defaults.SOGoCalendarCategories
|
||||
track by $index">
|
||||
<i class="md-avatar" ng-style="{'background-color': app.preferences.defaults.SOGoCalendarCategoriesColors[item]}">
|
||||
<sg-color-picker sg-on-select="app.preferences.defaults.SOGoCalendarCategoriesColors[item] = color"><!-- color picker--></sg-color-picker>
|
||||
</i>
|
||||
<sg-color-picker ng-model="app.preferences.defaults.SOGoCalendarCategoriesColors[item]"><!-- color picker--></sg-color-picker>
|
||||
<md-input-container>
|
||||
<input type="text" label:aria-label="Calendar Category" ng-model="app.preferences.defaults.SOGoCalendarCategories[$index]"/>
|
||||
<input type="text" label:aria-label="Calendar Category"
|
||||
ng-model="app.preferences.defaults.SOGoCalendarCategories[$index]"/>
|
||||
</md-input-container>
|
||||
<md-button class="sg-icon-button" type="button"
|
||||
layout="row" layout-align="end center"
|
||||
@@ -600,7 +615,7 @@
|
||||
<input type="text" ng-model="app.preferences.defaults.SOGoSieveFilters[$index].name"/>
|
||||
</md-input-container>
|
||||
<md-button class="sg-icon-button" type="button"
|
||||
ng-click="app.editMailFilter($index)"
|
||||
ng-click="app.editMailFilter($event, $index)"
|
||||
layout="row" layout-align="end center"
|
||||
label:aria-label="Edit Filter">
|
||||
<md-icon>edit</md-icon>
|
||||
@@ -637,9 +652,7 @@
|
||||
<md-list-item flex="50"
|
||||
ng-repeat="(key, value) in
|
||||
app.preferences.defaults.SOGoMailLabelsColors">
|
||||
<i class="md-avatar" ng-style="{'background-color': value[1]}">
|
||||
<sg-color-picker sg-on-select="value[1] = color"><!-- color picker--></sg-color-picker>
|
||||
</i>
|
||||
<sg-color-picker ng-model="value[1]"><!-- color picker--></sg-color-picker>
|
||||
<md-input-container>
|
||||
<input type="text"
|
||||
label:aria-label="Label"
|
||||
@@ -668,7 +681,7 @@
|
||||
<!-- MAIL > ACCOUNTS -->
|
||||
<md-tab id="mailAccountsTab"
|
||||
aria-controls="mailAccountsTab-content"
|
||||
label:label="Accounts">
|
||||
label:label="IMAP Accounts">
|
||||
|
||||
<md-list class="sg-padded">
|
||||
<md-list-item ng-repeat="item in
|
||||
@@ -765,7 +778,7 @@
|
||||
<var:string label:value="Do not send responses to mailing lists" />
|
||||
</md-checkbox>
|
||||
|
||||
<div layout="row" layout-align="end center">
|
||||
<div layout="row" layout-align="start center">
|
||||
<md-checkbox
|
||||
ng-model="app.preferences.defaults.Vacation.endDateEnabled"
|
||||
ng-true-value="1"
|
||||
|
||||
Reference in new issue
Block a user