Changeset 3731 for branches/2.2/mobile/inc/class.ui_home.inc.php

Timestamp:

02/03/11 17:13:42 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1523 - Criado o layout do Expresso Mini para navegadores desktop

File:

• branches/2.2/mobile/inc/class.ui_home.inc.php (modified) (9 diffs)

branches/2.2/mobile/inc/class.ui_home.inc.php

@@ -22 +22 @@
                 
                 function change_template($params) {
-                        
                         $GLOBALS['phpgw']->session->appsession('mobile.layout','mobile',$params['template']);
-                        header("location: index.php");
+                        header("location: index.php?menuaction=mobile.ui_mobilemail.change_folder&folder=0");
                 }
                 
@@ -49 +48 @@
                         $this->template->set_var('lang_selected', lang("selected"));
                         
-                        $this->template->set_var('search',$this->template->fp('out','search_bar'));
-                        
                         $accountId = $GLOBALS['phpgw_info']['user']['account_id'];
                         
@@ -59 +56 @@
                         $this->set_folder_block($default_folders, "default_folders_box");
                         
-                        if(isset($params["expand_folders"]) && $params["expand_folders"] == 1) 
-                        {
-                                $personal_folders = $this->imap_functions->get_folders_list(array('noSharedFolders' => true, 'folderType' => 'personal', 'noQuotaInfo' => true));
-                                $this->set_folder_block($personal_folders, "personal_folders_box", sizeof($default_folders));
-                                $this->template->set_var('expand_folders', 0);                  
-                        } else {
-                                $this->template->set_var('expand_folders', 1);
-                        }
+                        $personal_folders = $this->imap_functions->get_folders_list(array('noSharedFolders' => true, 'folderType' => 'personal', 'noQuotaInfo' => true));
+                        $this->set_folder_block($personal_folders, "personal_folders_box", sizeof($default_folders));
                         
                         $this->template->set_var('quota_percent', $total_quota["quota_percent"]);
@@ -92 +83 @@
                         ) );
                         
-                        $events  = $this->bocalendar->cached_events;
+                        $events = $this->bocalendar->cached_events;
                         
                         foreach($events[$year.$this->common->complete_string($month,2,"R","0").$this->common->complete_string($day,2,"R","0")] as $index=>$event) 
@@ -105 +96 @@
                         $GLOBALS['phpgw_info']['mobiletemplate']->set_error_msg($params["error_message"]);
                         $GLOBALS['phpgw_info']['mobiletemplate']->set_success_msg($params["success_message"]);
-                        if($GLOBALS['phpgw']->session->appsession('mobile.layout','mobile')=="mini")
+                        
+                        if($GLOBALS['phpgw']->session->appsession('mobile.layout','mobile')=="mini_desktop") {
                                 $GLOBALS['phpgw_info']['mobiletemplate']->set_home($this->template->fp('out', 'page'));
-                        else
+                        } else {
+                                $this->template->set_var('search',$this->template->fp('out','search_bar'));
                                 $GLOBALS['phpgw_info']['mobiletemplate']->set_content($this->template->fp('out', 'page'));
+                        }
 
                 }
@@ -149 +143 @@
 
                         $p = $this->template;
-                        $p->set_file(
-                                Array(
-                                        'search' => 'home_search.tpl',
-                                        'home_search_bar' => 'search_bar.tpl'
-                                )
-                        );
+                        $p->set_file(array('home_search' => 'home_search.tpl'));
+                        $p->set_file(array('home_search_bar' => 'search_bar.tpl'));
                         
                         //Langs gerais da página
-                        $p->set_block('search','home_search');
-                        $p->set_block("search","row_events");
-                        $p->set_block("search","no_events");
+                        $p->set_block('home_search','main');
+                        $p->set_block("home_search","row_events");
+                        $p->set_block("home_search","no_events");
                         $p->set_block('home_search_bar','search_bar');
                         
@@ -184 +174 @@
                         $p->set_var('show_more_events',"none");
                         $p->set_var('contacts_request_from',
-                                                        isset($params["request_from"])?
-                                                        $params["request_from"]:"none");
-                        
-                        $p->set_var('search',$p->fp('out','search_bar'));
+                                isset($params["request_from"])?
+                                $params["request_from"]:"none");
+                                
+                        if($GLOBALS['phpgw']->session->appsession('mobile.layout','mobile')!="mini_desktop") {
+                                $p->set_var('search',$p->fp('out','search_bar'));
+                        }
 
                         //E-mails
@@ -194 +186 @@
                                 if($params['default_folders']==="1") {
                                         if($params['personal_folders']!=="1")
-                                                $mail_params['folderType'] = 'default';                 
+                                                $mail_params['folderType'] = 'default';
                                 }
                                 else {
@@ -324 +316 @@
                         }
                         
-                        $GLOBALS['phpgw_info']['mobiletemplate']->set_content($p->fp('out','home_search'));
+                        $GLOBALS['phpgw_info']['mobiletemplate']->set_content($p->fp('out','main'));
 
                 }