From d7a5dfa26abe21aa9216fe862225baa2b5caca3e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 19 Jun 2010 14:04:48 -0400
Subject: [PATCH] - Fix dot-atom expression in e-mail validation regexp (#1486808)
---
skins/default/templates/settings.html | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index 0abe7fa..2e00635 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -3,8 +3,16 @@
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
<script type="text/javascript" src="/functions.js"></script>
+<script type="text/javascript" src="/splitter.js"></script>
+
+<style type="text/css">
+#sectionslist { width: <roundcube:exp expression="!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter-5 : 190" />px; }
+#prefs-box { left: <roundcube:exp expression="!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter+5 : 200" />px;
+<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter+5 : 200).')+\\'px\\');') : ''" />
+}
+</style>
+
</head>
<body>
@@ -12,34 +20,24 @@
<roundcube:include file="/includes/header.html" />
<roundcube:include file="/includes/settingstabs.html" />
-<form name="form" action="./" method="post">
+<div id="prefsscreen">
-<div id="userprefs-box">
-<div id="userprefs-title"><roundcube:label name="userpreferences" /></div>
-
-<div id="userprefscontainer" style="padding:15px 0 15px 15px">
-<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>
-
-<roundcube:container name="userprefs" id="userprefscontainer" />
-</div>
+<div id="sectionslist">
+<roundcube:object name="sectionslist" id="sections-table" class="records-table" cellspacing="0" />
</div>
-<p id="listbuttons">
-<roundcube:button command="save" type="input" class="button mainaction" label="save" />
-</p>
+<script type="text/javascript">
+ var prefviewsplit = new rcube_splitter({id:'prefsviewsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 195});
+ rcmail.add_onload('prefviewsplit.init()');
+</script>
-</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)" />
+<div id="prefs-box">
+<roundcube:object name="prefsframe" id="prefs-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
</div>
+</div>
+
+<div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>
+
</body>
</html>
--
Gitblit v1.9.1