Merge branch 'dev-accessibility'

Thomas Bruederli

2014-06-05 99cdca46b7bcc46fe6affd9e9f9f60a546b2e5b8

 skins/larry/includes/header.html

@@ -1,5 +1,6 @@
<div id="header">
<div id="topline">
<div id="topline" role="banner" aria-labelledby="aria-label-topnav">
   <h2 id="aria-label-topnav" class="voice"><roundcube:label name="arialabeltopnav" /></h2>
   <div class="topleft">
      <roundcube:container name="topline-left" id="topline-left" />
      <roundcube:button name="about" type="link" label="about" class="about-link" onclick="UI.show_about(this);return false" condition="!env:extwin" />
@@ -21,13 +22,14 @@

<roundcube:if condition="!env:extwin &amp;&amp; !env:framed" />
<div id="topnav">
   <div id="taskbar" class="topright">
   <roundcube:button command="mail" label="mail" class="button-mail" classSel="button-mail button-selected" innerClass="button-inner" />
   <roundcube:button command="addressbook" label="addressbook" class="button-addressbook" classSel="button-addressbook button-selected" innerClass="button-inner" />
   <roundcube:container name="taskbar" id="taskbar" />
   <roundcube:button command="settings" label="settings" class="button-settings" classSel="button-settings button-selected" innerClass="button-inner" />
   <roundcube:button command="logout" label="logout" class="button-logout" classSel="button-logout" innerClass="button-inner" />
   <span class="minmodetoggle"></span>
   <h2 id="aria-label-tasknav" class="voice"><roundcube:label name="arialabeltasknav" /></h2>
   <div id="taskbar" class="topright" role="navigation" aria-labelledby="aria-label-tasknav">
      <roundcube:button command="mail" label="mail" class="button-mail" classSel="button-mail button-selected" innerClass="button-inner" />
      <roundcube:button command="addressbook" label="addressbook" class="button-addressbook" classSel="button-addressbook button-selected" innerClass="button-inner" />
      <roundcube:container name="taskbar" id="taskbar" />
      <roundcube:button command="settings" label="settings" class="button-settings" classSel="button-settings button-selected" innerClass="button-inner" />
      <roundcube:button command="logout" label="logout" class="button-logout" classSel="button-logout" innerClass="button-inner" />
      <span class="minmodetoggle" role="presentation"></span>
   </div>
   <roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" alt="Logo" onclick="if(window.rcmail)rcmail.command('switch-task','mail')" />
</div>