Set aria-selected and aria-expanded state attributes

Thomas Bruederli

2014-05-12 a2f8fa236143b44f90e53c19806cfd0efa014857

 skins/larry/templates/mail.html

@@ -39,10 +39,10 @@
<h2 id="aria-label-searchform" class="voice">Email message search form</h2>
<label for="quicksearchbox" class="voice">Email search input</label>
<roundcube:object name="searchform" id="quicksearchbox" />
<roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.toggle_popup('searchmenu',event);return false" title="searchmod" label="options" aria-haspopup="true" aria-owns="searchmenu-menu" />
<roundcube:button command="menu-open" prop="searchmenu" id="searchmenulink" class="iconbutton searchoptions" title="searchmod" label="options" aria-haspopup="true" aria-expanded="false"aria-owns="searchmenu-menu" />
<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content="Reset" />

<div id="searchmenu" class="popupmenu">
<div id="searchmenu" class="popupmenu" data-editable="true">
   <h3 id="aria-label-searchmenu" class="voice"><roundcube:label name="searchmod" /></h3>
   <ul class="toolbarmenu" id="searchmenu-menu" role="menu" aria-labelledby="aria-label-searchmenu">
      <li role="menuitem"><label><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="subject" /></span></label></li>
@@ -73,7 +73,7 @@
<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing" folder_filter="mail" unreadwrap="%s" />
</div>
<div id="folderlist-footer" class="boxfooter">
   <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="listbutton groupactions" onclick="UI.toggle_popup('mailboxmenu',event);return false" innerClass="inner" content="&#9881;" aria-haspopup="true" aria-owns="mailboxmenu-menu" />
   <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="listbutton groupactions" onclick="UI.toggle_popup('mailboxmenu',event);return false" innerClass="inner" content="&#9881;" aria-haspopup="true" aria-expanded="false"aria-owns="mailboxmenu-menu" />
   <roundcube:if condition="env:quota" />
      <roundcube:object name="quotaDisplay" id="quotadisplay" class="countdisplay" display="text" />
   <roundcube:endif />
@@ -92,12 +92,12 @@

<!-- messagelist -->
<div id="messagelistcontainer" class="boxlistcontent">
<h2 id="aria-label-messagelist" class="voice">Messages list</h2>
<h2 id="aria-label-messagelist" class="voice">Email Messages Listing</h2>
<roundcube:object name="messages"
   id="messagelist"
   class="records-table messagelist sortheader fixedheader"
   optionsmenuIcon="true"
    role="grid"
   summary="Email Messages Listing"
   aria-labelledby="aria-label-messagelist" />
</div>

@@ -109,9 +109,9 @@
   </div>
   
   <div id="listselectors">
   <a href="#select" id="listselectmenulink" class="menuselector" onclick="UI.toggle_popup('listselectmenu', event);return false" aria-haspopup="true" aria-owns="listselectmenu-menu"><span class="handle"><roundcube:label name="select" /></span></a>
   <a href="#select" id="listselectmenulink" class="menuselector" onclick="UI.toggle_popup('listselectmenu', event);return false" aria-haspopup="true" aria-expanded="false"aria-owns="listselectmenu-menu"><span class="handle"><roundcube:label name="select" /></span></a>
   <roundcube:if condition="env:threads" />
      &nbsp; <a href="#threads" id="threadselectmenulink" class="menuselector" onclick="UI.toggle_popup('threadselectmenu', event);return false" aria-haspopup="true" aria-owns="threadselectmenu-menu"><span class="handle"><roundcube:label name="threads" /></span></a>
      &nbsp; <a href="#threads" id="threadselectmenulink" class="menuselector" onclick="UI.toggle_popup('threadselectmenu', event);return false" aria-haspopup="true" aria-expanded="false"aria-owns="threadselectmenu-menu"><span class="handle"><roundcube:label name="threads" /></span></a>
   <roundcube:endif />
   </div>

@@ -136,7 +136,7 @@

<div id="mailpreviewframe" class="iframebox" role="complementary" aria-labelledby="aria-label-mailpreviewframe">
<h2 id="aria-label-mailpreviewframe" class="voice">Message preview</h2>
<roundcube:object name="messagecontentframe" id="messagecontframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
<roundcube:object name="messagecontentframe" id="messagecontframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" title="Message preview" />
</div>

</div><!-- end mailview-bottom -->
@@ -147,14 +147,14 @@

</div><!-- end mainscreen -->

<div id="dragmessagemenu" class="popupmenu">
<div id="dragmessagemenu" class="popupmenu" aria-hidden="true">
   <ul class="toolbarmenu" role="menu">
      <li role="menuitem"><roundcube:button command="move" onclick="return rcmail.drag_menu_action('move')" label="move" classAct="active" /></li>
      <li role="menuitem"><roundcube:button command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" classAct="active" /></li>
   </ul>
</div>

<div id="mailboxmenu" class="popupmenu">
<div id="mailboxmenu" class="popupmenu" aria-hidden="true">
   <h3 id="aria-label-mailboxmenu" class="voice">Folder actions menu</h3>
   <ul id="mailboxmenu-menu" class="toolbarmenu" id="mailboxoptionsmenu" role="menu" aria-labelledby="aria-label-mailboxmenu">
      <li role="menuitem"><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
@@ -165,7 +165,7 @@
   </ul>
</div>

<div id="listselectmenu" class="popupmenu dropdown">
<div id="listselectmenu" class="popupmenu dropdown" aria-hidden="true">
   <h3 id="aria-label-listselectmenu" class="voice">List selection menu</h3>
   <ul id="listselectmenu-menu" class="toolbarmenu iconized" role="menu" aria-labelledby="aria-label-listselectmenu">
      <li role="menuitem"><roundcube:button command="select-all" type="link" label="all" class="icon" classAct="icon active" innerclass="icon mail" /></li>
@@ -177,7 +177,7 @@
   </ul>
</div>

<div id="threadselectmenu" class="popupmenu dropdown">
<div id="threadselectmenu" class="popupmenu dropdown" aria-hidden="true">
   <h3 id="aria-label-threadselectmenu" class="voice">Threads listing menu</h3>
   <ul id="threadselectmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-threadselectmenu">
      <li role="menuitem"><roundcube:button command="expand-all" type="link" label="expand-all" class="icon" classAct="icon active" innerclass="icon conversation" /></li>
@@ -186,7 +186,7 @@
   </ul>
</div>

<div id="listoptions" class="propform popupdialog" role="dialog" aria-labelledby="aria-label-listoptions">
<div id="listoptions" class="propform popupdialog" role="dialog" aria-labelledby="aria-label-listoptions" aria-hidden="true">
<h2 id="aria-label-listoptions" class="voice">Message list display and sorting options</h2>
<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
   <fieldset class="floating">
@@ -236,11 +236,12 @@
   <br style="clear:both" />
   <div class="formbuttons">
      <roundcube:button command="menu-save" id="listmenusave" type="input" class="button mainaction" label="save" />
      <roundcube:button command="menu-open" id="listmenucancel" type="input" class="button" label="cancel" />
      <roundcube:button command="menu-close" prop="messagelistmenu" id="listmenucancel" type="input" class="button" label="cancel" />
   </div>
</div>

<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='importmessages' />">
<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='importmessages' />" aria-hidden="true">
   <h2 id="aria-label-uploaddialog" class="voice">Message import dialog</h2>
   <roundcube:object name="messageimportform" id="uploadform" buttons="no" />
   <div class="formbuttons">
      <roundcube:button command="import-messages" type="input" class="button mainaction" label="upload" />