summaryrefslogtreecommitdiff
path: root/skins/larry/includes/header.html
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-02-10 15:31:39 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-02-10 15:31:39 +0100
commitd30460ad2fc0f78ce44d474fa2c466d660596d27 (patch)
treea03115edd19a374fa304fe97928d41ad4fe14176 /skins/larry/includes/header.html
parent3568c7c04b58467d1ad2145de506fdcc8b905e9f (diff)
Let some env variables survive reset(); don't show taskbar and top line in framed error pages (#1488938)
Diffstat (limited to 'skins/larry/includes/header.html')
-rw-r--r--skins/larry/includes/header.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index 5a30020f3..f2efb8e06 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -10,16 +10,16 @@
<roundcube:container name="topline-center" id="topline-center" />
<div class="topright">
<roundcube:container name="topline-right" id="topline-right" />
- <roundcube:if condition="!env:extwin" />
+ <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:elseif condition="env:extwin" />
<roundcube:button command="close" label="close" class="closelink" />
<roundcube:endif />
</div>
</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" />