Changeset 2855 in subversion

Timestamp:

Aug 12, 2009 7:12:33 AM (4 years ago)

Author:

thomasb

Message:

Tweak settings page: align with tab list, remove that single advanced option for now, select 'general' section at startup

Location:

trunk/roundcubemail

Files:

• program/js/app.js (modified) (3 diffs)
• skins/default/settings.css (modified) (1 diff)
• skins/default/templates/settings.html (modified) (2 diffs)
• skins/default/templates/settingsedit.html (modified) (1 diff)

trunk/roundcubemail/program/js/app.js

@@ -327 +327 @@
         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);
@@ -351 +351 @@
           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();
@@ -2949 +2950 @@
   this.section_select = function(list)
     {
-    var id = list.get_single_selection()
+    var id = list.get_single_selection();
     
     if (id) {

trunk/roundcubemail/skins/default/settings.css

@@ -317 +317 @@
 }
 
-#prefs-details table tr.advanced
-{
-  display: none;
-}
-
 #formfooter
 {

trunk/roundcubemail/skins/default/templates/settings.html

@@ -8 +8 @@
 
 <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>
@@ -28 +28 @@
 
 <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>

trunk/roundcubemail/skins/default/templates/settingsedit.html

@@ -21 +21 @@
 </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>