Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Look: enhancement in look

Browse Source
This commit is contained in:
Laurent Destailleur
2010-06-27 13:19:38 +00:00
parent 19c29227bf
commit 9c3a791e79
5 changed files with 72 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/lib/lib_foot.js
View File

@@ -1,6 +1,6 @@
// Copyright (C) 2005-2008 Laurent Destailleur <eldy@users.sourceforge.net> // Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
// //
// Script javascript mis en bas de page (avant fin de body) // Javascript code to put at bottom of pages (avant fin de body)
// //
// \file htdocs/lib/lib_foot.js // \file htdocs/lib/lib_foot.js
// \brief File that include javascript functions (included if option use_javascript activated) // \brief File that include javascript functions (included if option use_javascript activated)
@@ -8,13 +8,13 @@
/*********************************************** /***********************************************
* Cool DHTML tooltip script- <EFBFBD> Dynamic Drive DHTML code library (www.dynamicdrive.com) * Cool DHTML tooltip script- (c) Dynamic Drive DHTML code library (www.dynamicdrive.com)
* This notice MUST stay intact for legal use * This notice MUST stay intact for legal use
* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code * Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code
***********************************************/ ***********************************************/
var offsetxpoint=-60 //Customize x offset of tooltip var offsetxpoint=-40 //Customize x offset of tooltip
var offsetypoint=18 //Customize y offset of tooltip var offsetypoint=12 //Customize y offset of tooltip
var ie=document.all var ie=document.all
var ns6=document.getElementById && !document.all var ns6=document.getElementById && !document.all
var enabletip=false var enabletip=false

99
htdocs/main.inc.php
View File

@@ -909,6 +909,8 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
{ {
global $user, $conf, $langs, $db, $dolibarr_main_authentication; global $user, $conf, $langs, $db, $dolibarr_main_authentication;
$html=new Form($db);
if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php'; if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php';
if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php'; if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php';
@@ -939,36 +941,14 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$menutop->showmenu(); $menutop->showmenu();
// Link to login card // Link to login card
print '<a class="login" href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'"'; $loginhtmltext=''; $logintext='';
print $menutop->atarget?(' target="'.$menutop->atarget.'"'):''; $logintext='<a class="login" href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'"';
print '>'.$user->login.'</a>'; $logintext.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
$logintext.='>'.$user->login.'</a>';
// Link info $loginhtmltext.='<u>'.$langs->trans("User").'</u>';
$htmltext=''; $text=''; $loginhtmltext.='<br><b>'.$langs->trans("Name").'</b>: '.$user->fullname;
if ($_SESSION["dol_authmode"] != 'forceuser' $loginhtmltext.='<br><b>'.$langs->trans("Login").'</b>: '.$user->login;
&& $_SESSION["dol_authmode"] != 'http') $loginhtmltext.='<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
{
$htmltext=$langs->trans("Logout").'<br>';
$htmltext.="<br>";
$text.='<a href="'.DOL_URL_ROOT.'/user/logout.php"';
$text.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
$text.='>';
$text.='<img class="login" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
$text.=' alt="'.dol_escape_htmltag($langs->trans("Logout")).'" title=""';
$text.='>';
$text.='</a>';
}
else
{
$text.='<img class="login" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
$text.=' alt="'.dol_escape_htmltag($langs->trans("Logout")).'" title=""';
$text.='>';
}
$htmltext.='<u>'.$langs->trans("User").'</u>';
$htmltext.='<br><b>'.$langs->trans("Name").'</b>: '.$user->fullname;
$htmltext.='<br><b>'.$langs->trans("Login").'</b>: '.$user->login;
$htmltext.='<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
$type=($user->societe_id?$langs->trans("External"):$langs->trans("Internal")); $type=($user->societe_id?$langs->trans("External"):$langs->trans("Internal"));
if ($user->societe_id) if ($user->societe_id)
{ {
@@ -976,35 +956,54 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$thirdpartystatic->fetch($user->societe_id); $thirdpartystatic->fetch($user->societe_id);
$type.=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')'; $type.=' ('.$langs->trans("Company").': '.$thirdpartystatic->name.')';
} }
$htmltext.='<br><b>'.$langs->trans("Type").'</b>: '.$type; $loginhtmltext.='<br><b>'.$langs->trans("Type").'</b>: '.$type;
$htmltext.='<br>'; $loginhtmltext.='<br>';
$htmltext.='<br><u>'.$langs->trans("Connection").'</u>'; $loginhtmltext.='<br><u>'.$langs->trans("Connection").'</u>';
if ($conf->global->MAIN_MODULE_MULTICOMPANY) $htmltext.='<br><b>'.$langs->trans("ConnectedOnMultiCompany").'</b>: '.$conf->entity.' (user entity '.$user->entity.')'; if ($conf->global->MAIN_MODULE_MULTICOMPANY) $loginhtmltext.='<br><b>'.$langs->trans("ConnectedOnMultiCompany").'</b>: '.$conf->entity.' (user entity '.$user->entity.')';
$htmltext.='<br><b>'.$langs->trans("ConnectedSince").'</b>: '.dol_print_date($user->datelastlogin,"dayhour"); $loginhtmltext.='<br><b>'.$langs->trans("ConnectedSince").'</b>: '.dol_print_date($user->datelastlogin,"dayhour");
$htmltext.='<br><b>'.$langs->trans("PreviousConnexion").'</b>: '.dol_print_date($user->datepreviouslogin,"dayhour"); $loginhtmltext.='<br><b>'.$langs->trans("PreviousConnexion").'</b>: '.dol_print_date($user->datepreviouslogin,"dayhour");
$htmltext.='<br><b>'.$langs->trans("AuthenticationMode").'</b>: '.$_SESSION["dol_authmode"]; $loginhtmltext.='<br><b>'.$langs->trans("AuthenticationMode").'</b>: '.$_SESSION["dol_authmode"];
$htmltext.='<br><b>'.$langs->trans("CurrentTheme").'</b>: '.$conf->theme; $loginhtmltext.='<br><b>'.$langs->trans("CurrentTheme").'</b>: '.$conf->theme;
$s=picto_from_langcode($conf->global->MAIN_LANG_DEFAULT); $s=picto_from_langcode($langs->getDefaultLang());
$htmltext.='<br><b>'.$langs->trans("CurrentUserLanguage").'</b>: '.($s?$s.' ':'').$langs->getDefaultLang(); $loginhtmltext.='<br><b>'.$langs->trans("CurrentUserLanguage").'</b>: '.($s?$s.' ':'').$langs->getDefaultLang();
$htmltext.='<br><b>'.$langs->trans("Browser").'</b>: '.$conf->browser->name.' ('.$_SERVER['HTTP_USER_AGENT'].')'; $loginhtmltext.='<br><b>'.$langs->trans("Browser").'</b>: '.$conf->browser->name.' ('.$_SERVER['HTTP_USER_AGENT'].')';
if (! empty($conf->browser->phone)) $htmltext.='<br><b>'.$langs->trans("Phone").'</b>: '.$conf->browser->phone; if (! empty($conf->browser->phone)) $loginhtmltext.='<br><b>'.$langs->trans("Phone").'</b>: '.$conf->browser->phone;
if (! empty($_SESSION["disablemodules"])) $loginhtmltext.='<br><b>'.$langs->trans("DisabledModules").'</b>: <br>'.join('<br>',explode(',',$_SESSION["disablemodules"]));
if (! empty($_SESSION["disablemodules"])) $htmltext.='<br><b>'.$langs->trans("DisabledModules").'</b>: <br>'.join('<br>',explode(',',$_SESSION["disablemodules"])); // Link info
$logouthtmltext=''; $logouttext='';
$logouthtmltext=$langs->trans("Logout").'<br>';
//$logouthtmltext.="<br>";
if ($_SESSION["dol_authmode"] != 'forceuser'
&& $_SESSION["dol_authmode"] != 'http')
{
$logouttext.='<a href="'.DOL_URL_ROOT.'/user/logout.php"';
$logouttext.=$menutop->atarget?(' target="'.$menutop->atarget.'"'):'';
$logouttext.='>';
$logouttext.='<img class="login" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
$logouttext.=' alt="'.dol_escape_htmltag($langs->trans("Logout")).'" title=""';
$logouttext.='>';
$logouttext.='</a>';
}
else
{
$logouttext.='<img class="login" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"';
$logouttext.=' alt="'.dol_escape_htmltag($langs->trans("Logout")).'" title=""';
$logouttext.='>';
}
// print '<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png"'; print $html->textwithtooltip('',$loginhtmltext,2,1,$logintext);
// print ' alt="'.$title.'" title="'.$title.'"';
// print '>'; print $html->textwithtooltip('',$logouthtmltext,2,1,$logouttext);
$html=new Form($db);
print $html->textwithtooltip('',$htmltext,2,1,$text);
// Link to print main content area // Link to print main content area
if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone)) if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone))
{ {
$text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].'&optioncss=print" target="_blank">'; $text ='<a href="'.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].'&optioncss=print" target="_blank">';
$text.='<img class="printer" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/printer.png"'; $text.='<img class="printer" border="0" width="14" height="14" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/printer.png"';
$text.=' title="'.dol_escape_htmltag($langs->trans("PrintContentArea")).'" alt="'.dol_escape_htmltag($langs->trans("PrintContentArea")).'">'; $text.=' title="" alt="">';
$text.='</a>'; $text.='</a>';
print $text; print $html->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text);
} }
print "\n</div>\n<!-- End top horizontal menu -->\n"; print "\n</div>\n<!-- End top horizontal menu -->\n";

20
htdocs/societe.php
View File

@@ -146,8 +146,8 @@ if ($_GET['delsoc']) print '<div class="warning">'.$langs->trans("CompanyDeleted
/* /*
REM: Regle sur droits "Voir tous les clients" REM: Regle sur droits "Voir tous les clients"
REM: Exemple, voir la page societe.php dans le mode liste. REM: Exemple, voir la page societe.php dans le mode liste.
Utilisateur interne socid=0 + Droits voir tous clients => Voit toute soci<EFBFBD>t<EFBFBD> Utilisateur interne socid=0 + Droits voir tous clients => Voit toute societe
Utilisateur interne socid=0 + Pas de droits voir tous clients => Ne voit que les soci<EFBFBD>t<EFBFBD>s li<EFBFBD>es comme commercial Utilisateur interne socid=0 + Pas de droits voir tous clients => Ne voit que les societes liees comme commercial
Utilisateur externe socid=x + Droits voir tous clients => Ne voit que lui meme Utilisateur externe socid=x + Droits voir tous clients => Ne voit que lui meme
Utilisateur externe socid=x + Pas de droits voir tous clients => Ne voit que lui meme Utilisateur externe socid=x + Pas de droits voir tous clients => Ne voit que lui meme
*/ */
@@ -225,7 +225,7 @@ if ($resql)
$params.= '&amp;search_idprof3='.$search_idprof3; $params.= '&amp;search_idprof3='.$search_idprof3;
$params.= '&amp;search_idprof4='.$search_idprof4; $params.= '&amp;search_idprof4='.$search_idprof4;
print_barre_liste($title, $page, "societe.php",$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords); print_barre_liste($title, $page, $_SERVER["PHP_SELF"],$params,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
$langs->load("other"); $langs->load("other");
$textprofid=array(); $textprofid=array();
@@ -240,18 +240,18 @@ if ($resql)
} }
} }
print '<form method="post" action="societe.php" name="formfilter">'; print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
// Lignes des titres // Lignes des titres
print '<table class="liste" width="100%">'; print '<table class="liste" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans("Company"),"societe.php","s.nom","",$params,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$params,"",$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Town"),"societe.php","s.ville","",$params,'',$sortfield,$sortorder); print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.ville","",$params,'',$sortfield,$sortorder);
print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),"societe.php","s.siren","",$params,'nowrap="nowrap"',$sortfield,$sortorder); print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$params,'nowrap="nowrap"',$sortfield,$sortorder);
print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),"societe.php","s.siret","",$params,'nowrap="nowrap"',$sortfield,$sortorder); print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$params,'nowrap="nowrap"',$sortfield,$sortorder);
print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),"societe.php","s.ape","",$params,'nowrap="nowrap"',$sortfield,$sortorder); print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$params,'nowrap="nowrap"',$sortfield,$sortorder);
print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),"societe.php","s.idprof4","",$params,'nowrap="nowrap"',$sortfield,$sortorder); print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$params,'nowrap="nowrap"',$sortfield,$sortorder);
print '<td class="liste_titre" colspan="2" align="center">&nbsp;</td>'; print '<td class="liste_titre" colspan="2" align="center">&nbsp;</td>';
print "</tr>\n"; print "</tr>\n";

8
htdocs/support/online.php
View File

@@ -65,6 +65,12 @@ array('name'=>'R&eacute;gis Houssin',
'sort'=>2, 'sort'=>2,
'logo'=>'logoUrl='.urlencode('http://www.cap-networks.com/images/logo_small.jpg'), 'logo'=>'logoUrl='.urlencode('http://www.cap-networks.com/images/logo_small.jpg'),
'id'=>'5391', 'id'=>'5391',
'lang'=>'fr'),
// Widget for Auguria
array('name'=>'Auguria',
'sort'=>2,
//'logo'=>'logoUrl='.urlencode('http://www.cap-networks.com/images/logo_small.jpg'),
'id'=>'7196',
'lang'=>'fr') 'lang'=>'fr')
); );
$arrayofwidgets=dol_sort_array($arrayofwidgets,'sort','asc',0,0); $arrayofwidgets=dol_sort_array($arrayofwidgets,'sort','asc',0,0);
@@ -97,7 +103,7 @@ foreach ($arrayofwidgets as $arraywidget) // Loop on each user
// Only first language found is used for widget // Only first language found is used for widget
$widgetid=$listofwidgets[$pos-1]; $widgetid=$listofwidgets[$pos-1];
// Widget V3 // Widget V3
print '<iframe src="http://www.spark-angels.com/static/widget/template-pro3/widgetpro3-iframe.html?widgetId='.$widgetid.'&lgCode='.$langcode.'&'.$arraywidget['logo'].'" width="172" height="123" frameborder="0" scrolling="no" marginheight="0" > </iframe>'; print '<iframe src="http://www.spark-angels.com/static/widget/template-pro3/widgetpro3-iframe.html?widgetId='.$widgetid.'&lgCode='.$langcode.'&'.$arraywidget['logo'].'" width="172" height="123" frameborder="0" scrolling="no" marginheight="0" > </iframe>';

1
htdocs/theme/auguria/style.css.php
View File

@@ -1269,6 +1269,7 @@ table.valid {
#dhtmltooltip #dhtmltooltip
{ {
-moz-border-radius:4px;
position: absolute; position: absolute;
width: <?php print dol_size(450,'width'); ?>px; width: <?php print dol_size(450,'width'); ?>px;
border-top: solid 1px #BBBBBB; border-top: solid 1px #BBBBBB;