Generalize option MAIN_HTML_TITLE for all tabs of thirdparty.

This commit is contained in:
Laurent Destailleur 2015-03-12 17:29:52 +01:00
parent e8e2f65ae5
commit 59cbde042c
6 changed files with 26 additions and 13 deletions

View File

@ -235,7 +235,9 @@ if ($socid)
$soc = new Societe($db); $soc = new Societe($db);
$result = $soc->fetch($socid); $result = $soc->fetch($socid);
llxHeader("","",$langs->trans("Category")); $title=$langs->trans("Category");
if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$soc->name." - ".$title;
llxHeader("",$title);
// Show tabs // Show tabs
$head = societe_prepare_head($soc); $head = societe_prepare_head($soc);

View File

@ -69,7 +69,10 @@ if ($socid)
$object = new Societe($db); $object = new Societe($db);
$result = $object->fetch($socid); $result = $object->fetch($socid);
llxHeader("",$langs->trans("Agenda"),'');
$title=$langs->trans("Agenda");
if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
llxHeader('',$title);
if (! empty($conf->notification->enabled)) $langs->load("mails"); if (! empty($conf->notification->enabled)) $langs->load("mails");
$head = societe_prepare_head($object); $head = societe_prepare_head($object);

View File

@ -98,8 +98,10 @@ $form = new Form($db);
$formother = new FormOther($db); $formother = new FormOther($db);
$productstatic=new Product($db); $productstatic=new Product($db);
$titre = $langs->trans("Referer",$object->name); $title = $langs->trans("Referer",$object->name);
llxHeader('',$titre,''); if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$title,$help_url);
if (empty($socid)) if (empty($socid))
{ {

View File

@ -82,8 +82,10 @@ include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php
$form = new Form($db); $form = new Form($db);
$title=$langs->trans("ThirdParty").' - '.$langs->trans("Files");
if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Files");
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas'; $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty").' - '.$langs->trans("Files"),$help_url); llxHeader('',$title,$help_url);
if ($object->id) if ($object->id)
{ {

View File

@ -56,16 +56,16 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
* View * View
*/ */
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty"),$help_url);
$object = new Societe($db); $object = new Societe($db);
$object->fetch($socid); $object->fetch($socid);
$object->info($socid); $object->info($socid);
/* $title=$langs->trans("ThirdParty");
* Affichage onglets if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Info");
*/ $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$title,$help_url);
$head = societe_prepare_head($object); $head = societe_prepare_head($object);
dol_fiche_head($head, 'info', $langs->trans("ThirdParty"),0,'company'); dol_fiche_head($head, 'info', $langs->trans("ThirdParty"),0,'company');

View File

@ -123,11 +123,15 @@ if ($action == 'delete')
$form = new Form($db); $form = new Form($db);
llxHeader();
$object = new Societe($db); $object = new Societe($db);
$result=$object->fetch($socid); $result=$object->fetch($socid);
$title=$langs->trans("ThirdParty").' - '.$langs->trans("Notification");
if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notification");
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$title,$help_url);
if ($result > 0) if ($result > 0)
{ {
$langs->load("other"); $langs->load("other");