Changeset 3652

Timestamp:

12/30/10 15:51:05 (13 years ago)

Author:

eduardoalex

Message:

Ticket #1404 - Adicionado link de logout na barra superior da página e retirado do rodapé

Location:

branches/2.2/mobile

Files:

• inc/class.mobiletemplate.inc.php (modified) (4 diffs)
• templates/default/template.tpl (modified) (2 diffs)

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

@@ -65 +65 @@
                 public function print_page($class, $method){
                         $this->print_header();
-                        $class=='ui_home' && $method=='index'?'':$this->print_navbar();
+                        $class=='ui_home' && $method=='index'?$this->print_logout():$this->print_navbar();
                         $filename = 'inc/class.'.$class.'.inc.php';
                         include_once($filename);
@@ -72 +72 @@
                         $this->template->pfp('out', 'mobile_home');
                 }
-        
+                
+                /*
+                * @function print_logout
+                * @abstract Exibe label e link para Logout
+                * @author Diego Moreno
+                */
+                public function print_logout(){
+                        $this-> template->set_var('lang_logout', lang('logout'));
+                        $this-> template->set_var('href_logout', 'login.php?cd=1');
+                }
+                
                 /*
                 * @function print_navbar
@@ -85 +95 @@
             $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['timezone'] = $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] ? $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['timezone'] : sprintf("%s", array_search("America/Sao_Paulo", $zones));
 
-                        
-                        $this-> template->set_var('lang_logout', lang('logout'));
+
+                        $this-> print_logout();                 
                         $this-> template->set_var('lang_back', lang('Back'));
                         $this-> template->set_var('lang_home', lang('home'));
@@ -92 +102 @@
                         $this-> template->set_var('lang_contacts', lang('Contact Center'));
                         $this-> template->set_var('lang_calendar', lang('Calendar'));
-                        $this-> template->set_var('href_logout', 'login.php?cd=1');
                         $this-> template->set_var('href_back', 'javascript:history.back()');
                         $this-> template->set_var('href_cc', 'index.php?menuaction=mobile.ui_mobilecc.init_cc');

branches/2.2/mobile/templates/default/template.tpl

@@ -13 +13 @@
                 <div class="topo">
                 <h1>Expresso Mini</h1>
+                        <span>
+                                <a href="{href_logout}">{lang_logout}</a>
+                        </span>
                 </div>
 
@@ -26 +29 @@
                         <p><a href="{href_cc}">{lang_contacts}</a></p>
                         <p><a href="{href_calendar}">{lang_calendar}</a></p>
-                        <p><a href="{href_logout}">{lang_logout}</a></p>
                 </div>
                 <div class="rodape">Projeto ExpressoLivre 2004 - 2010 :: Licen&ccedil;a de Software</div>