Changeset 1714

Timestamp:

11/26/09 16:15:15 (14 years ago)

Author:

eduardoalex

Message:

Ticket #793 - Adicionada link para funcao list_folders no menu e adicionado template para listagem das pastas

Location:

trunk/mobile

Files:

• inc/class.mobiletemplate.inc.php (modified) (1 diff)
• inc/class.ui_mobilemail.inc.php (modified) (3 diffs)
• setup/phpgw_pt-br.lang (modified) (1 diff)
• templates/default/home.tpl (modified) (1 diff)

trunk/mobile/inc/class.mobiletemplate.inc.php

@@ -63 +63 @@
                         $this-> template->set_var('href_sent', "index.php?menuaction=mobile.ui_mobilemail.mail_list&folder=".$folder_number);
                         $this-> template->set_var('lang_sent', str_replace('*','',lang(str_replace('INBOX/','',$save_in_folder))));
-                        
+                        $this-> template->set_var('href_more', 'index.php?menuaction=mobile.ui_mobilemail.list_folders');
+                        $this-> template->set_var('lang_more_folders', lang('More folders...'));
                         $this-> template->set_var('href_calendar', "index.php?menuaction=mobile.ui_mobilecalendar.index");
                         $this-> template->set_var('lang_calendar', lang('Calendar'));

trunk/mobile/inc/class.ui_mobilemail.inc.php

@@ -33 +33 @@
                         'add_recipients' => true,
                         'add_recipient' => true,
+                        'list_folders' => true
                 );
 
@@ -319 +320 @@
                         $p->set_block('mobilemail_t', 'inbox_folder_list');
                         $p->set_var('lang_folder', lang('Folder'));
-                        
-                        $folder_number = $this->get_folder_number($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder']);
-                        $save_in_folder = $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'];
-                        $save_in_folder = str_replace("*","",lang(str_replace("INBOX/","",$save_in_folder)));
+                        $folder = str_replace("*","",lang($this->folders[$this->current_folder]['folder_name']));
                         if(!$this->current_folder == 0){
-                                $p->set_var('lang_inbox', $save_in_folder.' :: <a title="'.lang('Inbox').'" href="index.php?menuaction=mobile.ui_mobilemail.mail_list&folder=0">'.lang('Inbox').'</a>');
+                                $p->set_var('lang_inbox', $folder.' :: <a title="'.lang('Inbox').'" href="index.php?menuaction=mobile.ui_mobilemail.mail_list&folder=0">'.lang('Inbox').'</a>');
                         }else{
-                                $p->set_var('lang_inbox', lang('Inbox').' :: <a title="'.$save_in_folder.'" href="index.php?menuaction=mobile.ui_mobilemail.mail_list&folder='.$folder_number.'">'.$save_in_folder.'</a>');
+                                $p->set_var('lang_inbox', lang('Inbox'));
                         }
                         
@@ -1015 +1013 @@
                                 }
                 }
+                
+                function list_folders(){                        
+                        $p = CreateObject('phpgwapi.Template', PHPGW_SERVER_ROOT . '/mobile/templates/'.$GLOBALS['phpgw_info']['server']['template_set']);
+                        //Define o template para mensagens de retorno da funcao
+                        $p->set_file(
+                                Array(
+                                        'folders_t' => 'folders.tpl'
+                                )
+                        );
+                        $p->set_block('folders_t','retorno');
+                        
+                        $folders_list = '';
+                        //$this->folders = $this->imap_functions->get_folders_list();
+                        foreach($this->folders as $id =>$folder)
+                        {
+                                if(strpos($folder['folder_id'],'user')===false && is_array($folder)) {
+                                        if(($id != $this->get_folder_number($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['save_in_folder'])) && ($id != 0)){
+                                                $folder_name = str_replace('*','',lang($folder['folder_name']));
+                                                $folder_link = "index.php?menuaction=mobile.ui_mobilemail.mail_list&folder=".$id;
+                                                $folders_list .= "<br>:: <a href=".$folder_link.">".$folder_name."</a>";
+                                        }
+                                }
+                        }
+                        $p->set_var('folders_list', $folders_list);
+                        $p->pfp('out','retorno');                                  
+                    
+                }
 
         }

trunk/mobile/setup/phpgw_pt-br.lang

@@ -32 +32 @@
 Message sent successfully       mobile  pt-br   Mensagem enviada com sucesso
 Message not sent        mobile  pt-br   Mensagem não enviada
+More Folders... mobile  pt-br   Mais Pastas...
 error   mobile  pt-br   Error: 
 Some addresses in the To field were not recognized. Please make sure that all addresses are properly formed     mobile  pt-br   Alguns endereços no campo "Para" não foram reconhecidos. Por favor certifique-se que todos endereços estão corretos

trunk/mobile/templates/default/home.tpl

@@ -23 +23 @@
 :: <a href="{href_email}">{lang_email}</a> <br>
 :: <a href="{href_sent}">{lang_sent}</a> <br>
+:: <a href="{href_more}">{lang_more_folders}</a> <br>
 :: <a href="{href_calendar}">{lang_calendar}</a> <br>
 :: <a href="{href_cc}">{lang_cc}</a> <br>