[Svn] r2164 - in trunk/roundcubemail: program/include program/steps/settings skins/default skins/default/templates

trac at roundcube.net trac at roundcube.net
Tue Dec 16 20:05:50 CET 2008


Author: thomasb
Date: 2008-12-16 13:05:50 -0600 (Tue, 16 Dec 2008)
New Revision: 2164

Modified:
   trunk/roundcubemail/program/include/html.php
   trunk/roundcubemail/program/steps/settings/func.inc
   trunk/roundcubemail/skins/default/settings.css
   trunk/roundcubemail/skins/default/templates/settings.html
Log:
Group settings boxes together in floating blocks for better layout

Modified: trunk/roundcubemail/program/include/html.php
===================================================================
--- trunk/roundcubemail/program/include/html.php	2008-12-16 18:58:47 UTC (rev 2163)
+++ trunk/roundcubemail/program/include/html.php	2008-12-16 19:05:50 UTC (rev 2164)
@@ -669,6 +669,16 @@
         unset($this->attrib['cols'], $this->attrib['rowsonly']);
         return parent::show();
     }
+    
+    /**
+     * Count number of rows
+     *
+     * @return The number of rows
+     */
+    public function size()
+    {
+      return count($this->rows);
+    }
 }
 
 ?>

Modified: trunk/roundcubemail/program/steps/settings/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/settings/func.inc	2008-12-16 18:58:47 UTC (rev 2163)
+++ trunk/roundcubemail/program/steps/settings/func.inc	2008-12-16 19:05:50 UTC (rev 2164)
@@ -25,9 +25,9 @@
 function rcmail_user_prefs_form($attrib)
 {
   global $RCMAIL;
-  $config = $RCMAIL->config->all();
 
-  $no_override = is_array($config['dont_override']) ? array_flip($config['dont_override']) : array();
+  $no_override = array_flip($RCMAIL->config->get('dont_override', array()));
+  $blocks = $attrib['parts'] ? preg_split('/[\s,;]+/', strip_quotes($attrib['parts'])) : array('general','mailbox','compose','mailview','folders','server');
 
   // add some labels to client
   $RCMAIL->output->add_label('nopagesizewarning');
@@ -36,319 +36,364 @@
   unset($attrib['form']);
 
   $out = $form_start;
-  $table = new html_table(array('cols' => 2));
-
-  // show language selection
-  if (!isset($no_override['language'])) {
-    $a_lang = $RCMAIL->list_languages();
-    asort($a_lang);
   
-    $field_id = 'rcmfd_lang';
-    $select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
-    $select_lang->add(array_values($a_lang), array_keys($a_lang));
+  foreach ($blocks as $part)
+    $out .= rcmail_user_prefs_block($part, $no_override, $attrib);
   
-    $table->add('title', html::label($field_id, Q(rcube_label('language'))));
-    $table->add(null, $select_lang->show($RCMAIL->user->language));
-  }
+  return $out . $form_end;
+}
 
-
-  // show page size selection
-  if (!isset($no_override['timezone'])) {
-    $field_id = 'rcmfd_timezone';
-    $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id, 'onchange' => "document.getElementById('rcmfd_dst').disabled=this.selectedIndex==0"));
-    $select_timezone->add(rcube_label('autodetect'), 'auto');
-    $select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11');
-    $select_timezone->add('(GMT -10:00) Hawaii', '-10');
-    $select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5');
-    $select_timezone->add('(GMT -9:00) Alaska', '-9');
-    $select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
-    $select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
-    $select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
-    $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
-    $select_timezone->add('(GMT -4:30) Caracas', '-4.5');
-    $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4');
-    $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
-    $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
-    $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
-    $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
-    $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
-    $select_timezone->add('(GMT +1:00) Central European Time', '1');
-    $select_timezone->add('(GMT +2:00) EET: Kaliningrad, South Africa', '2');
-    $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
-    $select_timezone->add('(GMT +3:30) Tehran', '3.5');
-    $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
-    $select_timezone->add('(GMT +4:30) Kabul', '4.5');
-    $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
-    $select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
-    $select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
-    $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
-    $select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5');
-    $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
-    $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
-    $select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75');
-    $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
-    $select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
-    $select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10');
-    $select_timezone->add('(GMT +10:30) New South Wales', '10.5');
-    $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
-    $select_timezone->add('(GMT +11:30) Norfolk Island', '11.5');
-    $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
-    $select_timezone->add('(GMT +12:45) Chatham Islands', '12.75');
-    $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
-    $select_timezone->add('(GMT +14:00) Kiribati', '14');
+function rcmail_user_prefs_block($part, $no_override, $attrib)
+{
+  global $RCMAIL;
+  $config = $RCMAIL->config->all();
   
-    $table->add('title', html::label($field_id, Q(rcube_label('timezone'))));
-    $table->add(null, $select_timezone->show((string)$config['timezone']));
-  }
+  switch ($part)
+  {
+  // General UI settings
+  case 'general':
+    $table = new html_table(array('cols' => 2));
 
-  // daylight savings
-  if (!isset($no_override['dst_active'])) {
-    $field_id = 'rcmfd_dst';
-    $input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] === 'auto')));
-    
-    $table->add('title', html::label($field_id, Q(rcube_label('dstactive'))));
-    $table->add(null, $input_dst->show($config['dst_active']));
-  }
+    // show language selection
+    if (!isset($no_override['language'])) {
+      $a_lang = $RCMAIL->list_languages();
+      asort($a_lang);
 
-  // MM: Show checkbox for toggling 'pretty dates' 
-  if (!isset($no_override['prettydate'])) {
-    $field_id = 'rcmfd_prettydate';
-    $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+      $field_id = 'rcmfd_lang';
+      $select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
+      $select_lang->add(array_values($a_lang), array_keys($a_lang));
 
-    $table->add('title', html::label($field_id, Q(rcube_label('prettydate'))));
-    $table->add(null, $input_prettydate->show($config['prettydate']?1:0));
-  }
+      $table->add('title', html::label($field_id, Q(rcube_label('language'))));
+      $table->add(null, $select_lang->show($RCMAIL->user->language));
+    }
 
-  // show page size selection
-  if (!isset($no_override['pagesize'])) {
-    $field_id = 'rcmfd_pgsize';
-    $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
+    // show page size selection
+    if (!isset($no_override['timezone'])) {
+      $field_id = 'rcmfd_timezone';
+      $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id, 'onchange' => "document.getElementById('rcmfd_dst').disabled=this.selectedIndex==0"));
+      $select_timezone->add(rcube_label('autodetect'), 'auto');
+      $select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11');
+      $select_timezone->add('(GMT -10:00) Hawaii', '-10');
+      $select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5');
+      $select_timezone->add('(GMT -9:00) Alaska', '-9');
+      $select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
+      $select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
+      $select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
+      $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
+      $select_timezone->add('(GMT -4:30) Caracas', '-4.5');
+      $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4');
+      $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
+      $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
+      $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
+      $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
+      $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
+      $select_timezone->add('(GMT +1:00) Central European Time', '1');
+      $select_timezone->add('(GMT +2:00) EET: Kaliningrad, South Africa', '2');
+      $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
+      $select_timezone->add('(GMT +3:30) Tehran', '3.5');
+      $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
+      $select_timezone->add('(GMT +4:30) Kabul', '4.5');
+      $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
+      $select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
+      $select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
+      $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
+      $select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5');
+      $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
+      $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
+      $select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75');
+      $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
+      $select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
+      $select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10');
+      $select_timezone->add('(GMT +10:30) New South Wales', '10.5');
+      $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
+      $select_timezone->add('(GMT +11:30) Norfolk Island', '11.5');
+      $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
+      $select_timezone->add('(GMT +12:45) Chatham Islands', '12.75');
+      $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
+      $select_timezone->add('(GMT +14:00) Kiribati', '14');
 
-    $table->add('title', html::label($field_id, Q(rcube_label('pagesize'))));
-    $table->add(null, $input_pagesize->show($config['pagesize']));
-  }
+      $table->add('title', html::label($field_id, Q(rcube_label('timezone'))));
+      $table->add(null, $select_timezone->show((string)$config['timezone']));
+    }
 
-  // show drop-down for available skins
-  if (!isset($no_override['skin'])) {
-    $skins = rcmail_get_skins();
+    // daylight savings
+    if (!isset($no_override['dst_active'])) {
+      $field_id = 'rcmfd_dst';
+      $input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] === 'auto')));
 
-    if (count($skins) > 1) {
-      $field_id = 'rcmfd_skin';
-      $input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id));
-      
-      foreach($skins as $skin)
-        $input_skin->add($skin, $skin);
+      $table->add('title', html::label($field_id, Q(rcube_label('dstactive'))));
+      $table->add(null, $input_dst->show($config['dst_active']));
+    }
 
-      $table->add('title', html::label($field_id, Q(rcube_label('skin'))));
-      $table->add(null, $input_skin->show($config['skin']));
+    // MM: Show checkbox for toggling 'pretty dates' 
+    if (!isset($no_override['prettydate'])) {
+      $field_id = 'rcmfd_prettydate';
+      $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+
+      $table->add('title', html::label($field_id, Q(rcube_label('prettydate'))));
+      $table->add(null, $input_prettydate->show($config['prettydate']?1:0));
     }
-  }
 
-  $out .= html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('uisettings'))) . $table->show($attrib));
-  
-  $table = new html_table(array('cols' => 2));
+    // show page size selection
+    if (!isset($no_override['pagesize'])) {
+      $field_id = 'rcmfd_pgsize';
+      $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
 
-  if (!isset($no_override['focus_on_new_message'])) {
-    $field_id = 'rcmfd_focus_on_new_message';
-    $input_focus_on_new_message = new html_checkbox(array('name' => '_focus_on_new_message', 'id' => $field_id, 'value' => 1));
-    $table->add('title', html::label($field_id, Q(rcube_label('focusonnewmessage'))));
-    $table->add(null, $input_focus_on_new_message->show($config['focus_on_new_message']?1:0));
-  }
+      $table->add('title', html::label($field_id, Q(rcube_label('pagesize'))));
+      $table->add(null, $input_pagesize->show($config['pagesize']));
+    }
 
-  // show config parameter for preview pane
-  if (!isset($no_override['preview_pane'])) {
-    $field_id = 'rcmfd_preview';
-    $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1));
+    // show drop-down for available skins
+    if (!isset($no_override['skin'])) {
+      $skins = rcmail_get_skins();
+
+      if (count($skins) > 1) {
+        $field_id = 'rcmfd_skin';
+        $input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id));
+
+        foreach($skins as $skin)
+          $input_skin->add($skin, $skin);
+
+        $table->add('title', html::label($field_id, Q(rcube_label('skin'))));
+        $table-