From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports

---
 skins/larry/templates/contactedit.html |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/skins/larry/templates/contactedit.html b/skins/larry/templates/contactedit.html
index 562e6d2..da7953e 100644
--- a/skins/larry/templates/contactedit.html
+++ b/skins/larry/templates/contactedit.html
@@ -6,23 +6,25 @@
 </head>
 <body class="iframe">
 
-<h1 class="boxtitle">
-	<roundcube:if condition="env:action=='add'" /><roundcube:label name="addcontact" />
-	<roundcube:else /><roundcube:label name="editcontact" />
-<roundcube:endif /></h1>
+<h1 class="boxtitle"><roundcube:object name="steptitle" /></h1>
 
-<form name="editform" method="post" action="./" id="contact-details" class="boxcontent">
+<roundcube:form name="editform" method="post" id="contact-details" class="boxcontent">
 	<roundcube:if condition="strlen(env:sourcename)" />
 		<div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" condition="env:action!='add'" /><roundcube:object name="sourceselector" id="sourceselect" condition="env:action=='add'" /></div>
 	<roundcube:endif />
 
-	<div id="contactphoto">
+	<fieldset id="contactphoto">
+		<legend class="voice"><roundcube:label name="contactphoto" /></legend>
 		<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" />
+		<roundcube:if condition="env:photocol" />
+		<roundcube:object name="fileDropArea" id="contactpic" />
 		<div class="formlinks">
 			<roundcube:button command="upload-photo" id="uploadformlink" type="link" label="replacephoto" class="iconlink upload disabled" classAct="iconlink upload active" onclick="UI.show_uploadform();return false" condition="env:photocol" /><br/>
 			<roundcube:button command="delete-photo" type="link" label="delete" class="iconlink delete disabled" classAct="iconlink delete active" condition="env:photocol" />
 		</div>
-	</div>
+		<roundcube:endif />
+	</fieldset>
+
 	<roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
 	<br style="clear:both" />
 
@@ -32,13 +34,13 @@
 
 </form>
 
-<div id="headerbuttons" class="formbuttons">
+<div class="footerleft formbuttons">
 	<roundcube:button command="save" type="input" class="button mainaction" label="save" />
 	<roundcube:button command="show" type="input" class="button" label="cancel" condition="env:action=='edit'" />
 	<roundcube:button name="cancel" type="input" class="button" label="cancel" onclick="history.back()" condition="env:action=='add'" />
 </div>
 
-<div id="upload-dialog" class="propform popupdialog">
+<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='uploadphoto' />">
 	<roundcube:object name="photoUploadForm" id="upload-form" size="30" buttons="no" />
 	<div class="formbuttons">
 		<roundcube:button command="upload-photo" type="input" class="button mainaction" label="upload" />

--
Gitblit v1.9.1