From 0f8e968276371b549062bcd3fe7cf383a87c8019 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 21 Jul 2011 22:54:35 +0000 Subject: [PATCH] Fix: Link --- build/deb/dolibarr.desktop | 4 +-- build/rpm/dolibarr.desktop | 2 +- htdocs/comm/action/index.php | 35 ++++++++++--------- htdocs/core/class/html.form.class.php | 14 ++++---- .../install/mysql/migration/3.0.0-3.1.0.sql | 4 +-- htdocs/lib/agenda.lib.php | 14 ++++---- 6 files changed, 36 insertions(+), 37 deletions(-) diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index a48e5048dff..ec209a86deb 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -9,9 +9,9 @@ Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or Comment[fr]=L'ERP & CRM simple pour la gestion des PME et associations # Command to open an URL # For Fedora: xdg-open -# For Debian/Ubuntu: xdg-open or x-www-browser +# For Debian/Ubuntu: x-www-browser # (exo-open for xfde, gnome-open for gnome, ...) -Exec=xdg-open http://localhost/dolibarr +Exec=x-www-browser http://localhost/dolibarr Icon=dolibarr Terminal=false Type=Application diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 33fadf7624f..ab2a758867f 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -13,7 +13,7 @@ Comment[it]=Programma gestionale open source e gratuito per piccole e medie impr Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open -# For Debian/Ubuntu: xdg-open or x-www-browser +# For Debian/Ubuntu: x-www-browser # (exo-open for xfde, gnome-open for gnome, ...) Exec=xdg-open http://localhost/dolibarr Icon=dolibarr 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/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql index 70ce4611860..bad27534494 100755 --- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql +++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql @@ -1,5 +1,5 @@ -- --- $Id: 3.0.0-3.1.0.sql,v 1.80 2011/07/22 13:46:34 eldy Exp $ +-- $Id: 3.0.0-3.1.0.sql,v 1.79 2011/07/12 22:12:12 eldy Exp $ -- -- Be carefull to requests order. -- This file must be loaded by calling /install/index.php page @@ -124,9 +124,7 @@ ALTER TABLE llx_usergroup_user DROP INDEX fk_user; ALTER TABLE llx_usergroup_user DROP INDEX uk_user_group_entity; ALTER TABLE llx_usergroup_user ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid; ALTER TABLE llx_usergroup_user ADD UNIQUE INDEX uk_usergroup_user (entity,fk_user,fk_usergroup); --- V4.1 DELETE FROM llx_usergroup_user WHERE fk_user NOT IN (SELECT rowid from llx_user); ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_user FOREIGN KEY (fk_user) REFERENCES llx_user (rowid); --- V4.1 DELETE FROM llx_usergroup_user WHERE fk_usergroup NOT IN (SELECT rowid from llx_usergroup); ALTER TABLE llx_usergroup_user ADD CONSTRAINT fk_usergroup_user_fk_usergroup FOREIGN KEY (fk_usergroup) REFERENCES llx_usergroup (rowid); ALTER TABLE llx_commande ADD COLUMN ref_int varchar(30) AFTER ref_ext; diff --git a/htdocs/lib/agenda.lib.php b/htdocs/lib/agenda.lib.php index d47b327541d..91a96d0e6e2 100644 --- a/htdocs/lib/agenda.lib.php +++ b/htdocs/lib/agenda.lib.php @@ -22,7 +22,7 @@ /** * \file htdocs/lib/agenda.lib.php * \brief Set of function for the agenda module - * \version $Id: agenda.lib.php,v 1.42 2011/07/22 06:51:30 simnandez Exp $ + * \version $Id$ */ @@ -324,11 +324,13 @@ function agenda_prepare_head() $head[$h][2] = 'xcal'; $h++; - $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php"; - $head[$h][1] = $langs->trans("ExtSites"); - $head[$h][2] = 'extsites'; - $h++; - + if ($conf->global->MAIN_FEATURES_LEVEL >= 2) // In dev version only for the moment + { + $head[$h][0] = DOL_URL_ROOT."/admin/agenda_extsites.php"; + $head[$h][1] = $langs->trans("ExtSites"); + $head[$h][2] = 'extsites'; + $h++; + } return $head; }