diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 05e52bded62..08e7d071cab 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -24,7 +24,7 @@ * \file htdocs/comm/action/index.php * \ingroup agenda * \brief Home page of calendar events - * \version $Id: index.php,v 1.183 2011/07/22 06:51:31 simnandez Exp $ + * \version $Id$ */ require("../../main.inc.php"); @@ -487,23 +487,24 @@ if ($showbirthday) //Exernal Calendars $listofextcals=array(); - -if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0) +if ($conf->global->MAIN_FEATURES_LEVEL>=2) { - $i=0; - while($i < $conf->global->AGENDA_EXT_NB) - { - $i++; - $paramkey='AGENDA_EXT_SRC'.$i; - $url=$conf->global->$paramkey; - $paramkey='AGENDA_EXT_NAME'.$i; - $namecal = $conf->global->$paramkey; - $paramkey='AGENDA_EXT_COLOR'.$i; - $colorcal = $conf->global->$paramkey; - if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal); - } + if (empty($conf->global->AGENDA_DISABLE_EXT) && $conf->global->AGENDA_EXT_NB > 0) + { + $i=0; + while($i < $conf->global->AGENDA_EXT_NB) + { + $i++; + $paramkey='AGENDA_EXT_SRC'.$i; + $url=$conf->global->$paramkey; + $paramkey='AGENDA_EXT_NAME'.$i; + $namecal = $conf->global->$paramkey; + $paramkey='AGENDA_EXT_COLOR'.$i; + $colorcal = $conf->global->$paramkey; + if ($url && $namecal) $listofextcals[]=array('src'=>$url,'name'=>$namecal,'color'=>$colorcal); + } + } } - if (sizeof($listofextcals)) { require_once(DOL_DOCUMENT_ROOT."/comm/action/class/ical.class.php"); @@ -786,7 +787,7 @@ $("#actionagenda_vcal_link").attr("href","/public/agenda/agendaexport.php?format '; */ -llxFooter('$Date: 2011/07/22 06:51:31 $ - $Revision: 1.183 $'); +llxFooter('$Date$ - $Revision$'); /** diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 9bb44f40588..0b45de0569c 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -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); } /** diff --git a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php index e42ecd75db5..a6536023b1e 100644 --- a/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php +++ b/htdocs/includes/modules/facture/doc/doc_generic_invoice_odt.modules.php @@ -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.='
'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'
'; - $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.'}
'; + $nb++; + if ($nb >= 5) { $texthelp.='...
'; break; } + } + $dummy=new Societe($db); + $tmparray=$this->get_substitutionarray_mysoc($dummy,$langs); + $nb=0; + foreach($tmparray as $key => $val) + { + $texthelp.='{'.$key.'}
'; + $nb++; + if ($nb >= 5) { $texthelp.='...
'; break; } + } + $tmparray=$this->get_substitutionarray_thirdparty($dummy,$langs); + $nb=0; + foreach($tmparray as $key => $val) + { + $texthelp.='{'.$key.'}
'; + $nb++; + if ($nb >= 5) { $texthelp.='...
'; break; } + }*/ + $texthelp.=$langs->trans("FullListOnOnlineDocumentation"); + + $texte.= $form->textwithpicto($texttitle,$texthelp,1,'help'); + //var_dump($listofdir); - $texte.= $form->textwithpicto($texttitle,$texthelp,1,'help','',1); $texte.= '
'; $texte.= '