diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header --- smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header 2006-02-23 20:16:18.000000000 -0600 +++ mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/00Header 2006-09-12 23:38:37.000000000 -0500 @@ -1,7 +1,7 @@ //00Header /** - *$Horde: mnemo/config/prefs.php.dist,v 1.24 2004/12/07 19:55:16 chuck Exp $ + * $Horde: mnemo/config/prefs.php.dist,v 1.24.2.1 2005/10/22 11:42:15 jan Exp $ * * See horde/config/prefs.php for documentation on the structure of this file. */ diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display --- smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display 2006-02-23 20:17:15.000000000 -0600 +++ mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/110Display 2006-09-12 23:40:37.000000000 -0500 @@ -1,6 +1,6 @@ //110Display $prefGroups['display'] = array( - 'column' => _("Other Options"), + 'column' => _("General Options"), 'label' => _("Display Options"), 'desc' => _("Change your note sorting and display options."), 'members' => array('sortby', 'sortdir') diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/120Share mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/120Share --- smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/120Share 2006-02-23 20:17:32.000000000 -0600 +++ mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/120Share 2006-09-12 23:40:48.000000000 -0500 @@ -1,6 +1,6 @@ //120Share $prefGroups['share'] = array( - 'column' => _("Other Options"), + 'column' => _("General Options"), 'label' => _("Default Notepad"), 'desc' => _("Choose your default Notepad."), 'members' => array('notepadselect') diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/125Deletion mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/125Deletion --- smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/125Deletion 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/125Deletion 2006-09-13 00:04:58.000000000 -0500 @@ -0,0 +1,8 @@ +//125Deletion +$prefGroups['deletion'] = array( + 'column' => _("General Options"), + 'label' => _("Delete Confirmation"), + 'desc' => _("Delete button behaviour"), + 'members' => array('delete_opt') +); + diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/130SortBy mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/130SortBy --- smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/130SortBy 2006-02-23 20:19:28.000000000 -0600 +++ mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/130SortBy 2006-09-13 00:05:03.000000000 -0500 @@ -1,4 +1,4 @@ -//150SortBy +//130SortBy // user preferred sorting column $_prefs['sortby'] = array( 'value' => MNEMO_SORT_DESC, diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/180DisplayNotepads mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/180DisplayNotepads --- smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/180DisplayNotepads 2006-02-23 21:27:47.000000000 -0600 +++ mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/180DisplayNotepads 2006-09-12 23:44:30.000000000 -0500 @@ -1,5 +1,5 @@ //180DisplayNotepads -// store the notepads to diplay +// store the notepads to display $_prefs['display_notepads'] = array( 'value' => 'a:0:\{\}', 'locked' => false, diff -Nur -x '*.orig' -x '*.rej' smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/190DeleteOpt mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/190DeleteOpt --- smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/190DeleteOpt 1969-12-31 18:00:00.000000000 -0600 +++ mezzanine_patched_smeserver-mnemo-1.1/root/etc/e-smith/templates/home/httpd/html/horde/mnemo/config/prefs.php/190DeleteOpt 2006-09-13 00:05:46.000000000 -0500 @@ -0,0 +1,10 @@ +//190DeleteOpt +// preference for delete confirmation dialog. +$_prefs['delete_opt'] = array( + 'value' => 1, + 'locked' => false, + 'shared' => false, + 'type' => 'checkbox', + 'desc' => _("Do you want to confirm deleting entries?") +); +