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

Fix: Can not view OpenPGP key (#1200)

Browse source
This commit is contained in:
RainLoop Team 2016-09-30 16:42:38 +03:00
parent 0bbb2f14a4
commit 760d9e6243
2 changed files with 92 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dev/View/Popup/ViewOpenPgpKey.js
View file

@ -10,7 +10,7 @@ import {AbstractViewNext} from 'Knoin/AbstractViewNext';
@popup({ @popup({
name: 'View/Popup/ViewOpenPgpKey', name: 'View/Popup/ViewOpenPgpKey',
templateID: 'PopupsTwoFactorTest' templateID: 'PopupsViewOpenPgpKey'
}) })
class ViewOpenPgpKeyPopupView extends AbstractViewNext class ViewOpenPgpKeyPopupView extends AbstractViewNext
{ {
@ -35,12 +35,12 @@ class ViewOpenPgpKeyPopupView extends AbstractViewNext
} }
} }
onShow(oOpenPgpKey) { onShow(openPgpKey) {
this.clearPopup(); this.clearPopup();
if (oOpenPgpKey) if (openPgpKey)
{ {
this.key(oOpenPgpKey.armor); this.key(openPgpKey.armor);
} }
} }

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

@ -1,88 +1,88 @@
<div class="b-settings-open-pgp g-ui-user-select-none"> <div class="b-settings-open-pgp g-ui-user-select-none">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="legend"> <div class="legend">
<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/LEGEND_OPEN_PGP"></span> <span class="i18n" data-i18n="SETTINGS_OPEN_PGP/LEGEND_OPEN_PGP"></span>
</div> </div>
</div> </div>
<button class="btn" data-bind="click: addOpenPgpKey"> <button class="btn" data-bind="click: addOpenPgpKey">
<i class="icon-list-add"></i> <i class="icon-list-add"></i>
&nbsp;&nbsp; &nbsp;&nbsp;
<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/BUTTON_ADD_OPEN_PGP_KEY"></span> <span class="i18n" data-i18n="SETTINGS_OPEN_PGP/BUTTON_ADD_OPEN_PGP_KEY"></span>
</button> </button>
&nbsp;&nbsp; &nbsp;&nbsp;
<div style="display: inline-block" data-tooltip-join="left" data-bind="tooltip: isHttps ? '' : 'SETTINGS_OPEN_PGP/GENERATE_ONLY_HTTPS'"> <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"> <button class="btn" data-bind="click: generateOpenPgpKey, disable: !isHttps">
<i class="icon-key"></i> <i class="icon-key"></i>
&nbsp;&nbsp; &nbsp;&nbsp;
<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/BUTTON_GENERATE_OPEN_PGP_KEYS"></span> <span class="i18n" data-i18n="SETTINGS_OPEN_PGP/BUTTON_GENERATE_OPEN_PGP_KEYS"></span>
</button> </button>
</div> </div>
<br /> <br />
<br /> <br />
<br /> <br />
<table class="table table-hover list-table" data-bind="i18nUpdate: openpgpkeys"> <table class="table table-hover list-table" data-bind="i18nUpdate: openpgpkeys">
<colgroup> <colgroup>
<col /> <col />
<col style="width: 1%" /> <col style="width: 1%" />
<col style="width: 1%" /> <col style="width: 1%" />
</colgroup> </colgroup>
<tbody> <tbody>
<!-- ko foreach: openpgpkeysPrivate --> <!-- ko foreach: openpgpkeysPrivate -->
<tr class="open-pgp-key-item"> <tr class="open-pgp-key-item">
<td> <td>
<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PRIVATE"> <span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PRIVATE">
<i class="icon-lock"></i> <i class="icon-lock"></i>
</span> </span>
<span class="open-pgp-key-user"> <span class="open-pgp-key-user">
<!-- ko foreach: users --> <!-- ko foreach: users -->
<div class="open-pgp-key-user-address" data-bind="text: $data"></div> <div class="open-pgp-key-user-address" data-bind="text: $data"></div>
<!-- /ko --> <!-- /ko -->
</span> </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); }"> <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(openPgpKey) { $root.deleteOpenPgpKey(openPgpKey); }">
<span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span> <span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
</a> </a>
</td> </td>
<td> <td>
<span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (oOpenPGP) { $root.openPgpKeyForDeletion(oOpenPGP); }"> <span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (openPgpKey) { $root.openPgpKeyForDeletion(openPgpKey); }">
<i class="icon-trash"></i> <i class="icon-trash"></i>
</span> </span>
</td> </td>
<td> <td>
<span class="view-open-pgp-key" data-bind="click: function (oOpenPgpKey) { $root.viewOpenPgpKey(oOpenPgpKey); }"> <span class="view-open-pgp-key" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">
<i class="icon-eye"></i> <i class="icon-eye"></i>
</span> </span>
</td> </td>
</tr> </tr>
<!-- /ko --> <!-- /ko -->
<!-- ko foreach: openpgpkeysPublic --> <!-- ko foreach: openpgpkeysPublic -->
<tr class="open-pgp-key-item"> <tr class="open-pgp-key-item">
<td> <td>
<span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PUBLIC"> <span class="open-pgp-key-img i18n" data-i18n="[title]SETTINGS_OPEN_PGP/TITLE_PUBLIC">
<i class="icon-key"></i> <i class="icon-key"></i>
</span> </span>
<span class="open-pgp-key-user"> <span class="open-pgp-key-user">
<!-- ko foreach: users --> <!-- ko foreach: users -->
<div class="open-pgp-key-user-address"> <div class="open-pgp-key-user-address">
<span data-bind="text: $data"></span> (<span class="open-pgp-key-id" data-bind="text: $parent.id"></span>) <span data-bind="text: $data"></span> (<span class="open-pgp-key-id" data-bind="text: $parent.id"></span>)
</div> </div>
<!-- /ko --> <!-- /ko -->
</span> </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); }"> <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> <span class="i18n" data-i18n="SETTINGS_OPEN_PGP/DELETING_ASK"></span>
</a> </a>
</td> </td>
<td> <td>
<span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (oOpenPgpKey) { $root.openPgpKeyForDeletion(oOpenPgpKey); }"> <span class="delete-open-pgp-key" data-bind="visible: !deleteAccess(), click: function (openPgpKey) { $root.openPgpKeyForDeletion(openPgpKey); }">
<i class="icon-trash"></i> <i class="icon-trash"></i>
</span> </span>
</td> </td>
<td> <td>
<span class="view-open-pgp-key" data-bind="click: function (oOpenPgpKey) { $root.viewOpenPgpKey(oOpenPgpKey); }"> <span class="view-open-pgp-key" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">
<i class="icon-eye"></i> <i class="icon-eye"></i>
</span> </span>
</td> </td>
</tr> </tr>
<!-- /ko --> <!-- /ko -->
</tbody> </tbody>
</table> </table>
</div> </div>