From cc97ea0559af1a92a54dbcdf738ee4d95e67d3ff Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 19 Apr 2009 13:44:29 -0400
Subject: [PATCH] Merged branch devel-api (from r2208 to r2387) back into trunk (omitting some sample plugins)

---
 skins/default/templates/settings.html |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index a3f5298..0abe7fa 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -6,7 +6,7 @@
 <link rel="stylesheet" type="text/css" href="/settings.css" />
 <script type="text/javascript" src="/functions.js"></script>
 </head>
-<body onload="rcube_init_settings_tabs()">
+<body>
 
 <roundcube:include file="/includes/taskbar.html" />
 <roundcube:include file="/includes/header.html" />
@@ -17,7 +17,7 @@
 <div id="userprefs-box">
 <div id="userprefs-title"><roundcube:label name="userpreferences" /></div>
 
-<div style="padding:15px 0 15px 15px">
+<div id="userprefscontainer" style="padding:15px 0 15px 15px">
 <div class="userprefs-block">
   <roundcube:object name="userprefs" form="form" parts="general,mailbox,mailview" />
 </div>
@@ -25,6 +25,8 @@
   <roundcube:object name="userprefs" form="form" parts="compose,folders,server" />
 </div>
 <div style="clear:left"></div>
+
+<roundcube:container name="userprefs" id="userprefscontainer" />
 </div>
 </div>
 

--
Gitblit v1.9.1