summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/js/app.js11
-rw-r--r--skins/default/settings.css5
-rw-r--r--skins/default/templates/settings.html8
-rw-r--r--skins/default/templates/settingsedit.html5
4 files changed, 10 insertions, 19 deletions
diff --git a/program/js/app.js b/program/js/app.js
index e7c528962..4ad62b46e 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -326,11 +326,11 @@ function rcube_webmail()
if (this.env.action=='identities') {
this.enable_command('add', this.env.identities_level < 2);
- }
- else if (this.env.action=='edit-identity' || this.env.action=='add-identity') {
+ }
+ else if (this.env.action=='edit-identity' || this.env.action=='add-identity') {
this.enable_command('add', this.env.identities_level < 2);
this.enable_command('save', 'delete', 'edit', true);
- }
+ }
else if (this.env.action=='folders')
this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', true);
@@ -350,7 +350,8 @@ function rcube_webmail()
this.sections_list.addEventListener('select', function(o){ p.section_select(o); });
this.sections_list.init();
this.sections_list.focus();
- }
+ this.sections_list.select('general'); // open first section by default
+ }
else if (this.gui_objects.subscriptionlist)
this.init_subscription_list();
@@ -2948,7 +2949,7 @@ function rcube_webmail()
// preferences section select and load options frame
this.section_select = function(list)
{
- var id = list.get_single_selection()
+ var id = list.get_single_selection();
if (id) {
var add_url = '';
diff --git a/skins/default/settings.css b/skins/default/settings.css
index c9efd33d2..74388a4b6 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -316,11 +316,6 @@ body.iframe,
padding-right: 10px;
}
-#prefs-details table tr.advanced
-{
- display: none;
-}
-
#formfooter
{
width: 100%;
diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index 25d4e6779..0ff86ad2c 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -7,9 +7,9 @@
<script type="text/javascript" src="/splitter.js"></script>
<style type="text/css">
-#sectionslist { width: <roundcube:exp expression="!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter-5 : 205" />px; }
-#prefs-box { left: <roundcube:exp expression="!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter+5 : 205" />px;
-<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:prefsviewsplitter) ? cookie:prefsviewsplitter+5 : 205).')+\\'px\\');') : ''" />
+#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>
@@ -27,7 +27,7 @@
</div>
<script type="text/javascript">
- var prefviewsplit = new rcube_splitter({id:'prefsviewsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 200});
+ var prefviewsplit = new rcube_splitter({id:'prefsviewsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 195});
rcmail.add_onload('prefviewsplit.init()');
</script>
diff --git a/skins/default/templates/settingsedit.html b/skins/default/templates/settingsedit.html
index 3a0bc603d..dcd5c5c2e 100644
--- a/skins/default/templates/settingsedit.html
+++ b/skins/default/templates/settingsedit.html
@@ -20,11 +20,6 @@
<roundcube:button command="save" type="input" class="button mainaction" label="save" />
</div>
-<div class="footerright">
-<label for="advswitch"><roundcube:label name="advancedoptions"></label>
-<input type="checkbox" id="advswitch" name="_advanced" value="0" onclick="rcube_show_advanced(this.checked)" />
-</div>
-
</div>
<p>&nbsp;</p>