diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 0c1b5eb017935273ac9e362b88b64d9ad635b55b..0b55e2cc81479f88cd02fe960fc1e7e1354cea87 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -418,6 +418,9 @@ class Conf // By default, suppliers objects can be linked to all projects $this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1; + // MAIN_HTML_TITLE + if (! isset($conf->global->MAIN_HTML_TITLE)) $conf->global->MAIN_HTML_TITLE='noapp,thirdpartynameonly,contactnameonly,projectnameonly'; + // conf->liste_limit = constante de taille maximale des listes if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT=25; $this->liste_limit=$this->global->MAIN_SIZE_LISTE_LIMIT; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index c6d32ac2ea31fd722446d32f7241f723ebf19b20..b27f6965e86863b78292fddf2de9364482752123 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1018,7 +1018,7 @@ class Form // Do not use textempty = ' ' or ' ' here, or search on key will search on ' key'. //$textifempty=' '; //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty=''; - if (! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $textifempty.=$langs->trans("NoFilter"); + if (! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $textifempty.=$langs->trans("All"); if ($showempty) $out.= '<option value="-1">'.$textifempty.'</option>'."\n"; $num = $this->db->num_rows($resql); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 6ecdb43ec515ec32d6b60e20127da05cab7083aa..8dc0b65da2b8e04b7591e4bfa3ef1665cc722ae8 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1010,7 +1010,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE; if ($title && ! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/',$conf->global->MAIN_HTML_TITLE)) print '<title>'.dol_htmlentities($title).'</title>'; - if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>'; + else if ($title) print '<title>'.dol_htmlentities($appli.' - '.$title).'</title>'; else print "<title>".dol_htmlentities($appli)."</title>"; print "\n"; diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 66baf0c650d6b7a8a2d767f88b4021bd6f3b951c..e862f0be5ecfc7fcff0785766a68aaf8b124ba51 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -398,8 +398,8 @@ $formfile = new FormFile($db); $formproject = new FormProjets($db); $userstatic = new User($db); -$title=$langs->trans("Project").' - '.$object->ref.' '.$object->name; -if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->ref.' '.$object->name; +$title=$langs->trans("Project").' - '.$object->ref.($object->thirdparty->name?' - '.$object->thirdparty->name:'').($object->title?' - '.$object->title:''); +if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/',$conf->global->MAIN_HTML_TITLE)) $title=$object->ref.($object->thirdparty->name?' - '.$object->thirdparty->name:'').($object->title?' - '.$object->title:''); $help_url="EN:Module_Projects|FR:Module_Projets|ES:Módulo_Proyectos"; llxHeader("",$title,$help_url); @@ -660,7 +660,7 @@ else print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>'; $filteronlist=''; if (! empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) $filteronlist=$conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST; - $text=$form->select_thirdparty_list($object->thirdparty->id,'socid',$filteronlist,1,1); + $text=$form->select_thirdparty_list($object->thirdparty->id, 'socid', $filteronlist, 1, 1); $texthelp=$langs->trans("IfNeedToUseOhterObjectKeepEmpty"); print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1, 0, '', '', 2); print '</td></tr>';