Better look with Android

This commit is contained in:
Laurent Destailleur 2009-10-06 15:23:01 +00:00
parent 0173de1940
commit 8c296ea19d
2 changed files with 9 additions and 2 deletions

View File

@ -161,7 +161,6 @@ function dol_loginfunction($langs,$conf,$mysoc)
print '<td valign="bottom" nowrap="nowrap"><input type="text" id="username" name="username" class="flat" size="15" maxlength="25" value="'; print '<td valign="bottom" nowrap="nowrap"><input type="text" id="username" name="username" class="flat" size="15" maxlength="25" value="';
print (!empty($lastuser)?$lastuser:(isset($_REQUEST["username"])?$_REQUEST["username"]:$demologin)); print (!empty($lastuser)?$lastuser:(isset($_REQUEST["username"])?$_REQUEST["username"]:$demologin));
print '" tabindex="1" /></td>'."\n"; print '" tabindex="1" /></td>'."\n";
// Show logo (search in order: small company logo, large company logo, theme logo, common logo) // Show logo (search in order: small company logo, large company logo, theme logo, common logo)
$width=0; $width=0;
$urllogo=DOL_URL_ROOT.'/theme/login_logo.png'; $urllogo=DOL_URL_ROOT.'/theme/login_logo.png';
@ -190,6 +189,8 @@ function dol_loginfunction($langs,$conf,$mysoc)
print '</td>'; print '</td>';
print '</tr>'."\n"; print '</tr>'."\n";
if (! empty($conf->browser->phone)) print '<tr><td colspan="3">&nbsp;</td></tr>'; // More space with phones
// Password field // Password field
print '<tr><td valign="top" nowrap="nowrap"> &nbsp; <b>'.$langs->trans("Password").'</b> &nbsp; </td>'."\n"; print '<tr><td valign="top" nowrap="nowrap"> &nbsp; <b>'.$langs->trans("Password").'</b> &nbsp; </td>'."\n";
print '<td valign="top" nowrap="nowrap"><input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="'; print '<td valign="top" nowrap="nowrap"><input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="';
@ -205,6 +206,8 @@ function dol_loginfunction($langs,$conf,$mysoc)
//TODO: creer class //TODO: creer class
$entity = array('1'=>'company1','2'=>'company2'); $entity = array('1'=>'company1','2'=>'company2');
if (! empty($conf->browser->phone)) print '<tr><td colspan="3">&nbsp;</td></tr>'; // More space with phones
print '<tr><td valign="top" nowrap="nowrap"> &nbsp; <b>'.$langs->trans("Entity").'</b> &nbsp; </td>'."\n"; print '<tr><td valign="top" nowrap="nowrap"> &nbsp; <b>'.$langs->trans("Entity").'</b> &nbsp; </td>'."\n";
print '<td valign="top" nowrap="nowrap">'; print '<td valign="top" nowrap="nowrap">';
print $html->selectarray('entity',$entity,$lastentity,0,0,0,1,'tabindex="3"'); print $html->selectarray('entity',$entity,$lastentity,0,0,0,1,'tabindex="3"');
@ -238,6 +241,8 @@ function dol_loginfunction($langs,$conf,$mysoc)
if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK)) if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
{ {
if (! empty($conf->browser->phone)) print '<tr><td colspan="3">&nbsp;</td></tr>'; // More space with phones
print '<tr><td colspan="3" align="center">'; print '<tr><td colspan="3" align="center">';
if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)) if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
{ {

View File

@ -264,6 +264,8 @@ print '</tr>'."\n";
if (function_exists("imagecreatefrompng") && ! $disabled) if (function_exists("imagecreatefrompng") && ! $disabled)
{ {
if (! empty($conf->browser->phone)) print '<tr><td colspan="3">&nbsp;</td></tr>'; // More space with phones
//print "Info session: ".session_name().session_id();print_r($_SESSION); //print "Info session: ".session_name().session_id();print_r($_SESSION);
print '<tr><td align="left" valign="middle" nowrap="nowrap"> &nbsp; <b>'.$langs->trans("SecurityCode").'</b></td>'; print '<tr><td align="left" valign="middle" nowrap="nowrap"> &nbsp; <b>'.$langs->trans("SecurityCode").'</b></td>';
print '<td valign="top" nowrap="nowrap" align="left" class="e">'; print '<td valign="top" nowrap="nowrap" align="left" class="e">';