Group settings boxes together in floating blocks for better layout

2 files changed, 17 insertions, 8 deletions

diff --git a/skins/default/settings.css b/skins/default/settings.css
index 2e181621c..59b847768 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -58,13 +58,6 @@ span.tablink-selected a
   width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
 }
 
-#userprefs-box fieldset
-{
-  float: left;
-  margin-right: 14px;
-  width: 520px;
-}
-
 #userprefs-box table td.title
 {
   color: #666666;
@@ -77,6 +70,13 @@ span.tablink-selected a
   display: none;
 }
 
+.userprefs-block
+{
+  float: left;
+  margin-right: 14px;
+  width: 520px;
+}
+
 #identities-list,
 #folder-manager
 {
diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index c24a67b6e..a3f5298cd 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -12,11 +12,18 @@
 <roundcube:include file="/includes/header.html" />
 <roundcube:include file="/includes/settingstabs.html" />
 
+<form name="form" action="./" method="post">
+
 <div id="userprefs-box">
 <div id="userprefs-title"><roundcube:label name="userpreferences" /></div>
 
 <div style="padding:15px 0 15px 15px">
-<roundcube:object name="userprefs">
+<div class="userprefs-block">
+  <roundcube:object name="userprefs" form="form" parts="general,mailbox,mailview" />
+</div>
+<div class="userprefs-block">
+  <roundcube:object name="userprefs" form="form" parts="compose,folders,server" />
+</div>
 <div style="clear:left"></div>
 </div>
 </div>
@@ -25,6 +32,8 @@
 <roundcube:button command="save" type="input" class="button mainaction" label="save" />
 </p>
 
+</form>
+
 <div class="advswitch">
 <label for="advswitch"><roundcube:label name="advancedoptions"></label>
 <input type="checkbox" id="advswitch" name="_advanced" value="0" onclick="rcube_show_advanced(this.checked)" />