Enhance debian package
This commit is contained in:
Laurent Destailleur
parent
c03befd40c
commit
d1c3d15a16
@ -31,7 +31,7 @@
|
||||
* \file htdocs/core/class/html.form.class.php
|
||||
* \ingroup core
|
||||
* \brief File of class with all html predefined components
|
||||
* \version $Id: html.form.class.php,v 1.191 2011/07/21 22:55:06 eldy Exp $
|
||||
* \version $Id: html.form.class.php,v 1.190 2011/07/17 19:01:26 eldy Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -137,18 +137,17 @@ class Form
|
||||
/**
|
||||
* Show a text and picto with tooltip on text or picto
|
||||
* @param text Text to show
|
||||
* @param htmltext Content html of tooltip. Must be HTML/UTF8 encoded.
|
||||
* @param htmltext Content html of tooltip, coded into HTML/UTF8
|
||||
* @param tooltipon 1=tooltip sur texte, 2=tooltip sur picto, 3=tooltip sur les 2
|
||||
* @param direction -1=Le picto est avant, 0=pas de picto, 1=le picto est apres
|
||||
* @param img Code img du picto (use img_xxx() function to get it)
|
||||
* @param extracss Add a CSS style to td tags
|
||||
* @param notabs Do not include table and tr tags
|
||||
* @param incbefore Include code before the text
|
||||
* @param noencodehtmltext Do not encode into html entity the htmltext
|
||||
* @return string Code html du tooltip (texte+picto)
|
||||
* @see Use function textwithpicto if you can.
|
||||
*/
|
||||
function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$extracss='',$notabs=0,$incbefore='',$noencodehtmltext=0)
|
||||
function textwithtooltip($text,$htmltext,$tooltipon=1,$direction=0,$img='',$extracss='',$notabs=0,$incbefore='')
|
||||
{
|
||||
global $conf;
|
||||
|
||||
@ -161,7 +160,7 @@ class Form
|
||||
$htmltext=str_replace("\n","",$htmltext);
|
||||
|
||||
$htmltext=str_replace('"',""",$htmltext);
|
||||
$paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext,1)).'"'; // Attribut to put on td img tag to store tooltip
|
||||
$paramfortooltipimg=' class="classfortooltip'.($extracss?' '.$extracss:'').'" title="'.dol_escape_htmltag($htmltext,1).'"'; // Attribut to put on td img tag to store tooltip
|
||||
$paramfortooltiptd =($extracss?' class="'.$extracss.'"':''); // Attribut to put on td text tag
|
||||
|
||||
$s="";
|
||||
@ -198,10 +197,9 @@ class Form
|
||||
* @param direction 1=Icon is after text, -1=Icon is before text
|
||||
* @param type Type of picto (info, help, warning, superadmin...)
|
||||
* @param extracss Add a CSS style to td tags
|
||||
* @param noencodehtmltext Do not encode into html entity the htmltext
|
||||
* @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='')
|
||||
{
|
||||
global $conf;
|
||||
|
||||
@ -227,7 +225,7 @@ class Form
|
||||
// Warnings
|
||||
if ($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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* \ingroup societe
|
||||
* \brief File of class to build ODT documents for third parties
|
||||
* \author Laurent Destailleur
|
||||
* \version $Id: doc_generic_invoice_odt.modules.php,v 1.19 2011/07/21 22:54:36 eldy Exp $
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
require_once(DOL_DOCUMENT_ROOT."/includes/modules/facture/modules_facture.php");
|
||||
@ -196,9 +196,37 @@ class doc_generic_invoice_odt extends ModelePDFFactures
|
||||
$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
|
||||
// Add list of substitution keys
|
||||
$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
|
||||
$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
|
||||
/*$dummy=new User($db);
|
||||
$tmparray=$this->get_substitutionarray_user($dummy,$langs);
|
||||
$nb=0;
|
||||
foreach($tmparray as $key => $val)
|
||||
{
|
||||
$texthelp.='{'.$key.'}<br>';
|
||||
$nb++;
|
||||
if ($nb >= 5) { $texthelp.='...<br>'; break; }
|
||||
}
|
||||
$dummy=new Societe($db);
|
||||
$tmparray=$this->get_substitutionarray_mysoc($dummy,$langs);
|
||||
$nb=0;
|
||||
foreach($tmparray as $key => $val)
|
||||
{
|
||||
$texthelp.='{'.$key.'}<br>';
|
||||
$nb++;
|
||||
if ($nb >= 5) { $texthelp.='...<br>'; break; }
|
||||
}
|
||||
$tmparray=$this->get_substitutionarray_thirdparty($dummy,$langs);
|
||||
$nb=0;
|
||||
foreach($tmparray as $key => $val)
|
||||
{
|
||||
$texthelp.='{'.$key.'}<br>';
|
||||
$nb++;
|
||||
if ($nb >= 5) { $texthelp.='...<br>'; break; }
|
||||
}*/
|
||||
$texthelp.=$langs->trans("FullListOnOnlineDocumentation");
|
||||
|
||||
$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help');
|
||||
//var_dump($listofdir);
|
||||
|
||||
$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
|
||||
$texte.= '<table><tr><td>';
|
||||
$texte.= '<textarea class="flat" cols="60" name="value1">';
|
||||
$texte.=$conf->global->FACTURE_ADDON_PDF_ODT_PATH;
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
* \ingroup societe
|
||||
* \brief File of class to build ODT documents for third parties
|
||||
* \author Laurent Destailleur
|
||||
* \version $Id: doc_generic_odt.modules.php,v 1.32 2011/07/21 22:54:35 eldy Exp $
|
||||
* \version $Id$
|
||||
*/
|
||||
|
||||
require_once(DOL_DOCUMENT_ROOT."/includes/modules/societe/modules_societe.class.php");
|
||||
@ -115,9 +115,37 @@ class doc_generic_odt extends ModeleThirdPartyDoc
|
||||
$texthelp=$langs->trans("ListOfDirectoriesForModelGenODT");
|
||||
// Add list of substitution keys
|
||||
$texthelp.='<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
|
||||
$texthelp.=$langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
|
||||
/*$dummy=new User($db);
|
||||
$tmparray=$this->get_substitutionarray_user($dummy,$langs);
|
||||
$nb=0;
|
||||
foreach($tmparray as $key => $val)
|
||||
{
|
||||
$texthelp.='{'.$key.'}<br>';
|
||||
$nb++;
|
||||
if ($nb >= 5) { $texthelp.='...<br>'; break; }
|
||||
}
|
||||
$dummy=new Societe($db);
|
||||
$tmparray=$this->get_substitutionarray_mysoc($dummy,$langs);
|
||||
$nb=0;
|
||||
foreach($tmparray as $key => $val)
|
||||
{
|
||||
$texthelp.='{'.$key.'}<br>';
|
||||
$nb++;
|
||||
if ($nb >= 5) { $texthelp.='...<br>'; break; }
|
||||
}
|
||||
$tmparray=$this->get_substitutionarray_thirdparty($dummy,$langs);
|
||||
$nb=0;
|
||||
foreach($tmparray as $key => $val)
|
||||
{
|
||||
$texthelp.='{'.$key.'}<br>';
|
||||
$nb++;
|
||||
if ($nb >= 5) { $texthelp.='...<br>'; break; }
|
||||
}*/
|
||||
$texthelp.=$langs->trans("FullListOnOnlineDocumentation");
|
||||
|
||||
$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help');
|
||||
//var_dump($listofdir);
|
||||
|
||||
$texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1);
|
||||
$texte.= '<table><tr><td>';
|
||||
$texte.= '<textarea class="flat" cols="60" name="value1">';
|
||||
$texte.=$conf->global->COMPANY_ADDON_PDF_ODT_PATH;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user