diff options
author | Thomas Bruederli <thomas@roundcube.net> | 2013-02-10 15:31:39 +0100 |
---|---|---|
committer | Thomas Bruederli <thomas@roundcube.net> | 2013-02-10 16:03:18 +0100 |
commit | df229677457d1f59d08c14990514273114fed87d (patch) | |
tree | c5d6a66c4058f32779208f7a4aa21555293cb840 /skins/larry/includes | |
parent | 0016cde2fe143643e95a878c53b1c95b318d5aa4 (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')
-rw-r--r-- | skins/larry/includes/header.html | 6 |
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 && !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 && !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" /> |