Changeset 3581

Timestamp:

12/13/10 10:37:03 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1431 - inclui preferência da busca rápida (contatos ou email).

Location:

branches/2.2/expressoMail1_2

Files:

• inc/hook_settings.inc.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• js/common_functions.js (modified) (1 diff)
• setup/phpgw_en.lang (modified) (1 diff)
• setup/phpgw_pt-br.lang (modified) (1 diff)
• templates/classic/index.tpl (modified) (1 diff)
• templates/default/index.tpl (modified) (1 diff)

branches/2.2/expressoMail1_2/inc/hook_settings.inc.php

@@ -218 +218 @@
 $default = array(sprintf("%s", array_search('America/Sao_Paulo', $zones)) => 'America/Sao_Paulo');
 create_select_box('What is your timezone?', 'timezone', $zones, 'The Timezone you\'re in.', $default);
+
+$default =  array(
+    '1' => lang('contacts'),
+    '2' => lang('email')
+);
+
+create_select_box('Where should the quick search be performed by default?','quick_search_default',$default,'It is where the keyword should be searched when the user executes a quick search.');
 
 $default = array(

branches/2.2/expressoMail1_2/index.php

@@ -94 +94 @@
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['auto_create_local'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_create_local'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['auto_create_local'] : "0";
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_SpellChecker'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_SpellChecker'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_SpellChecker'] : "0";
+        
+        $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['quick_search_default'] : 1;
 
         //SpellChecker
@@ -124 +126 @@
         $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'] = $save_in_folder;
         // End Fix.
-        
+
         $template->set_file(Array('expressoMail' => 'index.tpl'));
         $template->set_block('expressoMail','list');

branches/2.2/expressoMail1_2/js/common_functions.js

@@ -502 +502 @@
         return (urlParts[1].length > 4 &&  validateDomain(urlParts[2]));
 }
+
+function performQuickSearch(keyword){
+        if (preferences.quick_search_default=='1')
+                emQuickSearch(keyword, 'null', 'null');
+        else
+                search_emails(keyword);
+}
+
 function emQuickSearch(emailList, field, ID){
         var quickSearchKeyBegin;

branches/2.2/expressoMail1_2/setup/phpgw_en.lang

@@ -401 +401 @@
 What is the minimum number of characters in searching contacts? expressoMail1_2 en      What is the minimum number of characters in searching contacts?
 What is your timezone?  expressoMail1_2 en      What is your timezone?
+Where should the quick search be performed by default?  expressoMail1_2 pt-br   Where should the quick search be performed by default?
+It is where the keyword should be searched when the user executes a quick search.       expressoMail1_2 pt-br   It is where the keyword should be searched when the user executes a quick search.
 Who     expressoMail1_2 en      Who
 With all        expressoMail1_2 en      With all

branches/2.2/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -561 +561 @@
 When user send an email with image in body message, it changes the size expressoMail1_2 pt-br   Quando o usuário envia um e-mail com a imagem no corpo da mensagem, ela muda o tamanho
 When you are away from computer it saves automatically the message you are writing      expressoMail1_2 pt-br   Quando você estiver longe do computador. Isto salva automaticamente a mensagem que está a escrever
+Where should the quick search be performed by default?  expressoMail1_2 pt-br   Aonde a pesquisa rápida deve atuar por padrão?
+It is where the keyword should be searched when the user executes a quick search.       expressoMail1_2 pt-br   Aonde a busca deve ser realizada quando o usuário realizar uma pesquisa rápida.
 Who     expressoMail1_2 pt-br   Quem
 With all        expressoMail1_2 pt-br   com todas

branches/2.2/expressoMail1_2/templates/classic/index.tpl

@@ -43 +43 @@
                                         {
                                                 if( e.keyCode == 13 )
-                                                        emQuickSearch(Element('em_message_search').value, 'null', 'null');
+                                                        performQuickSearch(Element('em_message_search').value);
                                         }
 

branches/2.2/expressoMail1_2/templates/default/index.tpl

@@ -70 +70 @@
                 {
                         if( e.keyCode == 13 )
-                                emQuickSearch(Element('em_message_search').value, 'null', 'null');
+                                performQuickSearch(Element('em_message_search').value);
                 }