Skip to content

Commit

Permalink
De-inline skins/elastic
Browse files Browse the repository at this point in the history
  • Loading branch information
@pabzm
pabzm committed Jul 24, 2024
1 parent d31797b commit 315a167
Show file tree
Hide file tree
Showing 10 changed files with 78 additions and 31 deletions.
8 changes: 4 additions & 4 deletions skins/elastic/templates/addressbook.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod"
</ul>
</div>
<div class="formbuttons">
<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
<button type="button" class="btn btn-primary icon search" data-onclick='["command", "search"]'><roundcube:label name="search" /></button>
</div>
</div>
<div class="scroller">
Expand Down Expand Up @@ -121,7 +121,7 @@ <h3 id="aria-label-groupoptions-menu" class="voice"><roundcube:label name="arial
<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="UI.toggle_list_selection(this, 'contacts-table')" />
name="list-toggle-button" id="list-toggle-button" onclick='["ui_toggle_list_selection", "__THIS__", "contacts-table"]' />
<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" />
Expand All @@ -131,8 +131,8 @@ <h3 id="aria-label-listselect-menu" class="voice"><roundcube:label name="arialab
<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" />
<roundcube:button type="link-menuitem" command="move" data-onclick='["drag_menu_action", "move"]' label="move" class="disabled" classAct="active" />
<roundcube:button type="link-menuitem" command="copy" data-onclick='["drag_menu_action", "copy"]' label="copy" class="disabled" classAct="active" />
</ul>
</div>

Expand Down
4 changes: 2 additions & 2 deletions skins/elastic/templates/bounce.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
<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="#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>
<a href="#delete" data-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>
Expand All @@ -46,7 +46,7 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
<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="#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>
<a href="#delete" data-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>
Expand Down
28 changes: 14 additions & 14 deletions skins/elastic/templates/compose.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ <h1 class="voice"><roundcube:label name="compose" /></h1>
<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>
<button type="button" class="btn btn-secondary attach" tabindex="2" data-onclick='["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" />
Expand Down Expand Up @@ -78,15 +78,15 @@ <h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolba
<div id="composestatusbar" class="position-absolute"></div>
<!-- toolbar -->
<div id="messagetoolbar" class="toolbar menu" role="toolbar" aria-labelledby="aria-label-toolbar">
<a class="options" href="#options" onclick="UI.show_sidebar()" data-hidden="big">
<a class="options" href="#options" data-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')"
data-onclick='["ui_upload_input_unless_disabled", "__THIS__"]'
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" />
Expand Down Expand Up @@ -127,7 +127,7 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
<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>
<a href="#identities" data-onclick='["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>
Expand All @@ -138,7 +138,7 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
<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>
<a href="#add-contact" data-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>
Expand All @@ -152,10 +152,10 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
<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>
<a href="#add-contact" data-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>
<a href="#delete" data-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>
Expand All @@ -166,10 +166,10 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
<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>
<a href="#add-contact" data-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>
<a href="#delete" data-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>
Expand All @@ -180,10 +180,10 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
<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>
<a href="#add-contact" data-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>
<a href="#delete" data-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>
Expand All @@ -194,10 +194,10 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
<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>
<a href="#add-contact" data-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>
<a href="#delete" data-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>
Expand Down Expand Up @@ -248,7 +248,7 @@ <h3 id="aria-label-responsesmenu" class="voice"><roundcube:label name="arialabel
<li role="separator" class="separator"><label><roundcube:label name="insertresponse" /></label></li>
<roundcube:object name="responseslist" id="responseslist" tagname="ul" class="rounded-0" itemclass="active" list-placeholder="noresponsesavailable" />
<li role="separator" class="separator"><label><roundcube:label name="manageresponses" /></label></li>
<roundcube:button name="responses" type="link-menuitem" label="editresponses" class="edit responses active" onclick="return rcmail.command('switch-task', 'settings/responses')" />
<roundcube:button name="responses" type="link-menuitem" label="editresponses" class="edit responses active" data-onclick='["command", "switch-task", "settings/responses"]' />
</ul>
</div>

Expand Down
2 changes: 1 addition & 1 deletion skins/elastic/templates/folders.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod"
<roundcube:object name="folderfilter" id="folderlist-filter" noheader="true" noevent="true" />
</div>
<div class="formbuttons">
<button type="button" class="btn btn-primary icon search" onclick="rcmail.folder_filter($('#folderlist-filter').val())"><roundcube:label name="search" /></button>
<button type="button" class="btn btn-primary icon search" data-onclick='["filter_folder", "#folderlist-filter"]'><roundcube:label name="search" /></button>
</div>
</div>
<div class="scroller" tabindex="-1">
Expand Down
2 changes: 1 addition & 1 deletion skins/elastic/templates/includes/mail-menu.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ <h3 id="aria-label-message-menu" class="voice"><roundcube:label name="arialabelm
<roundcube:button type="link-menuitem" command="print" label="printmessage" class="print disabled" classAct="print active" data-hidden="small"/>
<roundcube:if condition="template:name != 'message'" />
<roundcube:button type="link-menuitem" command="import-messages" label="import" class="import disabled" classAct="import active"
name="messageimport" onclick="UI.import_dialog()" />
name="messageimport" data-onclick='["ui_import_dialog"]' />
<roundcube:endif />
<roundcube:button type="link-menuitem" command="download" label="export" class="download disabled" classAct="download active" />
<roundcube:button type="link-menuitem" command="edit" prop="new" label="editasnew" class="edit asnew disabled" classAct="edit asnew active" />
Expand Down
2 changes: 1 addition & 1 deletion skins/elastic/templates/includes/menu.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ <h2 id="aria-label-tasknav" class="voice"><roundcube:label name="arialabeltaskna
<roundcube:button name="theme" label="darkmode" type="link" innerClass="inner" class="theme dark" />
<roundcube:endif />
<roundcube:button name="about" label="about" type="link"
class="about" innerClass="inner" onclick="UI.about_dialog(this)" />
class="about" innerClass="inner" data-onclick='["ui_about_dialog", "__THIS__"]' />
<roundcube:button command="logout" label="logout" type="link"
class="logout" innerClass="inner" />
</span>
Expand Down
8 changes: 4 additions & 4 deletions skins/elastic/templates/mail.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod"
</div>
</div>
<div class="formbuttons">
<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
<button type="button" class="btn btn-primary icon search" data-onclick='["command", "search"]'><roundcube:label name="search" /></button>
</div>
</div>
<div id="messagelist-content" class="scroller" tabindex="-1">
Expand Down Expand Up @@ -132,8 +132,8 @@ <h2 id="aria-label-mailpreviewframe" class="voice"><roundcube:label name="ariala
<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" />
<roundcube:button command="move" type="link-menuitem" data-onclick='["drag_menu_action", "move"]' label="move" class="disabled" classAct="active" />
<roundcube:button command="copy" type="link-menuitem" data-onclick='["drag_menu_action", "copy"]' label="copy" class="disabled" classAct="active" />
</ul>
</div>

Expand All @@ -152,7 +152,7 @@ <h3 id="aria-label-mailboxoptions-menu" class="voice"><roundcube:label name="ari
<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="UI.toggle_list_selection(this, 'messagelist')" />
name="list-toggle-button" id="list-toggle-button" data-onclick='["ui_toggle_list_selection", "__THIS__", "messagelist"]' />
<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" />
Expand Down
4 changes: 2 additions & 2 deletions skins/elastic/templates/message.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ <h2 class="subject">
<div class="header-links">
<roundcube:add_label name="details" />
<roundcube:add_label name="summary" />
<a href="#headers" class="headers-summary" onclick="return UI.headers_show(true)"></a>
<a href="#all-headers" class="headers-all" onclick="return UI.headers_dialog()"><roundcube:label name="headers" /></a>
<a href="#headers" class="headers-summary" data-onclick='["ui_headers_show", true]'></a>
<a href="#all-headers" class="headers-all" data-onclick='["ui_headers_dialog"]'><roundcube:label name="headers" /></a>
<roundcube:add_label name="arialabelmessageheaders" />
<roundcube:if condition="env:optional_format=='text'" />
<roundcube:button command="change-format" prop="text" type="link" class="plain" innerClass="inner"
Expand Down
Loading

0 comments on commit 315a167

Please sign in to comment.