Fix Close link and remove About link on error pages (#1489109)

11 years ago · 528366f693
parent a306996bc5
commit 528366f693
3 changed files with 4 additions and 9 deletions
--- a/1
+++ b/1
@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================

+- Fix Close link and remove About link on error pages (#1489109)
 - Remove deprecated (in PHP 5.5) PREG /e modifier usage (#1489174)
 - Fix empty messages list when register_globals is enabled (#1489157)
 - Improved/unified attachment preview screen, added print button
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@ -2,7 +2,7 @@
 <div id="topline">
 	<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" />
+		<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 />
@ -14,7 +14,7 @@
 		<span class="username"><roundcube:object name="username" /></span>
 		<roundcube:button command="logout" label="logout" class="button-logout" />
 	<roundcube:elseif condition="env:extwin" />
-		<roundcube:button command="close" label="close" class="closelink" />
+		<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
 	<roundcube:endif />
 	</div>
 </div>
@ -35,5 +35,3 @@

 <br style="clear:both" />
 </div>
-
-
--- a/skins/larry/templates/messagepart.html
+++ b/skins/larry/templates/messagepart.html
@ -6,11 +6,7 @@
 </head>
 <body class="extwin noscroll">

-<div id="topline">
-	<div class="topright">
-		<a href="#close" class="closelink" onclick="self.close()"><roundcube:label name="close" /></a>
-	</div>
-</div>
+<roundcube:include file="/includes/header.html" />

 <div id="mainscreen">