From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names

---
 skins/larry/includes/header.html |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index 4be475b..179b860 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -1,37 +1,39 @@
 <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:button name="about" type="link" label="about" class="about-link" onclick="UI.show_about(this);return false" />
+		<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" />
 		<roundcube:if condition="config:support_url" />
 		<a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link" id="supportlink"><roundcube:label name="support" /></a>
 		<roundcube:endif />
 	</div>
-
+	<roundcube:container name="topline-center" id="topline-center" />
 	<div class="topright">
-	<roundcube:if condition="!env:extwin" />
+	<roundcube:container name="topline-right" id="topline-right" />
+	<roundcube:if condition="!env:extwin &amp;&amp; !env:framed" />
 		<span class="username"><roundcube:object name="username" /></span>
 		<roundcube:button command="logout" label="logout" class="button-logout" />
-	<roundcube:else />
-		<roundcube:button command="close" label="close" class="closelink" />
+	<roundcube:elseif condition="env:extwin" />
+		<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
 	<roundcube:endif />
 	</div>
-
-	<roundcube:container name="topline" id="topline" />
 </div>
 
-<roundcube:if condition="!env:extwin" />
+<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" />
+	<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" border="0" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
+	<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" alt="Logo" onclick="if(window.rcmail)rcmail.command('switch-task','mail')" />
 </div>
 <roundcube:endif />
 
 <br style="clear:both" />
 </div>
-
-

--
Gitblit v1.9.1