mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-09-10 01:47:03 +03:00
Drop cancelCommand in favor of closeCommand and improve AbstractViewPopup handling
This commit is contained in:
parent
06b5b83588
commit
2edd55f01f
36 changed files with 82 additions and 118 deletions
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-bind="text: headerText"></h3>
|
||||
</header>
|
||||
<div class="modal-body">
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
<i class="fontastic" data-bind="css: {'icon-spinner': testing()}">ℹ</i>
|
||||
<span data-i18n="POPUPS_DOMAIN/BUTTON_TEST"></span>
|
||||
</a>
|
||||
<a class="btn buttonClose" data-bind="command: cancelCommand" data-icon="✖" data-i18n="POPUPS_DOMAIN/BUTTON_CLOSE"></a>
|
||||
<a class="btn buttonClose" data-bind="command: closeCommand" data-icon="✖" data-i18n="POPUPS_DOMAIN/BUTTON_CLOSE"></a>
|
||||
<a class="btn" data-bind="command: createOrAddCommand, visible: edit()">
|
||||
<i class="fontastic" data-bind="css: {'icon-spinner': saving()}">✔</i>
|
||||
<span data-i18n="POPUPS_DOMAIN/BUTTON_UPDATE"></span>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-i18n="POPUPS_DOMAIN_ALIAS/TITLE_ADD_DOMAIN_ALIAS"></h3>
|
||||
</header>
|
||||
<div class="modal-body">
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<footer>
|
||||
<a class="btn buttonClose" data-bind="command: cancelCommand" data-icon="✖" data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_CLOSE"></a>
|
||||
<a class="btn buttonClose" data-bind="command: closeCommand" data-icon="✖" data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_CLOSE"></a>
|
||||
<a class="btn" data-bind="command: createCommand">
|
||||
<i class="fontastic" data-bind="visible: !saving()">✚</i>
|
||||
<i class="icon-spinner" data-bind="visible: saving"></i>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h4>
|
||||
<span data-i18n="POPUPS_PLUGIN/TITLE_PLUGIN"></span>
|
||||
|
||||
|
|
@ -30,6 +30,6 @@
|
|||
</form>
|
||||
</div>
|
||||
<footer>
|
||||
<a class="btn buttonClose" data-bind="command: cancelCommand" data-icon="✖" data-i18n="POPUPS_PLUGIN/BUTTON_CLOSE"></a>
|
||||
<a class="btn buttonClose" data-bind="command: closeCommand" data-icon="✖" data-i18n="POPUPS_PLUGIN/BUTTON_CLOSE"></a>
|
||||
<a class="btn" data-bind="command: saveCommand, visible: hasConfiguration" data-icon="✔" data-i18n="GLOBAL/SAVE"></a>
|
||||
</footer>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-i18n="POPUPS_LANGUAGES/TITLE_LANGUAGES"></h3>
|
||||
</header>
|
||||
<div class="modal-body" style="min-height: 150px;" data-bind="foreach: languages">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3>
|
||||
<span data-bind="visible: isNew" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_ADD_ACCOUNT"></span>
|
||||
<span data-bind="visible: !isNew()" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_UPDATE_ACCOUNT"></span>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-i18n="SEARCH/TITLE_ADV"></h3>
|
||||
</header>
|
||||
<div class="modal-body">
|
||||
|
|
@ -9,22 +9,22 @@
|
|||
<div class="control-group">
|
||||
<label data-i18n="GLOBAL/FROM"></label>
|
||||
<input type="text" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
|
||||
data-bind="value: from, onEsc: cancelCommand">
|
||||
data-bind="value: from, onEsc: closeCommand">
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label data-i18n="GLOBAL/TO"></label>
|
||||
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
|
||||
data-bind="value: to, onEsc: cancelCommand">
|
||||
data-bind="value: to, onEsc: closeCommand">
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label data-i18n="GLOBAL/SUBJECT"></label>
|
||||
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
|
||||
data-bind="value: subject, onEsc: cancelCommand">
|
||||
data-bind="value: subject, onEsc: closeCommand">
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label data-i18n="SEARCH/LABEL_ADV_TEXT"></label>
|
||||
<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
|
||||
data-bind="value: text, onEsc: cancelCommand">
|
||||
data-bind="value: text, onEsc: closeCommand">
|
||||
</div>
|
||||
</div>
|
||||
<div class="span4">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<header class="b-header-toolbar g-ui-user-select-none">
|
||||
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
|
||||
<div class="btn-toolbar">
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3>
|
||||
<span data-i18n="POPUPS_FILTER/TITLE_CREATE_FILTER" data-bind="visible: isNew"></span>
|
||||
<span data-i18n="POPUPS_FILTER/TITLE_EDIT_FILTER" data-bind="visible: !isNew()"></span>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3>
|
||||
<span data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEAR_FOLDER" data-bind="visible: !clearingProcess()"></span>
|
||||
<span data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEARING_PROCESS" data-bind="visible: clearingProcess"></span>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-i18n="POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></h3>
|
||||
</header>
|
||||
<div class="modal-body">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-i18n="POPUPS_SYSTEM_FOLDERS/TITLE_SYSTEM_FOLDERS"></h3>
|
||||
</header>
|
||||
<div class="modal-body">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header class="g-ui-user-select-none">
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3>
|
||||
<span data-bind="visible: !edit()" data-i18n="POPUPS_IDENTITY/TITLE_ADD_IDENTITY"></span>
|
||||
<span data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/TITLE_UPDATE_IDENTITY"></span>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-i18n="SHORTCUTS_HELP/LEGEND_SHORTCUTS_HELP"></h3>
|
||||
</header>
|
||||
<div class="modal-body">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-i18n="OPENPGP/POPUP_GENERATE_TITLE"></h3>
|
||||
</header>
|
||||
<form id="openpgp-generate" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header>
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-i18n="OPENPGP/POPUP_IMPORT_TITLE"></h3>
|
||||
</header>
|
||||
<form id="openpgp-import" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<header class="g-ui-user-select-none">
|
||||
<a href="#" class="close" data-bind="command: cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: closeCommand">×</a>
|
||||
<h3 data-i18n="OPENPGP/POPUP_VIEW_TITLE"></h3>
|
||||
</header>
|
||||
<div class="modal-body">
|
||||
|
|
@ -10,6 +10,6 @@
|
|||
</div>
|
||||
</div>
|
||||
<footer>
|
||||
<a class="btn buttonClose" data-bind="command: cancelCommand" data-icon="✖" data-i18n="GLOBAL/CLOSE"></a>
|
||||
<a class="btn buttonClose" data-bind="command: closeCommand" data-icon="✖" data-i18n="GLOBAL/CLOSE"></a>
|
||||
<a class="btn buttonClose" data-bind="click: selectKey" data-icon="🔑" data-i18n="OPENPGP/POPUP_VIEW_BUTTON"></a>
|
||||
</footer>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<!-- ko with: script -->
|
||||
<header>
|
||||
<a href="#" class="close" data-bind="command: $root.cancelCommand">×</a>
|
||||
<a href="#" class="close" data-bind="command: $root.closeCommand">×</a>
|
||||
<h3>
|
||||
<span data-i18n="POPUPS_SIEVE_SCRIPT/TITLE_CREATE" data-bind="visible: !exists()"></span>
|
||||
<span data-i18n="POPUPS_SIEVE_SCRIPT/TITLE_EDIT" data-bind="visible: exists"></span>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue