From ddafe4e4109a8d6d412c3c138412ee2ca3d58dbf Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 27 Oct 2012 10:12:37 -0400
Subject: [PATCH] Merge branch 'dev-compose-newwindow'
---
skins/larry/includes/header.html | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index 9187c6f..25bcc0b 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -7,11 +7,16 @@
<roundcube:endif />
</div>
<div class="topright">
- <span class="username"><roundcube:object name="username" /></span>
- <roundcube:button command="logout" label="logout" class="button-logout" />
+ <roundcube:if condition="!env:extwin" />
+ <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:endif />
</div>
</div>
+<roundcube:if condition="!env:extwin" />
<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" />
@@ -21,6 +26,7 @@
</div>
<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
</div>
+<roundcube:endif />
<br style="clear:both" />
</div>
--
Gitblit v1.9.1