Changeset 3641 for branches/2.2/mobile/inc

Timestamp:

12/29/10 09:49:47 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1475 - Barra em arquivo de template único

Location:

branches/2.2/mobile/inc

Files:

• class.ui_home.inc.php (modified) (5 diffs)
• class.ui_mobilecalendar.inc.php (modified) (2 diffs)
• class.ui_mobilecc.inc.php (modified) (3 diffs)
• class.ui_mobilemail.inc.php (modified) (2 diffs)

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

@@ -22 +22 @@
                 function index($params) {
                         $this->template->set_file(array('home_index' => 'home_index.tpl'));
+                        $this->template->set_file(array('home_search_bar' => 'search_bar.tpl'));
+                                        
                         $this->template->set_block('home_index','page');        
                         $this->template->set_block('home_index','folder_block');
-                        $this->template->set_block('home_index','commitment_block');
+                        $this->template->set_block('home_index','commitment_block');    
+                        $this->template->set_block('home_search_bar','search_bar');
                         
                         //langs
@@ -39 +42 @@
                         $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'];
                         
@@ -131 +136 @@
                         $ui_mobilemail = CreateObject("mobile.ui_mobilemail");//Necessário para lista de emails, que é uma função estática
 
-                        $p = CreateObject('phpgwapi.Template', PHPGW_SERVER_ROOT . '/mobile/templates/'.$GLOBALS['phpgw_info']['server']['template_set']);
+                        $p = $this->template;
                         $p->set_file(
                                 Array(
-                                        'search' => 'home_search.tpl'
+                                        'search' => 'home_search.tpl',
+                                        'home_search_bar' => 'search_bar.tpl'
                                 )
                         );
@@ -140 +146 @@
                         //Langs gerais da página
                         $p->set_block('search','home_search');
+                        $p->set_block('home_search_bar','search_bar');
+                        
                         $p->set_var('search_param',$params['name']);
                         $p->set_var('lang_back',lang('back'));
@@ -164 +172 @@
                                                         isset($params["request_from"])?
                                                         $params["request_from"]:"none");
+                        
+                        $p->set_var('search',$p->fp('out','search_bar'));
                         
                         //Contatos                      

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

@@ -26 +26 @@
                 
                 function index($params) {
-                        $this->template->set_file(array('calendar' => 'calendar.tpl'));
+                        $this->template->set_file(
+                                                                        array(
+                                                                                'calendar' => 'calendar.tpl',
+                                                                                'home_search_bar' => 'search_bar.tpl'
+                                                                        )
+                                                                );
                         $this->template->set_block("calendar","page");
                         $this->template->set_block('calendar','event_block');
@@ -33 +38 @@
                         $this->template->set_block('calendar','type_option_block');
                         $this->template->set_block('calendar','bar_block');
+                        $this->template->set_block('home_search_bar','search_bar');
                         $this->template->set_var('lang_back',lang("back"));
                         $this->template->set_var('lang_calendar',lang("Calendar"));
                         $this->template->set_var('lang_search',lang("search"));
+                        
+                        $this->template->set_var('search',$this->template->fp('out','search_bar'));
                         
                         if(!function_exists("get_events")){

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

@@ -123 +123 @@
                         $this->template->set_file(
                                 Array(
-                                        'contacts_list' => 'cc_main.tpl'
+                                        'contacts_list' => 'cc_main.tpl',
+                                        'home_search_bar' => 'search_bar.tpl'
                                 )
                         );
@@ -129 +130 @@
                         $this->template->set_block("contacts_list","main_body");
                         $this->template->set_block("contacts_list","pagging_block");
+                        $this->template->set_block('home_search_bar','search_bar');
 
                         //Langs gerais da página
@@ -142 +144 @@
                                                                                 $this->page_info["request_from"]==null?
                                                                                 "none":$this->page_info["request_from"]);
+                        
+                        $this->template->set_var('search',$this->template->fp('out','search_bar'));
                         
                         //Combo de catálogos

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

@@ -422 +422 @@
                         $p->set_file(
                                 Array(
-                                        'mail_t' => 'mobilemail.tpl'
+                                        'mail_t' => 'mobilemail.tpl',
+                                        'home_search_bar' => 'search_bar.tpl'
                                 )
                         );
+
+                        $p->set_block('home_search_bar','search_bar');
+
                         $p->set_var("page",$this->current_page+1);
                         $p->set_var("lang_new_message",lang("new message"));
@@ -433 +437 @@
                         $p->set_var("lang_back",lang("back"));
                         $p->set_var("lang_new_message",lang("new message"));
-                        $p->set_var("lang_search_message",lang("search"));
+                        $p->set_var('lang_search',lang('search'));
                         $p->set_var("lang_more",lang("more"));
                         $p->set_var("lang_messages",lang("messages"));
+                        $p->set_var('search',$p->fp('out','search_bar'));
                         
                         $max_per_page =