Fix form buttons (#1488548)

Conflicts:

	skins/default/settings.css

3 files changed, 22 insertions, 18 deletions

diff --git a/skins/default/templates/folderedit.html b/skins/default/templates/folderedit.html
index c5fa2490f..28b9a5507 100644
--- a/skins/default/templates/folderedit.html
+++ b/skins/default/templates/folderedit.html
@@ -11,12 +11,14 @@
 
 <div id="folder-details" class="boxcontent">
   <roundcube:object name="folderdetails" />
-  <p>
-    <roundcube:if condition="!strlen(request:_mbox)" />
-    <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
-    <roundcube:endif />
-    <roundcube:button command="save" type="input" class="button mainaction" label="save" />
-  </p>
+  <div id="formfooter">
+    <div class="footerleft">
+      <roundcube:if condition="!strlen(request:_mbox)" />
+        <input type="button" value="<roundcube:label name="cancel" />" class="button" onclick="history.back()" />&nbsp;
+      <roundcube:endif />
+      <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+    </div>
+  </div>
 </div>
 <script type="text/javascript">rcube_init_tabs('folder-details > form')</script>
 
diff --git a/skins/default/templates/identityedit.html b/skins/default/templates/identityedit.html
index 3416f414d..3b33752ca 100644
--- a/skins/default/templates/identityedit.html
+++ b/skins/default/templates/identityedit.html
@@ -18,12 +18,15 @@
 <div id="identity-title" class="boxtitle"><roundcube:object name="steptitle" /></div>
 
 <div id="identity-details" class="boxcontent">
-<roundcube:object name="identityform" id="identity-form" size="40" textareacols="70" textarearows="6" />
-<script type="text/javascript">rcube_init_tabs('identity-form')</script>
+  <roundcube:object name="identityform" id="identity-form" size="40" textareacols="70" textarearows="6" />
 
-<div id="formfooter">
-  <roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</div>
+  <script type="text/javascript">rcube_init_tabs('identity-form')</script>
+
+  <div id="formfooter">
+    <div class="footerleft">
+      <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+    </div>
+  </div>
 </div>
 
 </body>
diff --git a/skins/default/templates/settingsedit.html b/skins/default/templates/settingsedit.html
index ec980a8f0..642eb094e 100644
--- a/skins/default/templates/settingsedit.html
+++ b/skins/default/templates/settingsedit.html
@@ -10,13 +10,12 @@
 <div id="prefs-title" class="boxtitle"><roundcube:object name="sectionname" /></div>
 
 <div id="prefs-details" class="boxcontent">
-<roundcube:object name="userprefs" form="form" />
-</div>
-
-<div id="formfooter">
-<div class="footerleft">
-<roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</div>
+  <roundcube:object name="userprefs" form="form" />
+  <div id="formfooter">
+    <div class="footerleft">
+      <roundcube:button command="save" type="input" class="button mainaction" label="save" />
+    </div>
+  </div>
 </div>
 
 </body>