moved (optional) language selection befor the user-name and automaticaly reload the page, if the user changed the language

This commit is contained in:
Ralf Becker 2004-07-11 09:42:54 +00:00
parent e5d689cb9f
commit 56d6430de2
2 changed files with 20 additions and 16 deletions

View File

@ -258,7 +258,11 @@
$GLOBALS['phpgw_info']['user']['preferences'] = $prefs->read_repository(); $GLOBALS['phpgw_info']['user']['preferences'] = $prefs->read_repository();
} }
} }
if(!isset($_COOKIE['last_loginid']) || !$prefs->account_id) if ($_GET['lang'])
{
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = $_GET['lang'];
}
elseif(!isset($_COOKIE['last_loginid']) || !$prefs->account_id)
{ {
// If the lastloginid cookies isn't set, we will default to the first language, // If the lastloginid cookies isn't set, we will default to the first language,
// the users browser accepts. // the users browser accepts.
@ -377,7 +381,7 @@
if (@$GLOBALS['phpgw_info']['server']['login_show_language_selection']) if (@$GLOBALS['phpgw_info']['server']['login_show_language_selection'])
{ {
$select_lang = '<select name="lang">'; $select_lang = '<select name="lang" onchange="'."location.href=location.href+(location.search?'&':'?')+'lang='+this.value".'">';
$langs = $GLOBALS['phpgw']->translation->get_installed_langs(); $langs = $GLOBALS['phpgw']->translation->get_installed_langs();
uasort($langs,'strcasecmp'); uasort($langs,'strcasecmp');
foreach ($langs as $key => $name) // if we have a translation use it foreach ($langs as $key => $name) // if we have a translation use it

View File

@ -69,14 +69,14 @@
<table class="divLoginbox" cellspacing="0" cellpadding="0" border="0" align="center"> <table class="divLoginbox" cellspacing="0" cellpadding="0" border="0" align="center">
<tr> <tr>
<td colspan="2" class="divLoginboxHeader" style="border-bottom: #9c9c9c 1px solid;" align="center">{website_title}</td> <td class="divLoginboxHeader" style="border-bottom: #9c9c9c 1px solid;" align="center">{website_title}</td>
</tr> </tr>
<tr > <tr >
<td class="divSideboxEntry"> <td class="divSideboxEntry">
<table cellspacing=0 cellpadding=0 width="100%" border="0"> <table cellspacing="2" cellpadding="0" width="100%" border="0">
<tr> <tr>
<td colspan="3" align="left"> <td colspan="4" align="left">
{register_link}<br/> {register_link}<br/>
<img width="200" height="1" src="phpgwapi/templates/{template_set}/images/spacer.gif" alt="spacer" /> <img width="200" height="1" src="phpgwapi/templates/{template_set}/images/spacer.gif" alt="spacer" />
</td> </td>
@ -86,11 +86,9 @@
<input type="hidden" name="passwd_type" value="text"> <input type="hidden" name="passwd_type" value="text">
<input type="hidden" name="account_type" value="u"> <input type="hidden" name="account_type" value="u">
</td> </td>
</tr> <td rowspan="4">
<tr> <img src="phpgwapi/templates/{template_set}/images/password.png" />
<td align="right">{lang_username}:&nbsp;</td> </td>
<td align="left"><input name="login" value="{cookie}" style="width: 100px; border: 1px solid silver;"></td>
<td align="left">{select_domain}</td>
</tr> </tr>
<!-- BEGIN language_select --> <!-- BEGIN language_select -->
<tr> <tr>
@ -98,30 +96,32 @@
<td align="left" colspan="2">{select_language}</td> <td align="left" colspan="2">{select_language}</td>
</tr> </tr>
<!-- END language_select --> <!-- END language_select -->
<tr>
<td align="right">{lang_username}:&nbsp;</td>
<td align="left"><input name="login" value="{cookie}" style="width: 100px; border: 1px solid silver;"></td>
<td align="left">{select_domain}</td>
</tr>
<tr> <tr>
<td align="right">{lang_password}:&nbsp;</td> <td align="right">{lang_password}:&nbsp;</td>
<td align="left"><input name="passwd" type="password" onChange="this.form.submit()" style="width: 100px; border: 1px solid silver;"></td> <td align="left"><input name="passwd" type="password" onChange="this.form.submit()" style="width: 100px; border: 1px solid silver;"></td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td colspan="3">&nbsp;</td> <td colspan="4">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td colspan="3" align="center"> <td colspan="4" align="center">
<input type="submit" value="{lang_login}" name="submitit" style="border: 1px solid silver;"> <input type="submit" value="{lang_login}" name="submitit" style="border: 1px solid silver;">
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="3" align="center"> <td colspan="4" align="center">
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
</table> </table>
</td> </td>
<td class="divSideboxEntry">
<img src="phpgwapi/templates/{template_set}/images/password.png" alt="keys" />
</td>
</tr> </tr>
</table> </table>
<p>&nbsp;</p> <p>&nbsp;</p>