Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-04 23:17:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Vacation filter improvements

Browse source 
New Pgp encrypt/sign popup
This commit is contained in:
RainLoop Team 2015-08-07 00:54:47 +04:00
parent c99a46a118
commit 723c2ac6b8
21 changed files with 470 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rainloop/v/0.0.0/app/templates/Views/User/MailMessageList.html
View file

@ -31,7 +31,7 @@
<div class="btn-group" data-bind="visible: allowMessageListActions">
<a class="btn first btn-dark-disabled-border button-archive" data-tooltip-join="top"
data-bind="visible: isArchiveVisible, command: archiveCommand, tooltip: 'MESSAGE_LIST/BUTTON_ARCHIVE'">
<svg-icon params="icon: 'archive'"></svg-icon>
<i class="icon-archive"></i>
</a>
<a class="btn btn-dark-disabled-border button-spam" data-tooltip-join="top"
data-bind="visible: isSpamVisible, command: spamCommand, tooltip: 'MESSAGE_LIST/BUTTON_SPAM',
@ -46,7 +46,7 @@
<a class="btn last btn-dark-disabled-border button-delete" data-tooltip-join="top"
data-bind="command: deleteCommand, tooltip: 'MESSAGE_LIST/BUTTON_DELETE',
css: {'first': !isArchiveVisible() && !isSpamVisible() && !isUnSpamVisible()}">
<svg-icon params="icon: 'trash'"></svg-icon>
<i class="icon-trash"></i>
<!--<span data-bind="text: printableMessageCountForDeletion()"></span>-->
</a>
</div>

2
rainloop/v/0.0.0/app/templates/Views/User/PopupsFilter.html
View file

@ -40,7 +40,7 @@
</div>
<br />
<a class="btn" data-bind="click: addCondition, i18nInit: true">
<svg-icon params="icon: 'plus'"></svg-icon>
<i class="icon-plus"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n="POPUPS_FILTER/BUTTON_ADD_CONDITION"></span>
</a>

4
rainloop/v/0.0.0/app/templates/Views/User/SettingsFilters.html
View file

@ -9,7 +9,7 @@
<div class="row" data-bind="visible: inited() && !serverError()">
<div class="span5">
<a class="btn" data-bind="click: addFilter">
<svg-icon params="icon: 'plus'"></svg-icon>
<i class="icon-plus"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n="SETTINGS_FILTERS/BUTTON_ADD_FILTER"></span>
</a>
@ -93,7 +93,7 @@
</td>
<td>
<span class="delete-filter" data-bind="visible: !deleteAccess() && canBeDeleted(), click: function (oFilter) { $root.filterForDeletion(oFilter); }">
<svg-icon params="icon: 'trash'"></svg-icon>
<i class="icon-trash"></i>
</span>
</td>
</tr>

2
rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersActionVacation.html
View file

@ -16,7 +16,7 @@
<input type="text" class="span5 i18n" data-bind="value: actionValueFourth"
data-i18n="[placeholder]POPUPS_FILTER/VACATION_RECIPIENTS_LABEL" />
<button class="btn setRecipientsBtn" data-bind="click: setRecipients">
<svg-icon params="icon: 'plus'"></svg-icon>
<i class="icon-plus"></i>
</button>
</div>
</div>

2
rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionDefault.html
View file

@ -7,6 +7,6 @@
&nbsp;
<span class="delete-action button-delete pull-right" style="margin-top: 5px;"
data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">
<svg-icon params="icon: 'trash'"></svg-icon>
<i class="icon-trash"></i>
</span>
</div>

2
rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionMore.html
View file

@ -9,6 +9,6 @@
&nbsp;
<span class="delete-action button-delete pull-right" style="margin-top: 5px;"
data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">
<svg-icon params="icon: 'trash'"></svg-icon>
<i class="icon-trash"></i>
</span>
</div>

2
rainloop/v/0.0.0/app/templates/Views/User/SettingsFiltersConditionSize.html
View file

@ -7,6 +7,6 @@
&nbsp;
<span class="delete-action button-delete pull-right" style="margin-top: 5px;"
data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">
<svg-icon params="icon: 'trash'"></svg-icon>
<i class="icon-trash"></i>
</span>
</div>

6
rainloop/v/0.0.0/app/templates/Views/User/SettingsFolderItem.html
View file

@ -14,15 +14,15 @@
</td>
<td class="delete-folder-parent">
<span class="delete-folder" data-bind="visible: canBeDeleted() && !deleteAccess(), click: function (oFolder) { $root.folderForDeletion(oFolder); }">
<svg-icon params="icon: 'trash'"></svg-icon>
<i class="icon-trash"></i>
</span>
</td>
<td class="subscribe-folder-parent">
<span class="unsubscribe-folder" data-bind="visible: canBeSubScribed() && !subScribed(), click: function(oFolder) { $root.subscribeFolder(oFolder); }">
<svg-icon params="icon: 'eye'"></svg-icon>
<i class="icon-eye"></i>
</span>
<span class="subscribe-folder" data-bind="visible: canBeSubScribed() && subScribed(), click: function(oFolder) { $root.unSubscribeFolder(oFolder); }">
<svg-icon params="icon: 'eye'"></svg-icon>
<i class="icon-eye"></i>
</span>
</td>
<td class="check-folder-parent" data-bind="visible: $root.displaySpecSetting">

18
rainloop/v/0.0.0/app/templates/Views/User/SettingsOpenPGP.html
View file

@ -12,7 +12,7 @@
&nbsp;&nbsp;
<div style="display: inline-block" data-tooltip-join="left" data-bind="tooltip: isHttps ? '' : 'SETTINGS_OPEN_PGP/GENERATE_ONLY_HTTPS'">
<button class="btn" data-bind="click: generateOpenPgpKey, disable: !isHttps">
<svg-icon params="icon: 'key'"></svg-icon>
<i class="icon-key"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/BUTTON_GENERATE_OPEN_PGP_KEYS"></span>
</button>
@ -30,7 +30,9 @@
<!-- ko foreach: openpgpkeysPrivate -->
<tr class="open-pgp-key-item">
<td>
<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PRIVATE"><svg-icon params="icon: 'lock'"></svg-icon></span>
<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PRIVATE">
<i class="icon-lock"></i>
</span>
<span class="open-pgp-key-user" data-bind="text: user"></span>
<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }">
<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
@ -38,12 +40,12 @@
</td>
<td>
<span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (oOpenPGP) { $root.openPgpKeyForDeletion(oOpenPGP); }">
<svg-icon params="icon: 'trash'"></svg-icon>
<i class="icon-trash"></i>
</span>
</td>
<td>
<span class="view-open-pgp-key" data-bind="click: function (oOpenPgpKey) { $root.viewOpenPgpKey(oOpenPgpKey); }">
<svg-icon params="icon: 'eye'"></svg-icon>
<i class="icon-eye"></i>
</span>
</td>
</tr>
@ -51,7 +53,9 @@
<!-- ko foreach: openpgpkeysPublic -->
<tr class="open-pgp-key-item">
<td>
<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PUBLIC"><svg-icon params="icon: 'key'"></svg-icon></span>
<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PUBLIC">
<i class="icon-key"></i>
</span>
<span class="open-pgp-key-user" data-bind="text: user"></span>
(<span class="open-pgp-key-id" data-bind="text: id"></span>)
<a class="btn btn-small btn-small-small btn-danger pull-right button-delete button-delete-transitions" data-bind="css: {'delete-access': deleteAccess()}, click: function(oOpenPGP) { $root.deleteOpenPgpKey(oOpenPGP); }">
@ -60,12 +64,12 @@
</td>
<td>
<span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (oOpenPgpKey) { $root.openPgpKeyForDeletion(oOpenPgpKey); }">
<svg-icon params="icon: 'trash'"></svg-icon>
<i class="icon-trash"></i>
</span>
</td>
<td>
<span class="view-open-pgp-key" data-bind="click: function (oOpenPgpKey) { $root.viewOpenPgpKey(oOpenPgpKey); }">
<svg-icon params="icon: 'eye'"></svg-icon>
<i class="icon-eye"></i>
</span>
</td>
</tr>