No OneTemporary
Actions

Size

74 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/plugins/enigma/skins/elastic/templates/keys.html b/plugins/enigma/skins/elastic/templates/keys.html
	index 8836fecb8..99e8f8ed9 100644
	--- a/plugins/enigma/skins/elastic/templates/keys.html
	+++ b/plugins/enigma/skins/elastic/templates/keys.html
	@@ -1,75 +1,75 @@
	<roundcube:include file="includes/layout.html" />
	<roundcube:include file="includes/menu.html" />
	<roundcube:include file="includes/settings-menu.html" />

	<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="enigma.enigmakeys" /></h1>

	<!-- keys list -->
	<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-enigmakeyslist">
	<div class="header">
	<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
	<span id="aria-label-enigmakeyslist" class="header-title"><roundcube:label name="enigma.enigmakeys" /></span>
	<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
	</div>
	<roundcube:object name="searchform" id="keysearch" wrapper="searchbar menu"
	label="keysearchform" buttontitle="findkeys" ariatag="h2" />
	<div class="scroller">
	<roundcube:object name="keyslist" id="keys-table" class="listing" role="listbox" noheader="true"
	data-list="keys_list" data-label-msg="listempty" />
	</div>
	<div class="pagenav menu footer small" role="toolbar">
	<roundcube:button command="firstpage" type="link" class="firstpage disabled" classAct="firstpage"
	title="firstpage" label="first" innerclass="inner" />
	<roundcube:button command="previouspage" type="link" class="prevpage disabled" classAct="prevpage"
	title="previouspage" label="previous" innerclass="inner" />
	<span class="pagenav-text" aria-live="polite" aria-relevant="text">
	<roundcube:object name="countdisplay" />
	</span>
	<roundcube:endif />
	<roundcube:button command="nextpage" type="link" class="nextpage disabled" classAct="nextpage"
	title="nextpage" label="next" innerclass="inner" />
	<roundcube:button command="lastpage" type="link" class="lastpage disabled" classAct="lastpage"
	title="lastpage" label="last" innerclass="inner" />
	</div>
	</div>

	<!-- key info frame -->
	<div id="layout-content" role="main">
	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
	<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
	<span class="header-title"></span>
	<!-- toolbar -->
	<div id="folderstoolbar" class="toolbar menu">
	<roundcube:button command="plugin.enigma-key-create" type="link" class="create disabled" classAct="create"
	label="create" title="enigma.createkeys" innerClass="inner" />
	<roundcube:button command="plugin.enigma-key-delete" type="link" class="delete disabled" classAct="delete"
	label="delete" title="enigma.keyremove" innerClass="inner" />
	<span class="spacer"></span>
	<roundcube:button command="plugin.enigma-key-import-search" type="link" class="search disabled" classAct="search"
	label="search" title="enigma.keyimportsearchlabel" innerClass="inner" />
	<roundcube:button command="plugin.enigma-key-import" type="link" class="import disabled" classAct="import"
	label="import" title="enigma.importkeys" innerClass="inner" />
	<span class="dropbutton">
	<roundcube:button command="plugin.enigma-key-export" type="link" class="export disabled" classAct="export"
	label="export" title="enigma.exportkeys" innerclass="inner" />
	<a href="#export" class="dropdown" data-popup="export-menu">
	<span class="inner"><roundcube:label name="enigma.arialabelkeyexportoptions" /></span>
	</a>
	</span>
	</div>
	</div>
	<div class="iframe-wrapper">
	<roundcube:object name="contentframe" id="keyframe" src="env:blankpage" />
	</div>
	</div>

	<div id="export-menu" class="popupmenu">
	<h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="enigma.arialabelkeyexportoptions" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-export-menu">
	<roundcube:button type="link-menuitem" command="plugin.enigma-key-export" label="exportall" prop="sub" class="export all disabled" classAct="export all active" />
	- <roundcube:button type="link-menuitem" command="plugin.enigma-key-export-selected" label="exportsel" prop="sub" class="export selection disabled" classAct="export selection active" />
	+ <roundcube:button type="link-menuitem" command="plugin.enigma-key-export-selected" label="exportsel" prop="sub" class="export select disabled" classAct="export select active" />
	</ul>
	</div>

	<roundcube:include file="includes/footer.html" />
	diff --git a/skins/elastic/styles/widgets/buttons.less b/skins/elastic/styles/widgets/buttons.less
	index 6d6ed85ae..5f2f070ef 100644
	--- a/skins/elastic/styles/widgets/buttons.less
	+++ b/skins/elastic/styles/widgets/buttons.less
	@@ -1,318 +1,321 @@
	/**
	* Roundcube Webmail styles for the Elastic skin
	*
	* Copyright (c) The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original authors in the README.md file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*/

	/* Buttons */


	.button.disabled {
	opacity: .5;
	}

	a.button {
	text-decoration: none;
	}


	/* font-icons */

	a.button.icon,
	button.btn {
	&:before {
	&:extend(.font-icon-class);
	}
	&.sidebar-menu:before,
	&.toolbar-menu-button:before,
	&.toolbar-list-button:before {
	content: @fa-var-ellipsis-v;
	width: 1em;
	}
	&.task-menu-button:before {
	content: @fa-var-bars;
	}
	&.back-sidebar-button:before,
	&.back-content-button:before,
	&.back-list-button:before {
	content: @fa-var-chevron-left;
	}
	&.refresh:before {
	content: @fa-var-sync;
	}
	&.generate:before,
	&.yes:before,
	&.submit:before,
	&.continue:before,
	&.save:before {
	content: @fa-var-check;
	}
	&.create:before {
	content: @fa-var-plus-square;
	}
	&.edit:before {
	content: @fa-var-pencil-alt;
	}
	&.qrcode:before {
	content: @fa-var-qrcode;
	}
	&.search:before {
	content: @fa-var-search;
	}
	&.filter:before {
	content: @fa-var-filter;
	font-size: 1.2em; // this icon is too-big in FA5
	}
	&.import:before {
	content: @fa-var-upload;
	}
	&.export:before {
	content: @fa-var-download;
	}
	&.discard:before,
	&.delete:before {
	.font-icon-regular(@fa-var-trash-alt);
	}
	&.next:before {
	content: @fa-var-arrow-right;
	}
	&.restore:before {
	content: @fa-var-undo;
	}
	&.send:before,
	&.bounce:before {
	content: @fa-var-paper-plane;
	}
	&.attach:before {
	content: @fa-var-paperclip;
	}
	&.attach.vcard:before {
	content: @fa-var-user;
	}
	&.no:before,
	&.close:before,
	&.cancel:before {
	content: @fa-var-times;
	}
	&.back:before {
	content: @fa-var-chevron-left;
	}
	&.remove:before {
	content: @fa-var-times;
	}
	&.unlock:before {
	content: @fa-var-unlock;
	}
	&.help:before {
	.font-icon-regular(@fa-var-life-ring);
	}
	&.folders:before {
	content: @fa-var-folder-open;
	}
	+ &.options:before {
	+ content: @fa-var-sliders-h;
	+ }
	&.tools:before,
	&.settings:before {
	- content: @fa-var-wrench;
	+ content: @fa-var-cog;
	}
	&.properties:before {
	content: @fa-var-info-circle;
	}
	&.select:before {
	- .font-icon-regular(@fa-var-check-circle);
	+ .font-icon-regular(@fa-var-check-square);
	}
	&.insert.recipient:before {
	content: @fa-var-user-plus;
	}
	&.encrypt:before {
	content: @fa-var-lock;
	}
	&.sign:before {
	content: @fa-var-signature;
	}
	&.sso:before {
	content: @fa-var-sign-in-alt;
	}
	}

	a.btn,
	button.btn {
	&:before {
	display: inline !important;
	float: none !important;
	vertical-align: middle;
	margin-right: .4rem !important; // !important needed for a.btn
	}
	}

	a.button.icon {
	&.dropdown:before {
	content: @fa-var-caret-down;
	font-size: 1em;
	}
	& > span.inner {
	display: none;
	}
	}

	html.touch {
	.btn:focus {
	box-shadow: none !important;
	}
	}

	@floating-action-button-size: 4rem;

	.floating-action-buttons {
	position: absolute;
	right: 0;
	bottom: 0;

	.footer:not(:empty) + & {
	bottom: @layout-footer-small-height;
	}

	a.button {
	display: block;
	float: left;
	width: @floating-action-button-size;
	height: @floating-action-button-size;
	border-radius: 50%;
	background: @color-main;
	color: white;
	opacity: .95;
	box-shadow: 0 0 5px 5px lighten(@color-main, 35%);
	margin: 0 1rem 1rem 0;

	&:before {
	&:extend(.font-icon-class);
	content: @fa-var-plus;
	width: @floating-action-button-size;
	height: @floating-action-button-size;
	line-height: @floating-action-button-size;
	}

	&.compose {
	&:before {
	content: @fa-var-pen;
	}
	}

	.inner {
	display: none;
	}
	}
	}

	/* Bootstrap button style overrides */

	.btn {
	&:focus {
	box-shadow: 0 0 0 .2rem fade(@color-btn-primary-background, 30%);
	}
	}

	.btn-secondary {
	color: @color-btn-secondary;
	background: @color-btn-secondary-background;
	border-color: @color-btn-secondary-background;

	&:focus {
	box-shadow: 0 0 0 .2rem fade(@color-btn-secondary-background, 50%);
	}

	&:hover {
	background: darken(@color-btn-secondary-background, 5%);
	border-color: darken(@color-btn-secondary-background, 7%);
	}

	&.disabled,
	&:disabled {
	background: lighten(@color-btn-secondary-background, 20%);
	border-color: lighten(@color-btn-secondary-background, 20%);
	opacity: 1;
	}

	&:not(:disabled):not(.disabled) {
	&:active,
	&.active {
	background: darken(@color-btn-secondary-background, 10%);
	border-color: darken(@color-btn-secondary-background, 12%);

	&:focus {
	box-shadow: 0 0 0 .2rem fade(@color-btn-secondary-background, 53%);
	}
	}
	}
	}

	.btn-primary {
	color: @color-btn-primary;
	background: @color-btn-primary-background;
	border-color: @color-btn-primary-background;

	&:focus {
	box-shadow: 0 0 0 .2rem fade(@color-btn-primary-background, 50%);
	}

	&:hover {
	background: darken(@color-btn-primary-background, 5%);
	border-color: darken(@color-btn-primary-background, 7%);
	}

	&.disabled,
	&:disabled {
	background: lighten(@color-btn-primary-background, 20%);
	border-color: lighten(@color-btn-primary-background, 20%);
	opacity: 1;
	}

	&:not(:disabled):not(.disabled) {
	&:active,
	&.active {
	background: darken(@color-btn-primary-background, 10%);
	border-color: darken(@color-btn-primary-background, 12%);

	&:focus {
	box-shadow: 0 0 0 .2rem fade(@color-btn-primary-background, 53%);
	}
	}
	}
	}

	.btn-danger {
	color: @color-btn-danger;
	background: @color-btn-danger-background;
	border-color: @color-btn-danger-background;

	&:focus {
	box-shadow: 0 0 0 .2rem fade(@color-btn-danger-background, 50%);
	}

	&:hover {
	background: darken(@color-btn-danger-background, 5%);
	border-color: darken(@color-btn-danger-background, 7%);
	}

	&.disabled,
	&:disabled {
	background: lighten(@color-btn-danger-background, 20%);
	border-color: lighten(@color-btn-danger-background, 20%);
	opacity: 1;
	}

	&:not(:disabled):not(.disabled) {
	&:active,
	&.active {
	background: darken(@color-btn-danger-background, 10%);
	border-color: darken(@color-btn-danger-background, 12%);

	&:focus {
	box-shadow: 0 0 0 .2rem fade(@color-btn-danger-background, 53%);
	}
	}
	}
	}
	diff --git a/skins/elastic/styles/widgets/menu.less b/skins/elastic/styles/widgets/menu.less
	index 450d7c61d..efee6d58f 100644
	--- a/skins/elastic/styles/widgets/menu.less
	+++ b/skins/elastic/styles/widgets/menu.less
	@@ -1,888 +1,890 @@
	/**
	* Roundcube Webmail styles for the Elastic skin
	*
	* Copyright (c) The Roundcube Dev Team
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original authors in the README.md file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*/

	/* Toolbar widget */

	.menu {
	margin: 0;
	text-align: center;
	white-space: nowrap;

	a {
	.overflow-ellipsis;
	text-decoration: none;

	&:before {
	&:extend(.font-icon-class);
	}

	&:hover,
	&:focus {
	outline: 0;
	}

	&:not(.disabled):focus,
	&:not(.disabled):hover {
	background-color: @color-toolbar-button-background-hover;
	}
	}

	&.toolbar {
	li {
	display: inline-block;
	height: @layout-touch-header-height;
	}

	a {
	color: @color-toolbar-button;
	display: block;
	float: left;
	border: 0 !important;
	height: @layout-header-height;
	min-width: 3.2rem;
	max-width: 6rem;
	width: auto; // reset width defined for links in .listing
	padding: .45rem;
	line-height: 1.5;
	cursor: pointer;
	font-size: 1rem;
	text-align: center;

	&:before {
	height: 1.75rem !important;
	float: none !important;
	width: auto !important;
	margin: 0 !important;
	}

	&.selected {
	color: @color-success;
	}
	}

	& > .spacer {
	width: 1em;
	}

	.dropbutton {
	&:not(.disabled):hover {
	background-color: @color-toolbar-button-background-hover;
	}

	a.dropdown {
	padding: 0 .3rem;

	&:before {
	line-height: @layout-header-height;
	}

	&:hover {
	background-color: darken(@color-toolbar-button-background-hover, 5%);
	}
	}
	}
	}

	span.inner {
	font-size: 90%;
	font-weight: normal;
	}

	.dropbutton {
	display: inline-block;

	a.dropdown {
	font-size: 75%;
	min-width: 0;

	html.ie11 &:before {
	font-size: 80%;
	}

	span.inner {
	display: none;
	}
	}

	a:first-child {
	padding-right: 0;
	}
	}

	&.pagenav {
	display: flex;
	justify-content: space-between;
	align-items: center;
	padding: 0 !important;
	font-size: 100%; // in case this is .footer.small

	a {
	flex-grow: 1;
	display: inline-block;
	min-width: 2rem !important;
	height: @layout-footer-small-height;
	color: @color-toolbar-button;

	&:before {
	margin: 0;
	display: inline;
	float: none;
	line-height: @layout-footer-small-height;
	}
	}

	.pagenav-text {
	.overflow-ellipsis;
	color: @color-list-pagenav;
	flex-grow: 4;
	font-size: 80%;
	}

	input {
	width: 3rem;
	max-width: 5rem;
	font-size: 90%;
	text-align: center;
	max-height: 1.6rem;
	margin: 0 .2rem;

	html.layout-phone & {
	display: none;
	}
	}

	span.inner {
	display: none;
	}

	&.pagenav-list {
	cursor: pointer;
	background-color: @color-searchbar-background;
	border-bottom: 1px solid @color-list-border;

	a {
	flex-grow: unset;
	}

	.pagenav-text {
	text-align: left;
	font-size: 100%;
	}

	& + .navlist {
	background-color: #fbfbfb;
	}

	&.expanded + .navlist {
	border-bottom: 1px solid @color-layout-border;
	}
	}
	}

	&.content-frame-navigation.hide-nav-buttons {
	a.next,
	a.prev {
	display: none;
	}
	}

	.listselectors {
	max-width: 100%;
	display: flex;
	justify-content: space-around;
	}

	.buttons {
	display: block;

	button {
	display: block;
	float: left;
	cursor: pointer;
	color: @color-toolbar-button;
	background-color: transparent;
	border: 0;
	padding: 0;
	height: @layout-touch-header-height;
	line-height: @layout-touch-header-height;
	width: 2.5em;

	&:before {
	font-size: 1.75rem;
	}
	}
	}

	.popover & {
	li {
	display: block;
	height: auto;
	text-align: left;

	&.spacer {
	display: none;
	}

	&:last-child {
	border: 0;
	}

	&.separator {
	line-height: 1.5rem !important;
	font-size: .75rem !important;
	padding: 0 .5rem;
	color: @color-popover-separator;
	background-color: @color-popover-separator-background;

	label {
	margin: 0; // Unsets Bootstrap label margin, bug?
	}
	}

	a {
	height: unset;
	max-width: 100%;
	width: 100%;
	line-height: @listing-line-height;
	display: block;
	padding: 0 .5rem;
	text-align: left;

	&:before {
	line-height: inherit;
	height: inherit !important;
	margin-right: .5rem !important;
	float: left !important;
	width: 1.18em !important;
	}

	&:not(.disabled):hover {
	color: @color-menu-hover;
	background-color: @color-menu-hover-background;
	}
	}

	span.inner {
	font-size: 100%;
	}
	}

	.dropbutton {
	display: flex;

	a:first-child {
	.overflow-ellipsis;
	flex: 1;
	}

	a.dropdown {
	width: auto;

	&:before {
	content: @fa-var-angle-right;
	line-height: inherit;
	margin: 0;
	}

	span.inner {
	display: none;
	}
	}
	}
	}
	}

	@media screen and (min-width: (@screen-width-small + 1px)) {
	.content-frame-navigation {
	display: none !important;
	}

	.header a.button.icon {
	&:not(.disabled):focus,
	&:not(.disabled):hover {
	background-color: @color-toolbar-button-background-hover;
	outline: 0;
	}

	&:before {
	margin: 0;
	}
	}
	}

	@media screen and (max-width: @screen-width-small) {
	.menu.footer {
	justify-content: space-around !important;

	& > * {
	flex-grow: 1;
	}

	.buttons {
	display: flex;
	justify-content: space-evenly;
	}

	.listselectors > * {
	flex-grow: 1;
	}
	}

	.menu.listing a {
	color: @color-font;
	}
	}

	a.toolbar-button {
	@media screen and (min-width: (@screen-width-large + 1px)) {
	line-height: 1.5;
	padding: .45rem;

	&:before {
	float: none !important;
	height: 1.75rem !important;
	line-height: 1.5;
	width: auto !important;
	}

	span.inner {
	display: inline !important;
	font-weight: normal;
	font-size: 90%;
	}
	}
	}

	/* Menu button icons */

	.menu a {
	&.mail:before {
	content: @fa-var-envelope;
	}
	&.contacts:before {
	content: @fa-var-users;
	}
	- &.settings:before {
	+ &.options:before {
	content: @fa-var-sliders-h;
	}
	+ &.settings:before {
	+ content: @fa-var-cog;
	+ }
	&.help:before {
	content: @fa-var-life-ring;
	}
	&.logout:before {
	content: @fa-var-power-off;
	}
	&.about:before {
	content: @fa-var-question;
	}
	&.refresh:before {
	content: @fa-var-sync;
	}
	&.compose:before {
	content: @fa-var-edit;
	}
	&.calendar:before {
	content: @fa-var-calendar-alt;
	}
	&.tasklist:before {
	content: @fa-var-tasks;
	}
	&.files:before {
	content: @fa-var-folder;
	}
	&.notes:before {
	content: @fa-var-sticky-note;
	}
	&.chat:before {
	content: @fa-var-comments;
	}
	&.actions:before {
	content: @fa-var-cog;
	}
	&.addressbook:before {
	content: @fa-var-user;
	}
	&.archive:before {
	content: @fa-var-archive;
	}
	&.assigngroup:before {
	content: @fa-var-user-plus;
	}
	&.attach:before,
	&.vcard:before {
	content: @fa-var-paperclip;
	}
	&.next:before {
	content: @fa-var-arrow-right;
	}
	&.prev:before,
	&.back:before {
	content: @fa-var-arrow-left;
	}
	&.check:before {
	content: "";
	}
	&.check.selected:before {
	content: @fa-var-check;
	}
	&.closewin:before {
	content: @fa-var-window-close;
	}
	&.collapse:before {
	content: @fa-var-angle-down;
	}
	&.copy:before {
	content: @fa-var-copy;
	}
	&.create:before {
	content: @fa-var-plus-square;
	}
	&.delete:before {
	content: @fa-var-trash-alt;
	}
	&.download:before,
	&.download.eml:before,
	&.download.maildir:before,
	&.download.mbox:before {
	content: @fa-var-download;
	}
	&.dropdown:before {
	content: @fa-var-caret-down;
	}
	&.edit:before {
	content: @fa-var-pencil-alt;
	}
	&.encrypt:before,
	&.enigma:before {
	content: @fa-var-lock;
	}
	&.encrypt.sign:before {
	content: @fa-var-lock; // TODO
	}
	&.expand:before {
	content: @fa-var-angle-right;
	}
	- &.expand.all:before,
	- &.expand.none:before,
	- &.expand.unread:before {
	- content: @fa-var-comments;
	+ &.expand.all:before {
	+ content: @fa-var-angle-double-down;
	+ }
	+ &.expand.none:before {
	+ content: @fa-var-angle-double-up;
	}
	&.export:before,
	&.export.all:before,
	&.export.selection:before {
	content: @fa-var-download;
	}
	&.expunge:before {
	content: @fa-var-compress-arrows-alt;
	}
	&.extwin:before {
	content: @fa-var-external-link-square-alt;
	}
	&.filterlink:before {
	content: @fa-var-filter;
	}
	&.firstpage:before {
	content: @fa-var-angle-double-left;
	}
	&.nextpage:before {
	content: @fa-var-angle-right;
	}
	&.prevpage:before {
	content: @fa-var-angle-left;
	}
	&.lastpage:before {
	content: @fa-var-angle-double-right;
	}
	&.flag:before,
	&.select.flagged:before {
	.font-icon-solid(@fa-var-flag);
	}
	&.unflag:before {
	.font-icon-regular(@fa-var-flag);
	}
	&.folders:before {
	content: @fa-var-folder;
	}
	&.forward:before,
	&.forward.attachment:before,
	&.forward.bounce:before,
	&.forward.inline:before {
	content: @fa-var-share;
	}
	&.import:before,
	&.upload:before {
	content: @fa-var-upload;
	}
	&.insertresponse:before {
	content: @fa-var-comment;
	}
	&.junk:before {
	content: @fa-var-fire-alt;
	}
	&.notjunk:before {
	content: @fa-var-inbox;
	}
	&.markmessage:before {
	content: @fa-var-tag;
	}
	&.more:before {
	content: @fa-var-ellipsis-h;
	}
	&.move:before {
	content: @fa-var-folder-open;
	}
	&.print:before {
	content: @fa-var-print;
	}
	&.properties:before {
	content: @fa-var-file;
	}
	&.purge:before {
	content: @fa-var-eraser;
	}
	&.qrcode:before {
	content: @fa-var-qrcode;
	}
	&.read:before {
	.font-icon-regular(@fa-var-envelope-open);
	}
	&.unread:before,
	+ &.expand.unread:before,
	&.select.unread:before {
	.font-icon-solid(@fa-var-envelope);
	}
	&.recipient:before {
	.font-icon-regular(@fa-var-envelope);
	}
	&.refresh:before {
	content: @fa-var-sync;
	}
	&.remove:before {
	content: @fa-var-eraser;
	}
	&.removegroup:before {
	content: @fa-var-user-times;
	}
	&.rename:before {
	content: @fa-var-pencil-alt;
	}
	&.reply:before {
	content: @fa-var-reply;
	}
	&.reply-all:before,
	&.reply.all:before,
	&.reply.list:before {
	content: @fa-var-reply-all;
	}
	&.responses:before {
	content: @fa-var-comment;
	}
	&.rotate:before {
	content: @fa-var-redo-alt;
	}
	&.save:before {
	.font-icon-regular(@fa-var-save);
	}
	&.search:before {
	content: @fa-var-search;
	}
	&.search.delete:before {
	content: @fa-var-trash-alt;
	}
	&.select:before {
	- .font-icon-regular(@fa-var-check-circle);
	+ content: @fa-var-mouse-pointer;
	}
	&.select.all:before {
	- content: @fa-var-check-square;
	+ content: @fa-var-asterisk;
	}
	&.select.invert:before {
	- content: @fa-var-square;
	+ content: @fa-var-check-square;
	}
	&.select.none:before {
	.font-icon-solid(@fa-var-times);
	}
	&.select.page:before {
	.font-icon-solid(@fa-var-bars);
	}
	&.selection:before {
	- content: @fa-var-mouse-pointer;
	+ .font-icon-regular(@fa-var-check-square);
	}
	&.send:before {
	content: @fa-var-paper-plane;
	}
	- &.settings:before {
	- content: @fa-var-sliders-h;
	- }
	&.showurl:before {
	content: @fa-var-link;
	}
	&.signature:before {
	content: @fa-var-signature;
	}
	&.source:before {
	content: @fa-var-file-code;
	}
	&.spellcheck:before {
	content: @fa-var-spell-check;
	}
	&.status:before {
	.font-icon-regular(@fa-var-lightbulb);
	}
	&.submit:before {
	content: @fa-var-check;
	}
	&.threads:before {
	content: @fa-var-comments;
	}
	&.zoomin:before {
	content: @fa-var-search-plus;
	}
	&.zoomout:before {
	content: @fa-var-search-minus;
	}
	}


	/* Searchbar and searchoptions widgets */

	.searchbar {
	height: @layout-searchbar-height;
	min-height: @layout-searchbar-height; // because of Flexbox
	line-height: @layout-searchbar-height;
	background-color: @color-searchbar-background;
	border-bottom: 1px solid @color-list-border;
	display: flex;
	align-items: center;
	overflow: hidden;
	position: relative;

	form {
	flex: 1;
	display: flex;

	&:before {
	&:extend(.font-icon-class);
	content: @fa-var-search;
	height: @layout-searchbar-height;
	color: @color-list-pagenav;
	margin: 0 0 0 .75rem;
	}
	}

	input {
	width: 100%;
	border: 0;
	background: transparent;
	padding: .5rem;
	line-height: normal; // fixes placeholder misalignment in IE11
	outline: 0; // removes focus outline in Chrome

	&::-ms-clear {
	display: none; // for IE
	}
	}

	a {
	color: @color-toolbar-button;

	&:before {
	&:extend(.font-icon-class);
	width: 2rem;
	height: @layout-searchbar-height;
	margin: 0;
	}

	&.options:before {
	content: @fa-var-angle-down;
	}

	&.reset:before {
	content: @fa-var-times;
	font-size: 1rem;
	}

	&.unread:before {
	.font-icon-solid(@fa-var-envelope);
	}

	&.reset,
	&.search {
	display: none;
	}

	&.selected {
	color: @color-success;
	}
	}

	span.inner {
	display: none;
	}

	&.active {
	a.reset {
	display: inline;
	}
	}

	&.open a.options:before {
	content: @fa-var-angle-up;
	}
	}

	.searchoptions {
	button.search {
	width: 100%;
	}

	ul.proplist {
	& + div {
	margin-top: 1rem;
	}
	}

	.input-group {
	&:not(:last-child) {
	margin-bottom: .5rem;
	}

	.input-group-prepend {
	width: 30%;
	}

	label {
	width: 100%;
	}
	}

	.formbuttons {
	// this is needed because we hide .formbuttons on small devices
	// we don't want it for search options form
	display: block !important;
	}
	}


	/* Taskmenu */

	#taskmenu {
	a {
	display: block;
	float: none;
	}

	@media screen and (max-width: @screen-width-xs) {
	z-index: 30001; // because autocompletion popup uses z-index:30000
	overflow-x: hidden;

	a {
	max-width: unset;
	padding: 0 .5em;
	margin-top: 1px;
	text-align: left;
	line-height: @layout-touch-menu-record-height;
	height: @layout-touch-menu-record-height;
	border-bottom: 1px solid @color-list-border !important;
	color: @color-list;
	font-size: 1.2rem;

	&:before {
	float: left !important;
	width: 1.2em !important;
	margin-right: .5rem !important;
	}
	}

	span.inner {
	font-size: 100%;
	}
	}

	@media screen and (min-width: (@screen-width-xs + 1px)) {
	a {
	color: @color-taskmenu-button;
	padding: .45rem 0;
	min-width: unset;

	&.selected {
	color: @color-taskmenu-button-selected;
	background: @color-taskmenu-button-selected-background;

	&:hover {
	color: @color-taskmenu-button-selected-hover;
	background: @color-taskmenu-button-background-hover;
	}
	}

	&:hover {
	color: @color-taskmenu-button-hover;
	background: @color-taskmenu-button-background-hover;
	}
	}

	.special-buttons {
	position: absolute;
	bottom: 0;
	left: 0;
	background-color: @color-taskmenu-background;
	}

	.action-buttons {
	a {
	color: @color-taskmenu-button-action;
	background: @color-taskmenu-button-action-background;

	&:hover {
	color: @color-taskmenu-button-action-hover;
	background: @color-taskmenu-button-action-background-hover;
	}
	}
	}

	a.logout {
	color: @color-taskmenu-button-logout-hover !important;
	}
	}

	@media screen and (min-width: (@screen-width-xs + 1px)) and (max-width: @screen-width-medium) {
	a {
	width: @layout-menu-width-sm;
	height: @layout-menu-width-sm;
	font-size: 1.2rem;
	padding: 0;

	&:before {
	line-height: @layout-menu-width-sm;
	}
	}

	span.inner {
	display: none;
	}
	}

	@media screen and (min-width: (@screen-width-medium + 1px)) {
	a {
	width: @layout-menu-width;
	font-size: 1rem;

	&:before {
	float: none; // fixed overflowing text in Edge
	}

	&:focus {
	background-color: @color-taskmenu-button-selected-background;
	}
	}

	span.inner {
	padding: 0 .1em;
	}
	}
	}
	diff --git a/skins/elastic/templates/addressbook.html b/skins/elastic/templates/addressbook.html
	index d327c121e..ce8886e1a 100644
	--- a/skins/elastic/templates/addressbook.html
	+++ b/skins/elastic/templates/addressbook.html
	@@ -1,158 +1,158 @@
	<roundcube:include file="includes/layout.html" />
	<roundcube:include file="includes/menu.html" />

	<h1 class="voice"><roundcube:label name="addressbook" /></h1>

	<!-- sources/groups list -->
	<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="directorylist-header">
	<div class="header">
	<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
	<span id="directorylist-header" class="header-title"><roundcube:label name="groups" /></span>
	<roundcube:button name="groupoptions" type="link" title="arialabelabookgroupoptions" label="actions"
	class="button icon sidebar-menu" innerClass="inner" data-popup="groupoptions-menu" />
	</div>
	<div class="scroller">
	<roundcube:object name="directorylist" id="directorylist" class="treelist listing iconized" />
	<h3 class="voice"><roundcube:label name="savedsearches" /></h3>
	<roundcube:object name="savedsearchlist" id="savedsearchlist" class="treelist listing iconized" />
	</div>
	</div>

	<!-- contacts list -->
	<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-contactslist">
	<div class="header">
	<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
	<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="groups" /></span></a>
	<roundcube:object name="addresslisttitle" label="contacts" tag="span" class="header-title" />
	<div class="toolbar menu" role="toolbar">
	<a href="#select" class="button select disabled" data-popup="listselect-menu" data-toggle-button="list-toggle-button" title="<roundcube:label name="select" />"><span class="inner"><roundcube:label name="select" /></span></a>
	<roundcube:container name="listcontrols" id="listcontrols" />
	</div>
	<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
	</div>
	<roundcube:object name="searchform" id="searchform" wrapper="searchbar menu"
	label="contactsearchform" buttontitle="findcontacts" options="searchmenu" ariatag="h2" />
	<div id="searchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu">
	<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
	<div class="formcontent">
	<ul class="proplist">
	<li><label><input type="checkbox" name="s_mods[]" value="name" /><roundcube:label name="name" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="firstname" /><roundcube:label name="firstname" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="surname" /><roundcube:label name="surname" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="email" /><roundcube:label name="email" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="*" /><roundcube:label name="allfields" /></label></li>
	</ul>
	</div>
	<div class="formbuttons">
	<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
	</div>
	</div>
	<div class="scroller">
	<h2 id="aria-label-contactslist" class="voice"><roundcube:label name="contacts" /></h2>
	<roundcube:object name="addresslist" id="contacts-table" class="listing iconized contactlist"
	noheader="true" role="listbox" data-list="contact_list"
	data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="add" />
	</div>
	<roundcube:include file="includes/pagenav.html" />
	</div>

	<!-- contact details frame -->
	<div id="layout-content" role="main">
	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
	<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
	<span class="header-title"></span>
	<!-- toolbar -->
	<div id="addressbooktoolbar" class="toolbar menu">
	<roundcube:button command="add" type="link" class="create disabled" classAct="create"
	label="create" title="newcontact" innerclass="inner" data-fab="true" />
	<roundcube:button command="print" type="link" data-hidden="small"
	class="print disabled" classAct="print"
	label="print" title="printcontact" innerclass="inner" />
	<roundcube:button command="delete" type="link" class="delete disabled" classAct="delete"
	label="delete" title="deletecontact" innerClass="inner" />
	<span class="spacer"></span>
	<roundcube:button command="advanced-search" type="link" class="search disabled" classAct="search"
	label="search" title="advsearch" innerclass="inner" />
	<roundcube:container name="toolbar" id="addressbooktoolbar" />
	<roundcube:button command="import" type="link" class="import disabled" classAct="import"
	label="import" title="importcontacts" innerclass="inner" />
	<span class="dropbutton">
	<roundcube:button command="export" type="link" class="export disabled" classAct="export"
	label="export" title="exportvcards" innerclass="inner" />
	<a href="#export" class="dropdown" data-popup="export-menu">
	<span class="inner"><roundcube:label name="arialabelcontactexportoptions" /></span>
	</a>
	</span>
	<roundcube:button name="contactmenulink" id="contactmenulink" type="link"
	class="more" label="more" title="moreactions"
	data-popup="contact-menu" innerclass="inner" />
	</div>
	</div>
	<h2 id="aria-label-contact-frame" class="voice"><roundcube:label name="contactproperties" /></h2>
	<div class="iframe-wrapper">
	<roundcube:object name="contentframe" id="contact-frame" src="env:blankpage" title="contactproperties"
	aria-labelledby="aria-label-contact-frame" />
	</div>
	</div>

	<!-- popup menus -->
	<div id="export-menu" class="popupmenu">
	<h3 id="aria-label-export-menu" class="voice"><roundcube:label name="arialabelcontactexportoptions" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-export-menu">
	<roundcube:button type="link-menuitem" command="export" label="exportall" prop="sub" class="export all disabled" classAct="export all active" />
	- <roundcube:button type="link-menuitem" command="export-selected" label="exportsel" prop="sub" class="export selection disabled" classAct="export selection active" />
	+ <roundcube:button type="link-menuitem" command="export-selected" label="exportsel" prop="sub" class="export select disabled" classAct="export select active" />
	</ul>
	</div>

	<div id="groupoptions-menu" class="popupmenu">
	<h3 id="aria-label-groupoptions-menu" class="voice"><roundcube:label name="arialabelabookgroupoptions" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-groupoptions-menu">
	<roundcube:button type="link-menuitem" command="group-create" title="newgroup" label="addgroup" class="create disabled" classAct="create active" />
	<roundcube:button type="link-menuitem" command="group-rename" label="grouprename" class="group rename disabled" classAct="group rename active" />
	<roundcube:button type="link-menuitem" command="group-delete" label="groupdelete" class="group delete disabled" classAct="group delete active" />
	<roundcube:button type="link-menuitem" command="search-create" label="searchsave" class="search disabled" classAct="search active" />
	<roundcube:button type="link-menuitem" command="search-delete" label="searchdelete" class="search delete disabled" classAct="search delete active" />
	<roundcube:container name="groupoptions" id="groupoptionsmenu" />
	</ul>
	</div>

	<div id="listselect-menu" class="popupmenu">
	<h3 id="aria-label-listselect-menu" class="voice"><roundcube:label name="arialabellistselectmenu" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-listselect-menu">
	<roundcube:button type="link-menuitem" label="selection" class="selection" classAct="selection active"
	name="list-toggle-button" id="list-toggle-button"
	onclick="if ($(this).is('.active')) $('#contacts-table').toggleClass('withselection');" />
	<roundcube:button command="select-all" type="link-menuitem" prop="page" label="currpage" class="select page disabled" classAct="select page active" />
	<roundcube:button command="select-all" type="link-menuitem" prop="invert" label="invert" class="select invert disabled" classAct="select invert active" />
	<roundcube:button command="select-none" type="link-menuitem" label="none" class="select none disabled" classAct="select none active" />
	</ul>
	</div>

	<div id="dragcontact-menu" class="popupmenu">
	<h3 id="aria-label-dragcontact-menu" class="voice"><roundcube:label name="arialabeldropactionmenu" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-dragcontact-menu">
	<roundcube:button type="link-menuitem" command="move" onclick="return rcmail.drag_menu_action('move')" label="move" class="disabled" classAct="active" />
	<roundcube:button type="link-menuitem" command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" class="disabled" classAct="active" />
	</ul>
	</div>

	<div id="contact-menu" class="popupmenu">
	<h3 id="aria-label-contact-menu" class="voice"><roundcube:label name="arialabelmorecontactactions" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-contact-menu">
	<roundcube:if condition="env:qrcode" />
	<roundcube:button type="link-menuitem" command="qrcode" label="qrcode" class="qrcode disabled" classAct="qrcode active" />
	<roundcube:endif />
	<roundcube:button type="link-menuitem" command="group-assign-selected" label="groupassign" class="assigngroup disabled" classAct="assigngroup active" innerclass="folder-selector-link" aria-haspopup="true" />
	<roundcube:button type="link-menuitem" command="group-remove-selected" label="groupremove" class="removegroup disabled" classAct="removegroup active" />
	<roundcube:if condition="env:contact_move_enabled" />
	<roundcube:button type="link-menuitem" command="move" label="moveto" class="move disabled" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
	<roundcube:endif />
	<roundcube:if condition="env:contact_copy_enabled" />
	<roundcube:button type="link-menuitem" command="copy" label="copyto" class="copy disabled" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
	<roundcube:endif />
	<roundcube:container name="contactmenu" id="contact-menu" />
	</ul>
	</div>

	<roundcube:include file="includes/footer.html" />
	diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
	index 5d8adf766..7c2f11dca 100644
	--- a/skins/elastic/templates/compose.html
	+++ b/skins/elastic/templates/compose.html
	@@ -1,282 +1,282 @@
	<roundcube:include file="includes/layout.html" />
	<roundcube:include file="includes/menu.html" condition="!env:extwin && !env:framed" />
	<roundcube:add_label name="recipientsadded" />
	<roundcube:add_label name="nocontactselected" />
	<roundcube:add_label name="recipient" />
	<roundcube:add_label name="insert" />
	<roundcube:add_label name="insertcontact" />
	<roundcube:add_label name="recipientedit" />

	<h1 class="voice"><roundcube:label name="compose" /></h1>

	<!-- compose options and attachments list -->
	<div id="layout-sidebar" class="listbox sidebar-right">
	<div class="header">
	<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
	<span class="header-title all-sizes"><roundcube:label name="optionsandattachments" /></span>
	</div>
	<div class="scroller">
	<!-- attachments -->
	<div id="compose-attachments" class="file-upload" role="region" aria-labelledby="aria-label-compose-attachments">
	<h2 id="aria-label-compose-attachments" class="voice"><roundcube:label name="attachments" /></h2>
	<div class="upload-form">
	<roundcube:object name="composeAttachmentForm" mode="hint" />
	<button type="button" class="btn btn-secondary attach" tabindex="2" onclick="rcmail.upload_input('uploadform')"><roundcube:label name="addattachment" /></button>
	</div>
	<roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" tabindex="2" />
	<roundcube:object name="fileDropArea" id="compose-attachments" />
	</div>
	<!-- compose options -->
	<div id="compose-options" class="formcontent" role="region" aria-labelledby="aria-label-composeoptions">
	<h2 id="aria-label-composeoptions" class="voice"><roundcube:label name="arialabelcomposeoptions" /></h2>
	<roundcube:container name="composeoptions" id="compose-options" />
	<roundcube:if condition="!in_array('mdn_default', (array)config:dont_override)" />
	<div class="form-group row form-check">
	<label for="compose-mdn" class="col-form-label col-6"><roundcube:label name="returnreceipt" /></label>
	<div class="col-6 form-check">
	<roundcube:object name="mdnCheckBox" id="compose-mdn" noform="true" tabindex="2" class="form-check-input" />
	</div>
	</div>
	<roundcube:endif />
	<roundcube:if condition="!in_array('dsn_default', (array)config:dont_override)" />
	<div class="form-group row form-check">
	<label for="compose-dsn" class="col-form-label col-6"><roundcube:label name="dsn" /></label>
	<div class="col-6 form-check">
	<roundcube:object name="dsnCheckBox" id="compose-dsn" noform="true" tabindex="2" class="form-check-input" />
	</div>
	</div>
	<roundcube:endif />
	<div class="form-group row">
	<label for="compose-priority" class="col-form-label col-6"><roundcube:label name="priority" /></label>
	<div class="col-6">
	<roundcube:object name="prioritySelector" id="compose-priority" noform="true" tabindex="2" />
	</div>
	</div>
	<roundcube:if condition="!config:no_save_sent_messages" />
	<div class="form-group row">
	<label for="compose-store-target" class="col-form-label col-6"><roundcube:label name="savesentmessagein" /></label>
	<div class="col-6">
	<roundcube:object name="storetarget" id="compose-store-target" noform="true" tabindex="2" />
	</div>
	</div>
	<roundcube:endif />
	<roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
	<div class="form-group row hidden">
	<label for="editor-selector" class="col-form-label col-6"><roundcube:label name="editortype" /></label>
	<div class="col-6">
	<roundcube:object name="editorSelector" id="editor-selector" editorid="composebody" noform="true" tabindex="2" />
	</div>
	</div>
	<roundcube:endif />
	</div>
	</div>
	</div>

	<div id="layout-content" class="listbox selected" role="main">
	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
	<div class="header">
	<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
	<span class="header-title"><roundcube:label name="compose" /></span>
	<!-- toolbar -->
	<div id="messagetoolbar" class="toolbar menu" role="toolbar" aria-labelledby="aria-label-toolbar">
	- <a class="settings" href="#options" onclick="UI.show_sidebar()" data-hidden="big">
	+ <a class="options" href="#options" onclick="UI.show_sidebar()" data-hidden="big">
	<span class="inner"><roundcube:label name="optionsandattachments"></span>
	</a>
	<roundcube:button command="savedraft" type="link" class="save draft disabled" classAct="save draft"
	label="save" title="savemessage" tabindex="2" innerclass="inner" data-content-button="true" />
	<span class="spacer"></span>
	<roundcube:button name="addattachment" type="link" class="attach"
	label="attach" title="addattachment" data-hidden="small"
	onclick="if (!$(this).is('.disabled')) rcmail.upload_input('uploadform')"
	aria-haspopup="true" aria-expanded="false" tabindex="2" innerclass="inner" />
	<roundcube:button command="insert-sig" type="link" class="signature disabled" classAct="signature"
	label="signature" title="insertsignature" tabindex="2" innerclass="inner" />
	<a href="#responses" class="responses" label="responses" title="<roundcube:label name='insertresponse' />" unselectable="on" tabindex="2" data-popup="responses-menu">
	<span class="inner"><roundcube:label name="responses" /></span>
	</a>
	<roundcube:if condition="!empty(env:spell_langs)" />
	<span class="dropbutton">
	<roundcube:button command="spellcheck" type="link" class="spellcheck disabled"
	classAct="spellcheck" classSel="button spellcheck pressed"
	label="spellcheck" title="checkspelling" tabindex="2" innerclass="inner" />
	<a href="#languages" class="dropdown" tabindex="2" data-popup="spell-menu">
	<span class="inner"><roundcube:label name="language" /></span>
	</a>
	</span>
	<roundcube:endif />
	<span class="dropbutton" style="display:none">
	<roundcube:button command="compose-encrypted" type="link" class="encrypt disabled"
	classAct="encrypt" classSel="encrypt selected" innerclass="inner"
	label="encrypt" title="encryptmessagemailvelope" tabindex="2" />
	<a href="#encryption" id="encryption-menu-button" class="dropdown" tabindex="2" data-popup="encryption-menu">
	<span class="inner"><roundcube:label name="encryptmessagemailvelope" /></span>
	</a>
	</span>
	<roundcube:container name="toolbar" id="compose-toolbar" />
	</div>
	</div>
	<div id="compose-content" class="formcontainer content scroller">
	<roundcube:object name="composeFormHead" role="main" class="formcontent" />
	<!-- message headers -->
	<div id="compose-headers" role="region" aria-labelledby="aria-label-composeheaders">
	<h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabelmessageheaders" /></h2>
	<div class="compose-headers">
	<div id="compose_from" class="form-group row">
	<label for="_from" class="col-2 col-form-label"><roundcube:label name="from" /></label>
	<div class="col-10">
	<div class="input-group">
	<roundcube:object name="composeHeaders" part="from" id="_from" form="form" tabindex="1" class="form-control" />
	<span class="input-group-append">
	<a href="#identities" onclick="return rcmail.command('switch-task', 'settings/identities')" class="input-group-text icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
	</span>
	</div>
	</div>
	</div>
	<div id="compose_to" class="form-group row">
	<label for="_to" class="col-2 col-form-label"><roundcube:label name="to" /></label>
	<div class="col-10">
	<div class="input-group">
	<roundcube:object name="composeHeaders" part="to" id="_to" form="form" tabindex="1" aria-required="true" data-recipient-input="true" />
	<span class="input-group-append">
	<a href="#add-contact" onclick="UI.recipient_selector('to')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
	</span>
	<span class="input-group-append">
	<a href="#add-header" data-popup="headers-menu" class="input-group-text icon add" title="<roundcube:label name="addheader" />" tabindex="1"><span class="inner"><roundcube:label name="addheader" /></span></a>
	</span>
	</div>
	</div>
	</div>
	<div id="compose_cc" class="hidden form-group row">
	<label for="_cc" class="col-2 col-form-label"><roundcube:label name="cc" /></label>
	<div class="col-10">
	<div class="input-group">
	<roundcube:object name="composeHeaders" part="cc" id="_cc" form="form" tabindex="1" data-recipient-input="true" />
	<span class="input-group-append">
	<a href="#add-contact" onclick="UI.recipient_selector('cc')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
	</span>
	<span class="input-group-append">
	<a href="#delete" onclick="UI.header_reset('_cc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
	</span>
	</div>
	</div>
	</div>
	<div id="compose_bcc" class="hidden form-group row">
	<label for="_bcc" class="col-2 col-form-label"><roundcube:label name="bcc" /></label>
	<div class="col-10">
	<div class="input-group">
	<roundcube:object name="composeHeaders" part="bcc" id="_bcc" form="form" tabindex="1" data-recipient-input="true" />
	<span class="input-group-append">
	<a href="#add-contact" onclick="UI.recipient_selector('bcc')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
	</span>
	<span class="input-group-append">
	<a href="#delete" onclick="UI.header_reset('_bcc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
	</span>
	</div>
	</div>
	</div>
	<div id="compose_replyto" class="hidden form-group row">
	<label for="_replyto" class="col-2 col-form-label"><roundcube:label name="replyto" /></label>
	<div class="col-10">
	<div class="input-group">
	<roundcube:object name="composeHeaders" part="replyto" id="_replyto" form="form" tabindex="1" data-recipient-input="true" />
	<span class="input-group-append">
	<a href="#add-contact" onclick="UI.recipient_selector('replyto')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
	</span>
	<span class="input-group-append">
	<a href="#delete" onclick="UI.header_reset('_replyto')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
	</span>
	</div>
	</div>
	</div>
	<div id="compose_followupto" class="hidden form-group row">
	<label for="_followupto" class="col-2 col-form-label"><roundcube:label name="followupto" /></label>
	<div class="col-10">
	<div class="input-group">
	<roundcube:object name="composeHeaders" part="followupto" id="_followupto" form="form" tabindex="1" data-recipient-input="true" />
	<span class="input-group-append">
	<a href="#add-contact" onclick="UI.recipient_selector('followupto')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
	</span>
	<span class="input-group-append">
	<a href="#delete" onclick="UI.header_reset('_followupto')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
	</span>
	</div>
	</div>
	</div>
	<div id="compose_subject" class="form-group row">
	<label for="compose-subject" class="col-2 col-form-label"><roundcube:label name="subject" /></label>
	<div class="col-10">
	<roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="1" class="form-control" />
	</div>
	</div>
	</div>
	</div>
	<!-- message compose body -->
	<div id="composebodycontainer">
	<label for="composebody" class="voice"><roundcube:label name="arialabelmessagebody" /></label>
	<roundcube:object name="composeBody" id="composebody" form="form" cols="70" rows="20" class="form-control" tabindex="1" />
	<div id="composestatusbar"></div>
	</div>
	</form>
	<div class="formbuttons">
	<roundcube:button command="send" class="btn btn-primary send" label="send" tabindex="1" data-content-button="true" />
	</div>
	</div>
	</div>

	<roundcube:object name="composeAttachmentForm" id="uploadform" mode="smart" />

	<div id="spell-menu" class="popupmenu" data-popup-init="spellmenu"></div>

	<div id="headers-menu" class="popupmenu" data-popup-init="headersmenu">
	<h3 id="aria-label-headersmenu" class="voice"><roundcube:label name="arialabelheadersmenu" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-headersmenu">
	<li role="menuitem"><a data-target="cc" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="cc" /></a></li>
	<li role="menuitem"><a data-target="bcc" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="bcc" /></a></li>
	<li role="menuitem"><a data-target="replyto" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="replyto" /></a></li>
	<li role="menuitem"><a data-target="followupto" href="#" role="button" tabindex="-1" class="recipient active"><roundcube:label name="followupto" /></a></li>
	</ul>
	</div>

	<div id="responses-menu" class="popupmenu">
	<h3 id="aria-label-responsesmenu" class="voice"><roundcube:label name="arialabelresponsesmenu" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-responsesmenu">
	<li role="separator" class="separator"><label><roundcube:label name="insertresponse" /></label></li>
	<roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
	<li role="separator" class="separator"><label><roundcube:label name="manageresponses" /></label></li>
	<roundcube:button command="save-response" type="link-menuitem" label="newresponse" class="create responses disabled" classAct="create responses active" unselectable="on" />
	<roundcube:button name="responses" type="link-menuitem" label="editresponses" class="edit responses active" onclick="return rcmail.command('switch-task', 'settings/responses')" />
	</ul>
	</div>

	<div id="attachmentmenu" class="popupmenu">
	<h3 id="aria-label-attachmentmenu" class="voice"><roundcube:label name="arialabelattachmentmenu" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-attachmentmenu">
	<roundcube:button command="open-attachment" id="attachmenuopen" type="link-menuitem" label="open" class="extwin disabled" classAct="extwin active" />
	<roundcube:button command="download-attachment" id="attachmenudownload" type="link-menuitem" label="download" class="download disabled" classAct="download active" />
	<roundcube:button command="rename-attachment" id="attachmenurename" type="link-menuitem" label="rename" class="rename disabled" classAct="rename active" />
	<roundcube:container name="attachmentmenu" id="attachmentoptionsmenu" />
	</ul>
	</div>

	<div id="encryption-menu" class="popupmenu">
	<ul class="menu listing" role="menu">
	<roundcube:button command="compose-encrypted" type="link-menuitem" label="encryptmessage" class="encrypt disabled" classAct="encrypt active" />
	<roundcube:button command="compose-encrypted-signed" type="link-menuitem" label="encryptandsign" class="encrypt sign disabled" classAct="encrypt sign active" />
	</ul>
	</div>

	<div id="recipient-dialog" class="popupmenu" role="region" aria-labelledby="aria-label-composecontacts">
	<div class="listbox">
	<roundcube:object name="searchform" id="searchform" wrapper="searchbar menu"
	label="contactsearchform" buttontitle="findcontacts" ariatag="h2" class="no-bs" />
	<div class="scroller" tabindex="-1">
	<roundcube:object name="addressbooks" id="directorylist" class="treelist listing iconized"
	summary="ariasummarycomposecontacts" />
	<roundcube:object name="addresslist" id="contacts-table" class="listing iconized contactlist"
	noheader="true" role="listbox" data-list="contact_list" data-list-select-replace="#recipient-dialog .pagenav-text" />
	</div>
	<roundcube:include file="includes/pagenav.html" />
	</div>
	</div>

	<roundcube:include file="includes/footer.html" />
	diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html
	index 519b11c29..9ab523797 100644
	--- a/skins/elastic/templates/mail.html
	+++ b/skins/elastic/templates/mail.html
	@@ -1,209 +1,209 @@
	<roundcube:include file="includes/layout.html" />
	<roundcube:include file="includes/menu.html" />

	<h1 class="voice"><roundcube:label name="mail" /></h1>

	<!-- folders list -->
	<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="aria-label-folderlist">
	<div class="header">
	<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
	<span class="header-title username"><roundcube:object name="username" /></span>
	<roundcube:button name="folderactions" type="link" title="folderactions" label="actions"
	class="button icon sidebar-menu" innerclass="inner" data-popup="mailboxoptions-menu" />
	</div>
	<h2 id="aria-label-folderlist" class="voice"><roundcube:label name="arialabelfolderlist" /></h2>
	<div id="folderlist-content" class="scroller">
	<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing folderlist" folder_filter="mail" unreadwrap="%s" />
	</div>
	<div class="footer small">
	<roundcube:if condition="env:quota" />
	<div id="quotadisplay" class="quota-widget">
	<span class="voice"><roundcube:label name="quota"></span>
	<roundcube:object name="quotaDisplay" class="count" display="text" />
	</div>
	<roundcube:endif />
	</div>
	</div>

	<!-- messages list -->
	<div id="layout-list" class="listbox selected">
	<div id="messagelist-header" class="header">
	<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
	<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="mailboxlist" /></span></a>
	<span class="header-title"></span>
	<div class="toolbar menu" role="toolbar">
	<a href="#select" class="select disabled" data-popup="listselect-menu" data-toggle-button="list-toggle-button" title="<roundcube:label name="select" />"><span class="inner"><roundcube:label name="select" /></span></a>
	<roundcube:if condition="env:threads" />
	<a href="#threads" class="threads disabled" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a>
	<roundcube:endif />
	- <roundcube:object name="listmenulink" class="settings active" label="options" innerclass="inner" />
	+ <roundcube:object name="listmenulink" class="options active" label="options" innerclass="inner" />
	<roundcube:container name="listcontrols" id="listcontrols" />
	</div>
	<roundcube:button command="checkmail" type="link" class="button icon toolbar-button refresh"
	label="refresh" title="checkmail" innerclass="inner" />
	<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
	</div>
	<roundcube:add_label name="showunread" />
	<roundcube:object name="searchform" id="mailsearchform" wrapper="searchbar menu"
	label="mailquicksearchbox" buttontitle="findmail" options="searchmenu" ariatag="h2" />
	<div id="searchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="messagelist">
	<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
	<div class="formcontent">
	<ul class="proplist">
	<li><label><input type="checkbox" name="s_mods[]" value="subject" /><roundcube:label name="subject" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="from" /><roundcube:label name="from" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="to" /><roundcube:label name="to" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="cc" /><roundcube:label name="cc" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="bcc" /><roundcube:label name="bcc" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="body" /><roundcube:label name="body" /></label></li>
	<li><label><input type="checkbox" name="s_mods[]" value="text" /><roundcube:label name="msgtext" /></label></li>
	</ul>
	<div class="input-group">
	<div class="input-group-prepend">
	<label for="searchfilter" class="input-group-text"><roundcube:label name="type" /></label>
	</div>
	<roundcube:object name="searchfilter" id="searchfilter" noevent="true" />
	</div>
	<div class="input-group">
	<div class="input-group-prepend">
	<label for="s_interval" class="input-group-text"><roundcube:label name="date" /></label>
	</div>
	<roundcube:object name="searchinterval" id="s_interval" />
	</div>
	<div class="input-group">
	<div class="input-group-prepend">
	<label for="s_scope" class="input-group-text"><roundcube:label name="searchscope" /></label>
	</div>
	<select name="s_scope" id="s_scope">
	<option value="base"><roundcube:label name="currentfolder" /></option>
	<option value="sub"><roundcube:label name="subfolders" /></option>
	<option value="all"><roundcube:label name="allfolders" /></option>
	</select>
	</div>
	</div>
	<div class="formbuttons">
	<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
	</div>
	</div>
	<div id="messagelist-content" class="scroller" tabindex="-1">
	<h2 id="aria-label-messagelist" class="voice"><roundcube:label name="arialabelmessagelist" /></h2>
	<roundcube:object name="messages" id="messagelist" optionsmenuIcon="true"
	class="listing messagelist sortheader fixedheader"
	aria-labelledby="aria-label-messagelist"
	data-list="message_list" data-label-msg="listempty"
	/>
	</div>
	<roundcube:include file="includes/pagenav.html" />
	</div>

	<!-- message preview -->
	<div id="layout-content">
	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
	<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
	<span class="header-title"></span>
	<roundcube:include file="includes/mail-menu.html" />
	</div>
	<h2 id="aria-label-mailpreviewframe" class="voice"><roundcube:label name="arialabelmailpreviewframe" /></h2>
	<div class="iframe-wrapper">
	<roundcube:object name="contentframe"
	id="messagecontframe"
	aria-labelledby="aria-label-mailpreviewframe"
	src="env:blankpage"
	title="arialabelmailpreviewframe"
	/>
	</div>
	</div>

	<!-- popup menus -->

	<div id="dragmessage-menu" class="popupmenu">
	<h3 id="aria-label-dragmessage-menu" class="voice"><roundcube:label name="arialabeldropactionmenu" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-dragmessage-menu">
	<roundcube:button command="move" type="link-menuitem" onclick="return rcmail.drag_menu_action('move')" label="move" class="disabled" classAct="active" />
	<roundcube:button command="copy" type="link-menuitem" onclick="return rcmail.drag_menu_action('copy')" label="copy" class="disabled" classAct="active" />
	</ul>
	</div>

	<div id="mailboxoptions-menu" class="popupmenu">
	<h3 id="aria-label-mailboxoptions-menu" class="voice"><roundcube:label name="arialabelmailboxmenu" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-mailboxoptions-menu">
	<roundcube:button command="expunge" type="link-menuitem" label="compact" class="expunge disabled" classAct="expunge active" />
	<roundcube:button command="purge" type="link-menuitem" label="empty" class="purge disabled" classAct="purge active" />
	<roundcube:button command="mark-all-read" type="link-menuitem" label="markallread" class="read disabled" classAct="read active" />
	<roundcube:button command="folders" task="settings" type="link-menuitem" label="managefolders" class="folders disabled" classAct="folders active" />
	<roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
	</ul>
	</div>

	<div id="listselect-menu" class="popupmenu">
	<h3 id="aria-label-listselect-menu" class="voice"><roundcube:label name="arialabellistselectmenu" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-listselect-menu">
	<roundcube:button type="link-menuitem" label="selection" class="selection disabled" classAct="selection active"
	name="list-toggle-button" id="list-toggle-button"
	onclick="if ($(this).is('.active')) $('#messagelist').toggleClass('withselection');" />
	<roundcube:button command="select-all" type="link-menuitem" label="all" class="select all disabled" classAct="select all active" />
	<roundcube:button command="select-all" type="link-menuitem" prop="page" label="currpage" class="select page disabled" classAct="select page active" />
	<roundcube:button command="select-all" type="link-menuitem" prop="unread" label="unread" class="select unread disabled" classAct="select unread active" />
	<roundcube:button command="select-all" type="link-menuitem" prop="flagged" label="flagged" class="select flagged disabled" classAct="select flagged active" />
	<roundcube:button command="select-all" type="link-menuitem" prop="invert" label="invert" class="select invert disabled" classAct="select invert active" />
	<roundcube:button command="select-none" type="link-menuitem" label="none" class="select none disabled" classAct="select none active" />
	</ul>
	</div>

	<div id="threadselect-menu" class="popupmenu">
	<h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="arialabelthreadselectmenu" /></h3>
	<ul class="menu listing" role="menu" aria-labelledby="aria-label-threadselectmenu">
	- <roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all disabled" classAct="expand all active" />
	<roundcube:button command="expand-unread" type="link-menuitem" label="expand-unread" class="expand unread disabled" classAct="expand unread active" />
	+ <roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all disabled" classAct="expand all active" />
	<roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none disabled" classAct="expand none active" />
	</ul>
	</div>

	<div id="listoptions-menu" class="popupmenu propform" role="dialog" aria-labelledby="aria-label-listoptions">
	<h3 id="aria-label-listoptions" class="voice"><roundcube:label name="arialabelmessagelistoptions" /></h3>
	<roundcube:if condition="!in_array('message_sort_col', (array)config:dont_override)" />
	<div class="form-group row">
	<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
	<div class="col-sm-8">
	<select id="listoptions-sortcol" name="sort_col">
	<option value=""><roundcube:label name="nonesort" /></option>
	<option value="arrival"><roundcube:label name="arrival" /></option>
	<option value="date"><roundcube:label name="sentdate" /></option>
	<option value="subject"><roundcube:label name="subject" /></option>
	<option value="fromto"><roundcube:label name="fromto" /></option>
	<option value="from"><roundcube:label name="from" /></option>
	<option value="to"><roundcube:label name="to" /></option>
	<option value="cc"><roundcube:label name="cc" /></option>
	<option value="size"><roundcube:label name="size" /></option>
	</select>
	</div>
	</div>
	<roundcube:endif />
	<roundcube:if condition="!in_array('message_sort_order', (array)config:dont_override)" />
	<div class="form-group row">
	<label for="listoptions-sortord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
	<div class="col-sm-8">
	<select id="listoptions-sortord" name="sort_ord">
	<option value="ASC"><roundcube:label name="asc" /></option>
	<option value="DESC"><roundcube:label name="desc" /></option>
	</select>
	</div>
	</div>
	<roundcube:endif />
	<roundcube:if condition="env:threads" />
	<div class="form-group row">
	<label for="listoptions-threads" class="col-form-label col-sm-4"><roundcube:label name="lmode" /></label>
	<div class="col-sm-8">
	<select id="listoptions-threads" name="mode">
	<option value="list"><roundcube:label name="list" /></option>
	<option value="threads"><roundcube:label name="threads" /></option>
	</select>
	</div>
	</div>
	<roundcube:endif />
	<roundcube:container name="listoptions" id="listoptionsmenu" />
	<roundcube:add_label name="listoptionstitle" />
	</div>

	<roundcube:include file="includes/footer.html" />

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jun 10, 6:05 AM (1 d, 15 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 196971
Default Alt Text: (74 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions