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

revert decrypt button enabling; allow to select sign key

Browse source
This commit is contained in:
Carles Escrig Royo 2016-04-20 19:56:14 +02:00
parent 12f619bda7
commit 412ba464c8
No known key found for this signature in database
GPG key ID: 5E6F07C704111773
5 changed files with 129 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

39
rainloop/v/0.0.0/app/templates/Views/User/PopupsComposeOpenPgp.html
View file

@ -20,23 +20,23 @@
label: 'POPUPS_COMPOSE_OPEN_PGP/LABEL_SIGN',
value: sign
}
}"></div>
}, click: updateCommand "></div>
<div class="key-list" data-bind="visible: sign">
<div class="key-list-wrp empty" data-bind="visible: !signKey()">
No private key found
</div>
<div class="key-list-wrp" data-bind="visible: signKey">
<div class="key-list-wrp" data-bind="visible: signKey()">
<div class="key-list__item row-fluid">
<div class="key-list__item-hash span4">
(<span data-bind="text: signKey() ? signKey().hash : ''"></span>)
</div>
<div class="key-list__item-names span8">
<div data-bind="if: signKey()">
<div data-bind="foreach: signKey().users">
<div class="key-list__item-name" data-bind="text: $data"></div>
</div>
</div>
<!-- ko if: signKey() -->
<!-- ko foreach: signKey().users -->
<div class="key-list__item-name" data-bind="text: $data"></div>
<!-- /ko -->
<!-- /ko -->
</div>
</div>
</div>
@ -57,9 +57,9 @@
No public keys selected
</div>
<div class="key-list-wrp" data-bind="visible: encryptKeys() && encryptKeys().length > 0">
<div data-bind="foreach: encryptKeys">
<!-- ko foreach: encryptKeys -->
<div class="key-list__item row-fluid">
<div class="key-list__item-delete span1" data-bind="click: removable ? $parent.deletePublickKey : null, css: {'disabled': !removable}">
<div class="key-list__item-delete span1" data-bind="click: removable() ? $parent.deletePublickKey : null, css: {'disabled': !removable()}">
<i class="icon-trash"></i>
</div>
<div class="key-list__item-hash span3" data-bind="visible: !empty">
@ -67,31 +67,36 @@
</div>
<div class="span8">
<span class="key-list__item-names" data-bind="css: {'empty': empty}">
<span data-bind="foreach: users">
<div class="key-list__item-name" data-bind="text: $data"></div>
</span>
<!-- ko foreach: users -->
<div class="key-list__item-name" data-bind="text: $data"></div>
<!-- /ko -->
</span>
<span class="key-list__item-error" data-bind="visible: empty">
(Public key not found)
</span>
</div>
</div>
</div>
<!-- /ko -->
</div>
</div>
</div>
</div>
<div class="row-fluid key-actions">
<div class="span5">
<div class="span5" data-bind="visible: sign() && 0 < privateKeysOptions().length">
<input type="password" class="inputPassword input-block-level i18n"
autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
data-i18n="[placeholder]POPUPS_COMPOSE_OPEN_PGP/LABEL_PASSWORD"
data-bind="visible: sign, textInput: password, hasfocus: password.focus, onEnter: doCommand" />
data-bind="textInput: password, hasfocus: password.focus, onEnter: doCommand" />
<div class="form-inline">
<select class="input-block-level" data-bind="options: privateKeysOptions, value: selectedPrivateKey,
optionsCaption: privateKeysOptionsCaption, optionsText: 'name', optionsValue: 'id',
optionsAfterRender: addOptionClass"></select>
</div>
</div>
<div class="span7" data-bind="visible: encrypt() && 0 < publicKeysOptions().length">
<div class="form-inline">
<select class="input-block-level" data-bind="options: publicKeysOptions, value: selectedPublicKey,
optionsCaption: optionsCaption, optionsText: 'name', optionsValue: 'id',
optionsCaption: publicKeysOptionsCaption, optionsText: 'name', optionsValue: 'id',
optionsAfterRender: addOptionClass"></select>
</div>
</div>
@ -99,7 +104,7 @@
</div>
<div class="modal-footer">
<button class="btn buttonDo" data-bind="command: doCommand, hasfocus: buttonFocus,
enable: (sign() || encrypt()) && (!sign() || (sign() && password().length)) && (!encrypt() || encrypt() && encryptKeys().length > 0)">
enable: (sign() || encrypt()) && (!encrypt() || encrypt() && encryptKeys().length > 0)">
<i data-bind="css: {'icon-key': !submitRequest(), 'icon-spinner animated': submitRequest()}"></i>
&nbsp;&nbsp;
<span class="i18n" data-bind="visible: sign() && !encrypt()" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_SIGN"></span>

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

@ -43,7 +43,7 @@
</div>
</div>
<div class="modal-footer">
<button class="btn buttonDo" data-bind="command: doCommand, hasfocus: buttonFocus, enable: password().length > 0">
<button class="btn buttonDo" data-bind="command: doCommand, hasfocus: buttonFocus">
<i data-bind="css: {'icon-key': !submitRequest(), 'icon-spinner animated': submitRequest()}"></i>
&nbsp;&nbsp;
<span class="i18n" data-i18n="POPUPS_MESSAGE_OPEN_PGP/BUTTON_DECRYPT"></span>