From dff7d00d2bd5c49bae6c33274b1d2d35c8456144 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 18 May 2017 13:13:18 +0200
Subject: [PATCH] Look and feel v6
---
htdocs/admin/contract.php | 11 ++++++-----
htdocs/contrat/admin/contract_extrafields.php | 3 +--
htdocs/contrat/admin/contractdet_extrafields.php | 3 +--
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index ddd8c6f1c00..37c0b9bccde 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -216,11 +216,9 @@ $form=new Form($db);
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
-print "<br>";
-
$head=contract_admin_prepare_head();
-dol_fiche_head($head, 'contract', $langs->trans("Contracts"), 0, 'contract');
+dol_fiche_head($head, 'contract', $langs->trans("Contracts"), -1, 'contract');
/*
* Contracts Numbering model
@@ -510,7 +508,9 @@ $htmltext.='</i>';
$var=! $var;
print '<tr class="oddeven"><td colspan="2">';
-print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext).'<br>';
+//print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
+print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2);
+print '<br>';
$variablename='CONTRACT_FREE_TEXT';
if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
{
@@ -527,7 +527,8 @@ print '</td></tr>'."\n";
//Use draft Watermark
print '<tr class="oddeven"><td>';
-print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext);
+//print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2, 'tooltiphelp');
+print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2);
print '</td><td>';
print '<input size="50" class="flat" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
print '</td></tr>'."\n";
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index a5a86efaad9..509c5307ef8 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -69,10 +69,9 @@ llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
-print '<br>';
$head=contract_admin_prepare_head();
-dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), 0, 'contract');
+dol_fiche_head($head, 'attributes', $langs->trans("Contracts"), -1, 'contract');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index 8014334c008..39c691e7ddc 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -69,10 +69,9 @@ llxHeader();
$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
print load_fiche_titre($langs->trans("ContractsSetup"),$linkback,'title_setup');
-print '<br>';
$head=contract_admin_prepare_head();
-dol_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), 0, 'contract');
+dol_fiche_head($head, 'attributeslines', $langs->trans("Contracts"), -1, 'contract');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
--
GitLab