fmsystem-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [6477] API : more on new login

From: Sigurd Nes
Subject: [Fmsystem-commits] [6477] API : more on new login
Date: Tue, 12 Oct 2010 21:44:15 +0000 
Revision: 6477
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6477
Author:   sigurdne
Date:     2010-10-12 21:44:15 +0000 (Tue, 12 Oct 2010)
Log Message:
-----------
API : more on new login

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.translation.inc.php
    trunk/phpgwapi/inc/sso/include_login.inc.php
    trunk/phpgwapi/templates/base/login.tpl

Added Paths:
-----------
    trunk/phpgwapi/templates/base/images/flag_en.gif
    trunk/phpgwapi/templates/base/images/flag_no.gif

Modified: trunk/phpgwapi/inc/class.translation.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.translation.inc.php        2010-10-12 09:06:19 UTC 
(rev 6476)
+++ trunk/phpgwapi/inc/class.translation.inc.php        2010-10-12 21:44:15 UTC 
(rev 6477)
@@ -277,11 +277,12 @@
                                $userlang = 'en';
                        }
 
+/*
                        if ( 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] )
                        {
                                $userlang = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
                        }
-
+*/
                        $sql = "SELECT message_id,content FROM phpgw_lang WHERE 
lang = '{$userlang}' AND app_name = '{$app}'";
                        $GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
                        while ( $GLOBALS['phpgw']->db->next_record() )

Modified: trunk/phpgwapi/inc/sso/include_login.inc.php
===================================================================
--- trunk/phpgwapi/inc/sso/include_login.inc.php        2010-10-12 09:06:19 UTC 
(rev 6476)
+++ trunk/phpgwapi/inc/sso/include_login.inc.php        2010-10-12 21:44:15 UTC 
(rev 6477)
@@ -215,6 +215,11 @@
                                
$GLOBALS['phpgw']->translation->set_userlang($GLOBALS['phpgw_info']['user']['preferences']['common']['lang'],
 $reset = true);
                        }
 
+                       if ($selected_lang = phpgw::get_var('lang', 'string', 
'GET', ''))
+                       {
+                               
$GLOBALS['phpgw']->translation->set_userlang($selected_lang, $reset = true);
+                       }
+
                        $lang = array
                        (
                                'domain'        => lang('domain'),

Added: trunk/phpgwapi/templates/base/images/flag_en.gif
===================================================================
(Binary files differ)


Property changes on: trunk/phpgwapi/templates/base/images/flag_en.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/phpgwapi/templates/base/images/flag_no.gif
===================================================================
(Binary files differ)


Property changes on: trunk/phpgwapi/templates/base/images/flag_no.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/phpgwapi/templates/base/login.tpl
===================================================================
--- trunk/phpgwapi/templates/base/login.tpl     2010-10-12 09:06:19 UTC (rev 
6476)
+++ trunk/phpgwapi/templates/base/login.tpl     2010-10-12 21:44:15 UTC (rev 
6477)
@@ -4,12 +4,12 @@
 <!-- BEGIN login_form -->
 <head>
        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-       <meta name="author" content="phpGroupWare http://www.phpgroupware.no";>
-       <meta name="description" content="{website_title} login screen, working 
environment powered by phpGroupWare">
-       <meta name="keywords" content="{website_title} login screen, 
phpgroupware, groupware, groupware suite">
+       <meta name="author" content="{system} http://www.phpgroupware.no";>
+       <meta name="description" content="{system} login screen, working 
environment powered by phpGroupWare">
+       <meta name="keywords" content="{{system} login screen, phpgroupware, 
groupware, groupware suite">
        <meta name="robots" content="noindex,nofollow">
        
-       <title>{website_title} - {lang_login}</title>
+       <title>{system} - {lang_login}</title>
 
        <link rel="stylesheet" href="phpgwapi/templates/base/css/system.css" 
type="text/css">
        <link rel="stylesheet" href="{login_css}" type="text/css">
@@ -45,6 +45,11 @@
        </div>
        
        <div id="content-box">
+               <div class="rawimages">
+                       <span><a href="login.php?lang=no"><img 
src="phpgwapi/templates/base/images/flag_no.gif" alt="Norsk (Norway)" 
title="Norsk (Norway)" ></a></span>
+                       <span><a href="login.php?lang=en"><img 
src="phpgwapi/templates/base/images/flag_en.gif" alt="English (United Kingdom)" 
title="English (United Kingdom)" ></a></span>
+               </div>
+
                <div class="padding">
                        <div id="element-box" class="login">
                                <div class="t">
reply via email to
[Prev in Thread] Current Thread [Next in Thread]