lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-09-13 10:14:47 +02:00
commit ed61508b3f
4 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/admin/modules.php
View File

@ -250,9 +250,10 @@ if (! empty($categ[$categidx]))
if ($conf->global->MAIN_FEATURES_LEVEL >= 1) if ($conf->global->MAIN_FEATURES_LEVEL >= 1)
{ {
$form = new Form($db);
$categidx='expdev'; $categidx='expdev';
$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx; $head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$categidx;
$head[$h][1] = $langs->trans("ModuleFamilyExperimental"); $head[$h][1] = $form->textwithpicto($langs->trans("ModuleFamilyExperimental"), $langs->trans('DoNotUseInProduction'), 1, 'warning', '', 0, 3);
$head[$h][2] = 'expdev'; $head[$h][2] = 'expdev';
$h++; $h++;
} }

32
htdocs/core/class/html.form.class.php
View File

@ -370,28 +370,11 @@ class Form
else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag else $paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
$s=""; $s="";
if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr>'; if (empty($notabs)) $s.='<table class="nobordernopadding" summary=""><tr>';
if ($direction > 0) if ($direction < 0) $s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">'.$img.'&nbsp;</'.$tag.'>';
{ if ($text != '') $s.='<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';
if ($text != '') if ($direction > 0) $s.='<'.$tag.$paramfortooltipimg.' valign="top" width="14">&nbsp;'.$img.'</'.$tag.'>';
{ if (empty($notabs)) $s.='</tr></table>';
$s.='<td'.$paramfortooltiptd.'>'.$text;
if ($direction) $s.='&nbsp;';
$s.='</td>';
}
if ($direction) $s.='<td'.$paramfortooltipimg.' valign="top" width="14">'.$img.'</td>';
}
else
{
if ($direction) $s.='<td'.$paramfortooltipimg.' valign="top" width="14">'.$img.'</td>';
if ($text != '')
{
$s.='<'.$tag.$paramfortooltiptd.'>';
if ($direction) $s.='&nbsp;';
$s.=$text.'</'.$tag.'>';
}
}
if (empty($notabs)) $s.='</tr></table>';
return $s; return $s;
} }
@ -405,9 +388,10 @@ class Form
* @param string $type Type of picto (info, help, warning, superadmin...) * @param string $type Type of picto (info, help, warning, superadmin...)
* @param string $extracss Add a CSS style to td tags * @param string $extracss Add a CSS style to td tags
* @param int $noencodehtmltext Do not encode into html entity the htmltext * @param int $noencodehtmltext Do not encode into html entity the htmltext
* @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
* @return string HTML code of text, picto, tooltip * @return string HTML code of text, picto, tooltip
*/ */
function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0) function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 0)
{ {
global $conf; global $conf;
@ -439,7 +423,7 @@ class Form
elseif ($type == 'admin') $img = img_picto($alt, 'star'); elseif ($type == 'admin') $img = img_picto($alt, 'star');
elseif ($type == 'warning') $img = img_warning($alt); elseif ($type == 'warning') $img = img_warning($alt);
return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, 0, '', $noencodehtmltext); return $this->textwithtooltip($text, $htmltext, 2, $direction, $img, $extracss, $notabs, '', $noencodehtmltext);
} }
/** /**

1
htdocs/langs/en_US/admin.lang
View File

@ -262,6 +262,7 @@ ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
ModuleFamilyECM=Electronic Content Management (ECM) ModuleFamilyECM=Electronic Content Management (ECM)
MenuHandlers=Menu handlers MenuHandlers=Menu handlers
MenuAdmin=Menu editor MenuAdmin=Menu editor
DoNotUseInProduction=Do not use in production
ThisIsProcessToFollow=This is setup to process: ThisIsProcessToFollow=This is setup to process:
StepNb=Step %s StepNb=Step %s
FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s). FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).

3
htdocs/langs/fr_FR/admin.lang
View File

@ -257,11 +257,12 @@ ModuleFamilyHr= Ressources humaines
ModuleFamilyProjects= Projets/Travail collaboratif ModuleFamilyProjects= Projets/Travail collaboratif
ModuleFamilyOther= Autre ModuleFamilyOther= Autre
ModuleFamilyTechnic= Outils multi-modules ModuleFamilyTechnic= Outils multi-modules
ModuleFamilyExperimental= Modules expérimentaux (ne pas utiliser en production) ModuleFamilyExperimental= Modules expérimentaux
ModuleFamilyFinancial= Modules financiers (Compta/trésorerie) ModuleFamilyFinancial= Modules financiers (Compta/trésorerie)
ModuleFamilyECM= Gestion Électronique de Documents (GED) ModuleFamilyECM= Gestion Électronique de Documents (GED)
MenuHandlers= Gestionnaires menu MenuHandlers= Gestionnaires menu
MenuAdmin= Edition menu MenuAdmin= Edition menu
DoNotUseInProduction=Ne pas utiliser en production
ThisIsProcessToFollow= Voici la procédure à suivre: ThisIsProcessToFollow= Voici la procédure à suivre:
StepNb= Etape %s StepNb= Etape %s
FindPackageFromWebSite=Recherche le package qui répond à votre besoin (par exemple sur le site web %s). FindPackageFromWebSite=Recherche le package qui répond à votre besoin (par exemple sur le site web %s).