Changeset 4695 for branches/2.2/mobile

Timestamp:

07/11/11 16:43:50 (13 years ago)

Author:

alexandrecorreia

Message:

Ticket #2093 - Corrigido o caminho do link para Versão Clássica dentro do mobile

Location:

branches/2.2/mobile

Files:

• login.php (modified) (2 diffs)
• templates/default/login.tpl (modified) (1 diff)

branches/2.2/mobile/login.php

@@ -35 +35 @@
         $tmpl = CreateObject('phpgwapi.Template', PHPGW_SERVER_ROOT . '/mobile/templates/'.$GLOBALS['phpgw_info']['server']['template_set']);
         $GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] = $GLOBALS['phpgw_info']['login_template_set'];
+        
+        //URL Expresso
+        $url_expresso = $GLOBALS['phpgw_info']['server']['webserver_url'];
+        $url_expresso = ( !empty($url_expresso) ) ? $url_expresso : '/';
+        
+        if(strrpos($url_expresso,'/') === false || strrpos($url_expresso,'/') != (strlen($url_expresso)-1))
+        {
+                $url_expresso .= '/';
+        }
+        
         $tmpl->set_file(array('login_form' => 'login.tpl'));
         $tmpl->set_block('login_form','page');
         $tmpl->set_block('login_form','success_message');
         $tmpl->set_block('login_form','error_message');
+        $tmpl->set_var('url_expresso', $url_expresso);
+        $tmpl->set_var('lang_username', lang('username'));
+        $tmpl->set_var('lang_password', lang('password'));
+        $tmpl->set_var('lang_login', lang('login'));
+        
         
         //verificando a mensagem erro ou sucesso
@@ -180 +195 @@
         $tmpl->set_var('charset',$GLOBALS['phpgw']->translation->charset());
         $tmpl->set_var('cookie',$last_loginid);
-        $tmpl->set_var('lang_username', lang('username'));
-        $tmpl->set_var('lang_password', lang('password'));
-        $tmpl->set_var('lang_login', lang('login'));
         $tmpl->set_var('lang_notices', lang('notices'));
         $tmpl->set_var('website_title', $GLOBALS['phpgw_info']['server']['site_title']);

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

@@ -63 +63 @@
 
                 <div class="rodape">Projeto ExpressoLivre 2004 - 2010 :: Licen&ccedil;a de Software</div>
-                <div class="rodape center"><a href="/login.php?dont_redirect_if_moble=1">Versão Clássica</a></div>
+                <div class="rodape center"><a href="{url_expresso}login.php?dont_redirect_if_moble=1">Versão Clássica</a></div>
         </body>
 </html>