New: add company link for external user

This commit is contained in:
Regis Houssin 2010-11-05 17:47:41 +00:00
parent 65f51e9acb
commit c2f43ab94b
5 changed files with 42 additions and 40 deletions

View File

@ -1077,20 +1077,23 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
// Link to login card
$loginhtmltext=''; $logintext='';
$logintext='<a class="login" href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'"';
$logintext.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
$logintext.='>'.$user->login.'</a>';
$loginhtmltext.='<u>'.$langs->trans("User").'</u>';
$loginhtmltext.='<br><b>'.$langs->trans("Name").'</b>: '.$user->getFullName($langs);
$loginhtmltext.='<br><b>'.$langs->trans("Login").'</b>: '.$user->login;
$loginhtmltext.='<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
$type=($user->societe_id?$langs->trans("External"):$langs->trans("Internal"));
if ($user->societe_id)
{
$thirdpartystatic=new Societe($db);
$thirdpartystatic->fetch($user->societe_id);
$type.=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
$companylink=' ('.$thirdpartystatic->getNomUrl('','').')';
$company=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
}
$logintext='<div class="login"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'"';
$logintext.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
$logintext.='>'.$user->login.'</a>';
if ($user->societe_id) $logintext.=$companylink;
$logintext.='</div>';
$loginhtmltext.='<u>'.$langs->trans("User").'</u>';
$loginhtmltext.='<br><b>'.$langs->trans("Name").'</b>: '.$user->getFullName($langs);
$loginhtmltext.='<br><b>'.$langs->trans("Login").'</b>: '.$user->login;
$loginhtmltext.='<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
$type=($user->societe_id?$langs->trans("External").$company:$langs->trans("Internal"));
$loginhtmltext.='<br><b>'.$langs->trans("Type").'</b>: '.$type;
$loginhtmltext.='<br>';
$loginhtmltext.='<br><u>'.$langs->trans("Connection").'</u>';

View File

@ -430,19 +430,19 @@ foreach($mainmenuusedarray as $key => $val)
/* Login */
a.login
{
div.login {
position: absolute;
<?php print $right; ?>: 30px;
color: #234046;
padding: 12px 8px;
margin: 0px 0px 1px 0px;
font-weight: bold;
}
a.login:hover
{
color: black;
div.login a {
color: #234046;
}
div.login a:hover {
color: black;
text-decoration:underline;
}
img.login, img.printer {

View File

@ -448,20 +448,20 @@ foreach($mainmenuusedarray as $key => $val)
/* Login */
a.login
{
div.login {
position: absolute;
<?php print $right; ?>: 30px;
top: 3px;
color: #234046;
padding: 0px 8px;
margin: 0px 0px 1px 0px;
font-weight: bold;
}
a.login:hover
{
color: black;
div.login a {
color: #234046;
}
div.login a:hover {
color: black;
text-decoration:underline;
}
img.login, img.printer {

View File

@ -350,21 +350,20 @@ li.tmenu a:link
/* Login */
a.login
{
div.login {
position: absolute;
<?php print $right; ?>: 30px;
top: 3px;
color: #234046;
padding: 0px 8px;
margin: 0px 0px 6px 0px;
border: 1px solid #dcdcd0;
font-weight:bold;
margin: 0px 0px 1px 0px;
font-weight: bold;
}
a.login:hover
{
color:black;
div.login a {
color: #234046;
}
div.login a:hover {
color: black;
text-decoration:underline;
}
img.login

View File

@ -329,22 +329,22 @@ li.tmenu a:link
/* Login */
a.login
{
div.login {
position: absolute;
<?php print $right; ?>: 30px;
top: 2px;
color: #234046;
padding: 0px 8px;
margin: 0px 0px 1px 0px;
border: 1px solid #dcdcb3;
font-weight:bold;
font-size:12px;
}
a.login:hover
{
color:black;
div.login a {
color: #234046;
}
div.login a:hover {
color: black;
text-decoration:underline;
}
img.login