More HTML cleanups

This commit is contained in:
djmaze 2021-05-01 10:02:40 +02:00
parent 109c6b6ab5
commit a7ae087f18
23 changed files with 609 additions and 659 deletions

View file

@ -18,9 +18,8 @@
right: 0; right: 0;
overflow: hidden; overflow: hidden;
} }
}
.b-settings-menu { nav {
a { a {
background-color: transparent; background-color: transparent;
@ -44,6 +43,7 @@
background-color: var(--settings-menu-selected-bg-color, #333); background-color: var(--settings-menu-selected-bg-color, #333);
color: var(--settings-menu-selected-color, #eee); color: var(--settings-menu-selected-color, #eee);
} }
}
} }
.b-settins-right { .b-settins-right {
@ -54,7 +54,7 @@
right: 0; right: 0;
left: 0; left: 0;
height: 34px; height: 34px;
padding: 8px 5px; padding: 8px 0;
color: #fff; color: #fff;
} }

View file

@ -21,7 +21,7 @@ export class MenuSettingsUserView extends AbstractViewLeft {
onBuild(dom) { onBuild(dom) {
dom.addEventListener('click', event => dom.addEventListener('click', event =>
ThemeStore.isMobile() ThemeStore.isMobile()
&& event.target.closestWithin('.b-settings-menu a', dom) && event.target.closestWithin('.b-settins-left nav a', dom)
&& leftPanelDisabled(true) && leftPanelDisabled(true)
); );
} }

View file

@ -1,5 +1,4 @@
<div class="modal fade b-account-add-content g-ui-user-select-none" data-bind="modal: modalVisibility"> <div class="modal fade b-account-add-content g-ui-user-select-none" data-bind="modal: modalVisibility">
<div>
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3> <h3>
@ -44,5 +43,4 @@
<span data-bind="visible: !isNew()" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_UPDATE_ACCOUNT"></span> <span data-bind="visible: !isNew()" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_UPDATE_ACCOUNT"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-open-pgp-key-add-content g-ui-user-select-none" data-bind="modal: modalVisibility"> <div class="modal fade b-open-pgp-key-add-content g-ui-user-select-none" data-bind="modal: modalVisibility">
<div>
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3 data-i18n="POPUPS_IMPORT_OPEN_PGP_KEY/TITLE_IMPORT_OPEN_PGP_KEY"></h3> <h3 data-i18n="POPUPS_IMPORT_OPEN_PGP_KEY/TITLE_IMPORT_OPEN_PGP_KEY"></h3>
@ -19,5 +18,4 @@
<span data-i18n="POPUPS_IMPORT_OPEN_PGP_KEY/BUTTON_IMPORT_OPEN_PGP_KEY"></span> <span data-i18n="POPUPS_IMPORT_OPEN_PGP_KEY/BUTTON_IMPORT_OPEN_PGP_KEY"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-compose-open-pgp-content g-ui-user-select-none" data-bind="modal: modalVisibility"> <div class="modal fade b-compose-open-pgp-content g-ui-user-select-none" data-bind="modal: modalVisibility">
<div>
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3 data-i18n="POPUPS_COMPOSE_OPEN_PGP/TITLE_COMPOSE_OPEN_PGP"></h3> <h3 data-i18n="POPUPS_COMPOSE_OPEN_PGP/TITLE_COMPOSE_OPEN_PGP"></h3>
@ -90,5 +89,4 @@
<span data-bind="visible: (sign() && encrypt()) || (!sign() && !encrypt())" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_SIGN_AND_ENCRYPT"></span> <span data-bind="visible: (sign() && encrypt()) || (!sign() && !encrypt())" data-i18n="POPUPS_COMPOSE_OPEN_PGP/BUTTON_SIGN_AND_ENCRYPT"></span>
</button> </button>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-filter-content g-ui-user-select-none" data-bind="modal: modalVisibility"> <div class="modal fade b-filter-content g-ui-user-select-none" data-bind="modal: modalVisibility">
<div>
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3> <h3>
@ -55,5 +54,4 @@
<span data-i18n="GLOBAL/DONE"></span> <span data-i18n="GLOBAL/DONE"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-folder-clear-content g-ui-user-select-none" data-bind="modal: modalVisibility"> <div class="modal fade b-folder-clear-content g-ui-user-select-none" data-bind="modal: modalVisibility">
<div>
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3> <h3>
@ -25,5 +24,4 @@
<span data-i18n="GLOBAL/CLEAR"></span> <span data-i18n="GLOBAL/CLEAR"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-folder-create-content g-ui-user-select-none" data-bind="modal: modalVisibility"> <div class="modal fade b-folder-create-content g-ui-user-select-none" data-bind="modal: modalVisibility">
<div>
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3 data-i18n="POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></h3> <h3 data-i18n="POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></h3>
@ -30,5 +29,4 @@
<span data-i18n="POPUPS_CREATE_FOLDER/BUTTON_CREATE"></span> <span data-i18n="POPUPS_CREATE_FOLDER/BUTTON_CREATE"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-identity-content" data-bind="modal: modalVisibility"> <div class="modal fade b-identity-content" data-bind="modal: modalVisibility">
<div>
<div class="modal-header g-ui-user-select-none"> <div class="modal-header g-ui-user-select-none">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3> <h3>
@ -92,5 +91,4 @@
<span data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/BUTTON_UPDATE_IDENTITY"></span> <span data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/BUTTON_UPDATE_IDENTITY"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-message-open-pgp-content g-ui-user-select-none" data-bind="modal: modalVisibility"> <div class="modal fade b-message-open-pgp-content g-ui-user-select-none" data-bind="modal: modalVisibility">
<div>
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3 data-i18n="POPUPS_MESSAGE_OPEN_PGP/TITLE_MESSAGE_OPEN_PGP"></h3> <h3 data-i18n="POPUPS_MESSAGE_OPEN_PGP/TITLE_MESSAGE_OPEN_PGP"></h3>
@ -44,5 +43,4 @@
<span data-i18n="POPUPS_MESSAGE_OPEN_PGP/BUTTON_DECRYPT"></span> <span data-i18n="POPUPS_MESSAGE_OPEN_PGP/BUTTON_DECRYPT"></span>
</button> </button>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-open-pgp-key-generate-content g-ui-user-select-none" data-bind="modal: modalVisibility"> <div class="modal fade b-open-pgp-key-generate-content g-ui-user-select-none" data-bind="modal: modalVisibility">
<div>
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3 data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/TITLE_GENERATE_OPEN_PGP_KEYS"></h3> <h3 data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/TITLE_GENERATE_OPEN_PGP_KEYS"></h3>
@ -49,5 +48,4 @@
<span data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/BUTTON_GENERATE_OPEN_PGP_KEYS"></span> <span data-i18n="POPUPS_GENERATE_OPEN_PGP_KEYS/BUTTON_GENERATE_OPEN_PGP_KEYS"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-filter-script g-ui-user-select-none" data-bind="modal: modalVisibility"> <div class="modal fade b-filter-script g-ui-user-select-none" data-bind="modal: modalVisibility, with: script">
<div data-bind="with: script">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-bind="command: $root.cancelCommand">×</button> <button type="button" class="close" data-bind="command: $root.cancelCommand">×</button>
<h3> <h3>
@ -94,5 +93,4 @@
<span data-i18n="GLOBAL/SAVE"></span> <span data-i18n="GLOBAL/SAVE"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-template-add-content" data-bind="modal: modalVisibility"> <div class="modal fade b-template-add-content" data-bind="modal: modalVisibility">
<div>
<div class="modal-header g-ui-user-select-none"> <div class="modal-header g-ui-user-select-none">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3> <h3>
@ -38,5 +37,4 @@
<span data-bind="visible: '' !== id()" data-i18n="POPUPS_ADD_TEMPLATE/BUTTON_UPDATE_TEMPLATE"></span> <span data-bind="visible: '' !== id()" data-i18n="POPUPS_ADD_TEMPLATE/BUTTON_UPDATE_TEMPLATE"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,5 +1,4 @@
<div class="modal fade b-open-pgp-key-view-content" data-bind="modal: modalVisibility"> <div class="modal fade b-open-pgp-key-view-content" data-bind="modal: modalVisibility">
<div>
<div class="modal-header g-ui-user-select-none"> <div class="modal-header g-ui-user-select-none">
<button type="button" class="close" data-bind="command: cancelCommand">×</button> <button type="button" class="close" data-bind="command: cancelCommand">×</button>
<h3 data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/TITLE_VIEW_OPEN_PGP_KEY"></h3> <h3 data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/TITLE_VIEW_OPEN_PGP_KEY"></h3>
@ -21,5 +20,4 @@
<span data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/BUTTON_SELECT"></span> <span data-i18n="POPUPS_VIEW_OPEN_PGP_KEY/BUTTON_SELECT"></span>
</a> </a>
</div> </div>
</div>
</div> </div>

View file

@ -1,12 +1,10 @@
<div class="b-settings-accounts g-ui-user-select-none"> <div class="b-settings-accounts g-ui-user-select-none">
<div data-bind="visible: allowAdditionalAccount"> <div data-bind="visible: allowAdditionalAccount">
<div class="form-horizontal">
<div class="legend"> <div class="legend">
<span data-i18n="SETTINGS_ACCOUNTS/LEGEND_ACCOUNTS"></span> <span data-i18n="SETTINGS_ACCOUNTS/LEGEND_ACCOUNTS"></span>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i> <i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
</div> </div>
</div>
<a class="btn" data-bind="click: addNewAccount"> <a class="btn" data-bind="click: addNewAccount">
<i class="icon-user-add"></i> <i class="icon-user-add"></i>
<span data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span> <span data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
@ -43,9 +41,7 @@
</div> </div>
<div data-bind="visible: allowIdentities"> <div data-bind="visible: allowIdentities">
<br /> <br />
<div class="form-horizontal">
<div class="legend" data-i18n="SETTINGS_ACCOUNTS/LEGEND_IDENTITIES"></div> <div class="legend" data-i18n="SETTINGS_ACCOUNTS/LEGEND_IDENTITIES"></div>
</div>
<a class="btn" data-bind="click: addNewIdentity"> <a class="btn" data-bind="click: addNewIdentity">
<i class="icon-user-add"></i> <i class="icon-user-add"></i>
<span data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_IDENTITY"></span> <span data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_IDENTITY"></span>

View file

@ -1,3 +0,0 @@
<div class="settingsCustom">
CUSTOM
</div>

View file

@ -1,11 +1,9 @@
<div class="b-settings-folders"> <div class="b-settings-folders">
<div class="form-horizontal">
<div class="legend"> <div class="legend">
<span data-i18n="SETTINGS_FOLDERS/LEGEND_FOLDERS"></span> <span data-i18n="SETTINGS_FOLDERS/LEGEND_FOLDERS"></span>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i> <i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
</div> </div>
</div>
<div style="border-bottom: 1px solid rgba(128,128,128,0.5);margin-bottom:20px;" data-bind="visible: useImapSubscribe, component: { <div style="border-bottom: 1px solid rgba(128,128,128,0.5);margin-bottom:20px;" data-bind="visible: useImapSubscribe, component: {
name: 'Checkbox', name: 'Checkbox',
params: { params: {

View file

@ -104,8 +104,7 @@
}"></div> }"></div>
</div> </div>
</div> </div>
</div>
<div class="form-horizontal">
<div class="legend" data-i18n="SETTINGS_GENERAL/LABEL_NOTIFICATIONS"></div> <div class="legend" data-i18n="SETTINGS_GENERAL/LABEL_NOTIFICATIONS"></div>
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">

View file

@ -1,6 +1,6 @@
<div class="b-settins-left"> <div class="b-settins-left">
<div class="b-content"> <div class="b-content">
<nav class="b-settings-menu" data-bind="foreach: menu"> <nav data-bind="foreach: menu">
<a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a> <a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a>
</nav> </nav>
</div> </div>

View file

@ -1,7 +1,5 @@
<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="legend">OpenPGP</div> <div class="legend">OpenPGP</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>
<span data-i18n="SETTINGS_OPEN_PGP/BUTTON_ADD_OPEN_PGP_KEY"></span> <span data-i18n="SETTINGS_OPEN_PGP/BUTTON_ADD_OPEN_PGP_KEY"></span>
@ -46,9 +44,7 @@
<td> <td>
<span class="delete-open-pgp-key fontastic" data-bind="visible: !deleteAccess(), click: function (openPgpKey) { $root.openPgpKeyForDeletion(openPgpKey); }">🗑</span> <span class="delete-open-pgp-key fontastic" data-bind="visible: !deleteAccess(), click: function (openPgpKey) { $root.openPgpKeyForDeletion(openPgpKey); }">🗑</span>
</td> </td>
<td> <td class="view-open-pgp-key fontastic" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">👁</td>
<span class="view-open-pgp-key fontastic" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">👁</span>
</td>
</tr> </tr>
</tbody><tbody data-bind="foreach: openpgpkeysPublic"> </tbody><tbody data-bind="foreach: openpgpkeysPublic">
<tr class="open-pgp-key-item"> <tr class="open-pgp-key-item">
@ -65,9 +61,7 @@
<td> <td>
<span class="delete-open-pgp-key fontastic" data-bind="visible: !deleteAccess(), click: function (openPgpKey) { $root.openPgpKeyForDeletion(openPgpKey); }">🗑</span> <span class="delete-open-pgp-key fontastic" data-bind="visible: !deleteAccess(), click: function (openPgpKey) { $root.openPgpKeyForDeletion(openPgpKey); }">🗑</span>
</td> </td>
<td> <td class="view-open-pgp-key fontastic" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">👁</td>
<span class="view-open-pgp-key fontastic" data-bind="click: function (openPgpKey) { $root.viewOpenPgpKey(openPgpKey); }">👁</span>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View file

@ -1,6 +1,5 @@
<div class="b-settings b-settins-right"> <div class="b-settings b-settins-right">
<div class="b-toolbar" style="padding-left: 0"> <div class="b-toolbar btn-toolbar" style="margin-top: 2px;">
<div class="btn-toolbar" style="margin-top: 2px;">
<div class="btn-group show-mobile" data-bind="visible: !leftPanelDisabled()" style="margin-left: -1px"> <div class="btn-group show-mobile" data-bind="visible: !leftPanelDisabled()" style="margin-left: -1px">
<a class="btn btn-thin-2 fontastic" data-bind="click: hideLeft"></a> <a class="btn btn-thin-2 fontastic" data-bind="click: hideLeft"></a>
</div> </div>
@ -12,8 +11,5 @@
<span data-i18n="GLOBAL/BACK"></span> <span data-i18n="GLOBAL/BACK"></span>
</a> </a>
</div> </div>
</div> <div class="b-content" id="rl-settings-subscreen"></div>
<div class="b-content">
<div id="rl-settings-subscreen"></div>
</div>
</div> </div>

View file

@ -1,11 +1,9 @@
<div class="b-settings-templates g-ui-user-select-none"> <div class="b-settings-templates g-ui-user-select-none">
<div class="form-horizontal">
<div class="legend"> <div class="legend">
<span data-i18n="SETTINGS_TEMPLATES/LEGEND_TEMPLATES"></span> <span data-i18n="SETTINGS_TEMPLATES/LEGEND_TEMPLATES"></span>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: templates.loading"></i> <i class="icon-spinner" style="margin-top: 5px" data-bind="visible: templates.loading"></i>
</div> </div>
</div>
<a class="btn" data-bind="click: addNewTemplate"> <a class="btn" data-bind="click: addNewTemplate">
<i class="icon-user-add"></i> <i class="icon-user-add"></i>
<span data-i18n="SETTINGS_TEMPLATES/BUTTON_ADD_TEMPLATE"></span> <span data-i18n="SETTINGS_TEMPLATES/BUTTON_ADD_TEMPLATE"></span>
@ -13,7 +11,6 @@
<br /> <br />
<br /> <br />
<br /> <br />
<div>
<div class="templates-list-top-padding"></div> <div class="templates-list-top-padding"></div>
<table class="table table-hover list-table templates-list" data-bind="i18nUpdate: templates"> <table class="table table-hover list-table templates-list" data-bind="i18nUpdate: templates">
<colgroup> <colgroup>
@ -39,5 +36,4 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div>
</div> </div>

View file

@ -1,10 +1,8 @@
<div class="b-settings-themes g-ui-user-select-none"> <div class="b-settings-themes g-ui-user-select-none">
<div class="form-horizontal">
<div class="legend"> <div class="legend">
<span data-i18n="SETTINGS_THEMES/LEGEND_THEMES"></span> <span data-i18n="SETTINGS_THEMES/LEGEND_THEMES"></span>
<span data-bind="saveTrigger: themeTrigger"></span> <span data-bind="saveTrigger: themeTrigger"></span>
</div> </div>
</div>
<div class="b-themes-list" data-bind="foreach: themesObjects"> <div class="b-themes-list" data-bind="foreach: themesObjects">
<div class="e-item" data-bind="click: function () { $root.theme(name); }, css: { 'selected': selected }"> <div class="e-item" data-bind="click: function () { $root.theme(name); }, css: { 'selected': selected }">
<div class="e-name" data-bind="text: nameDisplay"></div> <div class="e-name" data-bind="text: nameDisplay"></div>