From a901aa564a73e85d37eda6b53c21c0638d435169 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 14 Apr 2008 05:54:57 -0400
Subject: [PATCH] - Added sections (fieldset+label) in Settings interface
---
CHANGELOG | 4 ++++
program/localization/pl/labels.inc | 2 ++
skins/default/settings.css | 12 ++++++++++++
program/steps/settings/func.inc | 8 +++++---
program/localization/en_US/labels.inc | 2 ++
skins/default/templates/settings.html | 2 +-
program/localization/en_GB/labels.inc | 2 ++
7 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index f44f16e..e88b41c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/04/14 (alec)
+----------
+- Added sections (fieldset+label) in Settings interface
+
2008/04/12 (alec)
----------
- Fixed and optimized 'read_when_deleted': mark as read on server side
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 6d24641..ba4926f 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -197,6 +197,8 @@
$labels['previewpane'] = 'Show preview pane';
$labels['logoutclear'] = 'Clear Trash on logout';
$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
$labels['autosavedraft'] = 'Automatically save draft';
$labels['everynminutes'] = 'every $n minutes';
$labels['never'] = 'never';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index ddd1a5f..c4a85b8 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -252,6 +252,8 @@
$labels['previewpane'] = 'Show preview pane';
$labels['logoutclear'] = 'Clear Trash on logout';
$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
$labels['autosavedraft'] = 'Automatically save draft';
$labels['everynminutes'] = 'every $n minutes';
diff --git a/program/localization/pl/labels.inc b/program/localization/pl/labels.inc
index ec2e76a..b79c2f8 100644
--- a/program/localization/pl/labels.inc
+++ b/program/localization/pl/labels.inc
@@ -201,6 +201,8 @@
$labels['previewpane'] = 'Pokaż podgląd';
$labels['logoutclear'] = 'Przy wylogowaniu opróżnij Kosz';
$labels['logoutcompact'] = 'Przy wylogowaniu porządkuj folder Odebrane';
+$labels['uisettings'] = 'Interfejs użytkownika';
+$labels['serversettings'] = 'Ustawienia serwera';
$labels['autosavedraft'] = 'Automatyczny zapis tworzonej wiadomości';
$labels['everynminutes'] = 'co $n minut';
$labels['never'] = 'nigdy';
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 81da0a2..502ca14 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -40,8 +40,8 @@
// allow the following attributes to be added to the <table> tag
$attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
- // return the complete edit form as table
- $out = "$form_start<table" . $attrib_str . ">\n\n";
+ // return the complete edit form as tables
+ $out = "$form_start<fieldset><legend>" . Q(rcube_label('uisettings')) . "</legend>\n<table" . $attrib_str . ">\n\n";
// show language selection
if (!isset($no_override['language']))
@@ -180,6 +180,8 @@
Q(rcube_label('previewpane')),
$input_preview->show($CONFIG['preview_pane']?1:0));
}
+
+ $out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('serversettings')) . "</legend>\n<table" . $attrib_str . ">\n\n";
if (!empty($CONFIG['drafts_mbox']) && !isset($no_override['draft_autosave']))
{
@@ -217,7 +219,7 @@
$input_expunge->show($CONFIG['logout_expunge']?1:0));
}
- $out .= "\n</table>$form_end";
+ $out .= "\n</table></fieldset>$form_end";
return $out;
}
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 9f0c8f3..ce67ec4 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -197,3 +197,15 @@
{
width: 90px;
}
+
+fieldset
+{
+ margin-bottom: 0.5em;
+ border: 1px solid #999999;
+}
+
+legend
+{
+ color: #999999;
+}
+
\ No newline at end of file
diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index bb01399..dfb67e0 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -17,7 +17,7 @@
<div style="padding:15px">
<roundcube:object name="userprefs">
-<p><br /><roundcube:button command="save" type="input" class="button" label="save" /></p>
+<p><roundcube:button command="save" type="input" class="button" label="save" /></p>
</div>
</div>
--
Gitblit v1.9.1