Fix various issues in Mailvelope integration (#1490533)

Aleksander Machniak

2015-09-20 82dcbb7488ce1625ba4f41fbdc8e6319d3da9691

 skins/larry/templates/compose.html

@@ -16,7 +16,7 @@
<h1 class="voice"><roundcube:object name="pagetitle" /></h1>

<!-- toolbar -->
<h2 id="aria-label-toolbar" class="voice">Application toolbar</h2>
<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
<div id="messagetoolbar" class="toolbar fullwidth" role="toolbar" aria-labelledby="aria-label-toolbar">
   <roundcube:button command="list" type="link" class="button back disabled" classAct="button back" label="cancel" condition="!env:extwin" tabindex="2" />
   <roundcube:button command="close" type="link" class="button close disabled" classAct="button close" label="cancel" condition="env:extwin" tabindex="2" />
@@ -27,12 +27,13 @@
   <roundcube:if condition="config:enable_spellcheck" />
   <span class="dropbutton">
      <roundcube:button command="spellcheck" type="link" class="button spellcheck disabled" classAct="button spellcheck" classSel="button spellcheck pressed" label="spellcheck" title="checkspelling" tabindex="2" />
      <a href="#languages" class="dropbuttontip" id="spellmenulink" onclick="UI.toggle_popup('spellmenu',event);return false" aria-haspopup="true" tabindex="2">Select Spell Language</a>
      <a href="#languages" class="dropbuttontip" id="spellmenulink" onclick="UI.toggle_popup('spellmenu',event);return false" aria-haspopup="true" aria-expanded="false" tabindex="2">Select Spell Language</a>
   </span>
   <roundcube:endif />
   <roundcube:button name="addattachment" type="link" class="button attach" label="attach" title="addattachment" onclick="UI.show_uploadform(event);return false" aria-haspopup="true" tabindex="2" />
   <roundcube:button name="addattachment" type="link" class="button attach" label="attach" title="addattachment" onclick="UI.show_uploadform(event);return false" aria-haspopup="true" aria-expanded="false"tabindex="2" />
   <roundcube:button command="insert-sig" type="link" class="button insertsig disabled" classAct="button insertsig" label="signature" title="insertsignature" tabindex="2" />
   <a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="UI.toggle_popup('responsesmenu',event);return false" tabindex="2" aria-haspopup="true" aria-owns="textresponsesmenu"><roundcube:label name="responses" /></a>
   <a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="UI.toggle_popup('responsesmenu',event);return false" tabindex="2" aria-haspopup="true" aria-expanded="false" aria-owns="textresponsesmenu"><roundcube:label name="responses" /></a>
   <roundcube:button command="compose-encrypted" type="link" class="button encrypt disabled" classAct="button encrypt" classSel="button encrypt selected" label="encrypt" title="encryptmessagemailvelope" tabindex="2" style="display:none" />
   <roundcube:container name="toolbar" id="compose-toolbar" />
</div>

@@ -43,27 +44,27 @@
<!-- inline address book -->
<div id="compose-contacts" class="uibox listbox" role="region" aria-labelledby="aria-label-composecontacts">
<h2 id="aria-label-composecontacts" class="boxtitle"><roundcube:label name="contacts" /></h2>
   <div id="composequicksearch" role="search" aria-labelledby="aria-label-composequicksearch">
      <h3 id="aria-label-composequicksearch" class="voice">Contacts search form</h3>
   <div class="listsearchbox" role="search" aria-labelledby="aria-label-composequicksearch">
      <h3 id="aria-label-composequicksearch" class="voice"><roundcube:label name="arialabelcontactquicksearch" /></h3>
      <div class="searchbox">
         <label for="contactsearchbox" class="voice">Contact search input</label>
         <label for="contactsearchbox" class="voice"><roundcube:label name="arialabelcontactsearchbox" /></label>
         <roundcube:object name="searchform" id="contactsearchbox" />
         <a id="searchmenulink" class="iconbutton searchoptions"> </a>
         <roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
         <a id="searchmenulink" class="iconbutton searchicon"> </a>
         <roundcube:button command="reset-search" class="iconbutton reset" title="resetsearch" content=" " />
      </div>
   </div>
   <roundcube:object name="addressbooks" id="directorylist" class="treelist listing" />
   <roundcube:object name="addressbooks" id="directorylist" class="treelist listing" summary="ariasummarycomposecontacts" />
   <div class="scroller withfooter" tabindex="-1">
      <roundcube:object name="addresslist" id="contacts-table" class="listing iconized" noheader="true" />
      <roundcube:object name="addresslist" id="contacts-table" class="listing iconized" noheader="true" role="listbox" />
   </div>
<div class="boxfooter">
   <roundcube:button command="add-recipient" prop="to" type="link" title="to" class="listbutton addto disabled" classAct="listbutton addto" innerClass="inner" content="To+" /><roundcube:button command="add-recipient" prop="cc" type="link" title="cc" class="listbutton addcc disabled" classAct="listbutton addcc" innerClass="inner" content="Cc+" /><roundcube:button command="add-recipient" prop="bcc" type="link" title="bcc" class="listbutton addbcc disabled" classAct="listbutton addbcc" innerClass="inner" content="Bcc+" />
</div>
<div class="boxpagenav">
   <roundcube:button command="firstpage" type="link" class="icon firstpage disabled" classAct="icon firstpage" title="firstpage" content="|&amp;lt;" />
   <roundcube:button command="previouspage" type="link" class="icon prevpage disabled" classAct="icon prevpage" title="previouspage" content="&amp;lt;" />
   <roundcube:button command="nextpage" type="link" class="icon nextpage disabled" classAct="icon nextpage" title="nextpage" content="&amp;gt;" />
   <roundcube:button command="lastpage" type="link" class="icon lastpage disabled" classAct="icon lastpage" title="lastpage" content="&amp;gt;|" />
   <roundcube:button command="firstpage" type="link" class="icon firstpage disabled" classAct="icon firstpage" title="firstpage" label="first" />
   <roundcube:button command="previouspage" type="link" class="icon prevpage disabled" classAct="icon prevpage" title="previouspage" label="previous" />
   <roundcube:button command="nextpage" type="link" class="icon nextpage disabled" classAct="icon nextpage" title="nextpage" label="next" />
   <roundcube:button command="lastpage" type="link" class="icon lastpage disabled" classAct="icon lastpage" title="lastpage" label="last" />
</div>
</div>

@@ -75,9 +76,9 @@

<!-- message headers -->
<div id="composeheaders" role="region" aria-labelledby="aria-label-composeheaders">
<h2 id="aria-label-composeheaders" class="voice">Message headers</h2>
<h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabelmessageheaders" /></h2>

<a href="#options" id="composeoptionstoggle" class="moreheaderstoggle" title="<roundcube:label name='options' />"><span class="iconlink"></span></a>
<a href="#options" id="composeoptionstoggle" class="moreheaderstoggle" title="<roundcube:label name='togglecomposeoptions' />" aria-expanded="false"><span class="iconlink"></span></a>

<table class="headers-table compose-headers">
<tbody>
@@ -93,25 +94,25 @@
   </tr><tr id="compose-cc">
      <td class="title top">
         <label for="_cc"><roundcube:label name="cc" /></label>
         <a href="#cc" onclick="return UI.hide_header_row('cc');" class="iconbutton cancel" title="<roundcube:label name='delete' /> <roundcube:label name='cc' />" tabindex="3">x</a>
         <a href="#cc" onclick="return UI.hide_header_row('cc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" tabindex="3"><roundcube:label name="delete" /> <roundcube:label name="cc" /></a>
      </td>
      <td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="1" tabindex="1" /></td>
   </tr><tr id="compose-bcc">
      <td class="title top">
         <label for="_bcc"><roundcube:label name="bcc" /></label>
         <a href="#bcc" onclick="return UI.hide_header_row('bcc');" class="iconbutton cancel" title="<roundcube:label name='delete' /> <roundcube:label name='bcc' />" tabindex="3">x</a>
         <a href="#bcc" onclick="return UI.hide_header_row('bcc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" tabindex="3"><roundcube:label name="delete" /> <roundcube:label name="bcc" /></a>
      </td>
      <td class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="1" tabindex="1" /></td>
   </tr><tr id="compose-replyto">
      <td class="title top">
         <label for="_replyto"><roundcube:label name="replyto" /></label>
         <a href="#replyto" onclick="return UI.hide_header_row('replyto');" class="iconbutton cancel" title="<roundcube:label name='delete' /> <roundcube:label name='replyto' />" tabindex="3">x</a>
         <a href="#replyto" onclick="return UI.hide_header_row('replyto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" tabindex="3"><roundcube:label name="delete" /> <roundcube:label name="replyto" /></a>
      </td>
      <td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="1" /></td>
   </tr><tr id="compose-followupto">
      <td class="title top">
         <label for="_followupto"><roundcube:label name="followupto" /></label>
         <a href="#followupto" onclick="return UI.hide_header_row('followupto');" class="iconbutton cancel" title="<roundcube:label name='delete' /> <roundcube:label name='followupto' />" tabindex="3">x</a>
         <a href="#followupto" onclick="return UI.hide_header_row('followupto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" tabindex="3"><roundcube:label name="delete" /> <roundcube:label name="followupto" /></a>
      </td>
      <td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="1" /></td>
   </tr><tr>
@@ -130,12 +131,12 @@
</table>

<div id="composebuttons" class="formbuttons">
   <roundcube:button command="extwin" type="link" class="button extwin" classSel="button extwin pressed" innerClass="icon" title="openinextwin" content="[]" condition="!env:extwin" />
   <roundcube:button command="extwin" type="link" class="button extwin" classSel="button extwin pressed" innerClass="icon" title="openinextwin" label="openinextwin" condition="!env:extwin" />
</div>

<!-- (collapsable) message options -->
<div id="composeoptions" role="region" aria-labelledby="aria-label-composeoptions">
   <h2 id="aria-label-composeoptions" class="voice">Composition options</h2>
   <h2 id="aria-label-composeoptions" class="voice"><roundcube:label name="arialabelcomposeoptions" /></h2>
   <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
   <span class="composeoption">
      <label><roundcube:label name="editortype" />
@@ -146,10 +147,12 @@
      <label for="rcmcomposepriority"><roundcube:label name="priority" />
         <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" tabindex="4" /></label>
   </span>
   <roundcube:if condition="!in_array('mdn_default', (array)config:dont_override)" />
   <span class="composeoption">
      <label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" tabindex="4" /> <roundcube:label name="returnreceipt" /></label>
      <label><roundcube:object name="mdnCheckBox" form="form" id="rcmcomposereceipt" tabindex="4" /> <roundcube:label name="returnreceipt" /></label>
   </span>
   <roundcube:if condition="config:smtp_server != ''" />
   <roundcube:endif />
   <roundcube:if condition="config:smtp_server != '' and !in_array('dsn_default', (array)config:dont_override)" />
   <span class="composeoption">
      <label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" tabindex="4" /> <roundcube:label name="dsn" /></label>
   </span>
@@ -167,15 +170,15 @@
<!-- message compose body -->
<div id="composeview-bottom">
   <div id="composebodycontainer">
      <label for="composebody" class="voice">Message Body</label>
      <label for="composebody" class="voice"><roundcube:label name="arialabelmessagebody" /></label>
      <roundcube:object name="composeBody" id="composebody" form="form" cols="70" rows="20" tabindex="1" />
   </div>
   <div id="compose-attachments" class="rightcol" role="region">
      <h2 id="aria-label-composeoptions" class="voice"><roundcube:label name="attachments" /></h2>
   <div id="compose-attachments" class="rightcol" role="region" aria-labelledby="aria-label-composeattachments">
      <h2 id="aria-label-composeattachments" class="voice"><roundcube:label name="attachments" /></h2>
      <div style="text-align:center; margin-bottom:20px">
         <roundcube:button name="addattachment" type="input" class="button" classSel="button pressed" label="addattachment" onclick="UI.show_uploadform(event);return false" tabindex="1" />
      </div>
      <roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" />
      <roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" tabindex="1" />
      <roundcube:object name="fileDropArea" id="compose-attachments" />
   </div>
<!--
@@ -196,7 +199,7 @@
</div><!-- end mainscreen -->

<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />" aria-hidden="true">
   <h2 id="aria-label-uploaddialog" class="voice">Attachment upload form</h2>
   <h2 id="aria-label-uploaddialog" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h2>
   <roundcube:object name="composeAttachmentForm" id="uploadform" buttons="no" />
   <div class="formbuttons">
      <roundcube:button command="send-attachment" type="input" class="button mainaction" label="upload" />
@@ -207,12 +210,13 @@
<div id="spellmenu" class="popupmenu" aria-hidden="true"></div>

<div id="responsesmenu" class="popupmenu" aria-hidden="true">
   <ul class="toolbarmenu" id="textresponsesmenu" role="menu">
   <h3 id="aria-label-responsesmenu" class="voice"><roundcube:label name="arialabelresponsesmenu" /></h3>
   <ul class="toolbarmenu" id="textresponsesmenu" role="menu" aria-labelledby="aria-label-responsesmenu">
      <li role="separator" class="separator" id=""><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>
      <li role="menuitem"><roundcube:button command="save-response" type="link" label="savenewresponse" classAct="active" unselectable="on" /></li>
      <li role="menuitem"><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li>
      <roundcube:button command="save-response" type="link-menuitem" label="newresponse" classAct="active" unselectable="on" />
      <roundcube:button command="responses" type="link-menuitem" label="editresponses" classAct="active" />
   </ul>
</div>