[Phpgroupware-cvs] CVS: preferences/inc hook_settings.inc.php,1.6,1.7

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv514/inc

Modified Files:
        hook_settings.inc.php 
Log Message:
update preferences: helptexts

Index: hook_settings.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/hook_settings.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** hook_settings.inc.php       18 Mar 2003 17:03:34 -0000      1.6
--- hook_settings.inc.php       31 Mar 2003 18:16:33 -0000      1.7
***************
*** 24,30 ****
        }
  
!       create_input_box('Max matches per page','maxmatchs');
!       create_select_box('Interface/Template 
Selection','template_set',$_templates);
!       create_select_box('Theme (colors/fonts) Selection','theme',$_themes);
  
        $navbar_format = array(
--- 24,34 ----
        }
  
!       create_input_box('Max matches per page','maxmatchs',
!               'Any listing in phpGW will show you this number or entries or 
lines per page.<br>
!               To many slow down the page display, to less will cost you the 
overview.',15,3);
!       create_select_box('Interface/Template 
Selection','template_set',$_templates,
!               'A template defines the layout of phpGroupWare and it contains 
icons vor each application.');
!       create_select_box('Theme (colors/fonts) Selection','theme',$_themes,
!               'A theme defines the colors and fonts used by the template.');
  
        $navbar_format = array(
***************
*** 33,43 ****
                'text'           => lang('Text only')
        );
!       create_select_box('Show navigation bar 
as','navbar_format',$navbar_format);
  
        for ($i = -23; $i<24; $i++)
        {
!               $tz_offset[$i] = $i;
        }
!       create_select_box('Time zone offset','tz_offset',$tz_offset);
  
        $date_formats = array(
--- 37,62 ----
                'text'           => lang('Text only')
        );
!       create_select_box('Show navigation bar 
as','navbar_format',$navbar_format,
!               'You can show the applications as icons only, icons with 
app-name or both.');
  
+       $format = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+       $format = ($format ? $format : 'Y/m/d') . ', ';
+       if 
($GLOBALS['phpgw_info']['user']['preferences']['common']['timeformat'] == '12')
+       {
+               $format .= 'h:i a';
+       }
+       else
+       {
+               $format .= 'H:i';
+       }
        for ($i = -23; $i<24; $i++)
        {
!               $t = time() + $i * 60*60;
!               $tz_offset[$i] = $i . ' ' . lang('hours').': ' . 
date($format,$t);
        }
!       create_select_box('Time zone offset','tz_offset',$tz_offset,
!               'How many hours are you in front or after the timezone of the 
server.<br>
!               If you are in the same time zone as the server select 0 hours, 
!               else select your locale date and time.',0);
  
        $date_formats = array(
***************
*** 55,59 ****
                'd.m.Y' => 'd.m.Y'
        );
!       create_select_box('Date format','dateformat',$date_formats);
  
        $time_formats = array(
--- 74,79 ----
                'd.m.Y' => 'd.m.Y'
        );
!       create_select_box('Date format','dateformat',$date_formats,
!               'How should phpGroupWare display dates for you.');
  
        $time_formats = array(
***************
*** 61,68 ****
                '24' => lang('24 hour')
        );
!       create_select_box('Time format','timeformat',$time_formats);
  
        $sbox = createobject('phpgwapi.sbox');
!       create_select_box('Country','country',$sbox->country_array);
  
        $db2 = $GLOBALS['phpgw']->db;
--- 81,90 ----
                '24' => lang('24 hour')
        );
!       create_select_box('Time format','timeformat',$time_formats,
!               'Do you prefer a 24 hour time format, or a 12 hour one with 
am/pm attached.');
  
        $sbox = createobject('phpgwapi.sbox');
!       create_select_box('Country','country',$sbox->country_array,
!               'In which country are you. This is used to set certain defaults 
for you.');
  
        $db2 = $GLOBALS['phpgw']->db;
***************
*** 91,105 ****
                }
        }
!       create_select_box('Language','lang',$langs);
! 
        // preference.php handles this function
        if (is_admin())
        {
!               // The 'True' is *NOT* being used as a constant, don't change it
!               $yes_and_no = array(
!                       'True' => lang('Yes'),
!                       ''     => lang('No')
!               );
!               create_select_box('Show current users on navigation 
bar','show_currentusers',$yes_and_no);
        }
  
--- 113,125 ----
                }
        }
!       create_select_box('Language','lang',$langs,
!               'Select the language of texts and messages within 
phpGroupWare.<br>
!               Some languages may not contain all messages, in that case you 
will see an english message.');
!       
        // preference.php handles this function
        if (is_admin())
        {
!               create_check_box('Show current users on navigation 
bar','show_currentusers',
!                       'Should the number of active sessions be displayed for 
you all the time.');
        }
  
***************
*** 112,116 ****
                }
        }
!       create_select_box('Default application','default_app',$user_apps);
! 
!       create_input_box('Currency','currency');
--- 132,144 ----
                }
        }
!       create_select_box('Default application','default_app',$user_apps,
!               "This is the application which will be started when you enter 
phpGroupWare or click on the homepage icon.<br>
!               You can also have more than one applications showing up on the 
homepage, if you don't 
!               choose a specific application here (has to be configured in the 
preferences of 
!               each applicaton).");
! 
!       create_input_box('Currency','currency',
!               'Which currency symbole or name should be used in 
phpGroupWare.');
!               
!       create_check_box('Show helpmessages by default','show_help',
!               'Should the help messages always be shown when you enter the 
preferences or only on request.');