From a94a951a8948557379ea4fe9a5d7307d32117516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?= Date: Fri, 3 Feb 2017 19:38:33 +0100 Subject: [PATCH] Little improvements to admin pages where a FREE_TEXT or a watermark constant was set --- htdocs/admin/commande.php | 8 +- htdocs/admin/contract.php | 8 +- htdocs/admin/facture.php | 10 +- htdocs/admin/fichinter.php | 8 +- htdocs/admin/propal.php | 8 +- htdocs/admin/supplier_order.php | 4 +- htdocs/admin/supplier_proposal.php | 8 +- htdocs/don/admin/donation.php | 289 +++++++++++++++-------------- 8 files changed, 172 insertions(+), 171 deletions(-) diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index c2f8cf2d4d6..23773e722c4 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -569,8 +569,8 @@ $var=! $var; print '
'; print ''; print ''; -print ''; -print $langs->trans("FreeLegalTextOnOrders").' ('.$langs->trans("AddCRIfTooLong").')
'; +print ''; +print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).''; $variablename='ORDER_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { @@ -592,8 +592,8 @@ $var=!$var; print ""; print ''; print ""; -print ''; -print $langs->trans("WatermarkOnDraftOrders").'
'; +print ''; +print $langs->trans("WatermarkOnDraftOrders").''; print ''; print ''; print ''; diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index acfe7de156f..98b83f61b8e 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -503,8 +503,8 @@ print "\n"; $var=true; $var=! $var; -print ''; -print $langs->trans("FreeLegalTextOnContracts").' ('.$langs->trans("AddCRIfTooLong").')
'; +print ''; +print $langs->trans("FreeLegalTextOnContracts").' '.img_info($langs->trans("AddCRIfTooLong")).''; $variablename='CONTRACT_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { @@ -520,8 +520,8 @@ print ''."\n"; //Use draft Watermark $var=!$var; -print ''; -print $langs->trans("WatermarkOnDraftContractCards").'
'; +print ''; +print $langs->trans("WatermarkOnDraftContractCards").''; print ''; print ''."\n"; diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 21ddabc1b65..6488ed5499b 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -737,8 +737,8 @@ $var=! $var; print ''; print ''; print ''; -print ''; -print $langs->trans("FreeLegalTextOnInvoices").' ('.$langs->trans("AddCRIfTooLong").')
'; +print ''; +print $langs->trans("FreeLegalTextOnInvoices").' '.img_info($langs->trans("AddCRIfTooLong")).''; $variablename='INVOICE_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { @@ -759,9 +759,9 @@ $var=!$var; print ''; print ''; print ''; -print ''; -print $langs->trans("WatermarkOnDraftBill").'
'; -print ''; +print ''; +print $langs->trans("WatermarkOnDraftBill").''; +print ''; print ''; print ''; print "\n"; diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index a67407b818c..509426f9969 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -538,8 +538,8 @@ $var=! $var; print ''; print ''; print ''; -print ''; -print $langs->trans("FreeLegalTextOnInterventions").' ('.$langs->trans("AddCRIfTooLong").')
'; +print ''; +print $langs->trans("FreeLegalTextOnInterventions").' '.img_info($langs->trans("AddCRIfTooLong")).''; $variablename='FICHINTER_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { @@ -561,8 +561,8 @@ $var=!$var; print ""; print ''; print ""; -print ''; -print $langs->trans("WatermarkOnDraftInterventionCards").'
'; +print ''; +print $langs->trans("WatermarkOnDraftInterventionCards").''; print ''; print ''; print ''; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 57c5560a185..86b52f9852d 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -576,8 +576,8 @@ $var=! $var; print ''; print ''; print ''; -print ''; -print $langs->trans("FreeLegalTextOnProposal").' ('.$langs->trans("AddCRIfTooLong").')
'; +print ''; +print $langs->trans("FreeLegalTextOnProposal").' '.img_info($langs->trans("AddCRIfTooLong")).''; $variablename='PROPOSAL_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { @@ -598,8 +598,8 @@ $var=!$var; print ""; print ''; print ""; -print ''; -print $langs->trans("WatermarkOnDraftProposal").'
'; +print ''; +print $langs->trans("WatermarkOnDraftProposal").''; print ''; print ''; print ''; diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index 5c288b9e78a..b117795efa1 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -536,8 +536,8 @@ else } */ -print ''; -print $langs->trans("FreeLegalTextOnOrders").' ('.$langs->trans("AddCRIfTooLong").')
'; +print ''; +print $langs->trans("FreeLegalTextOnOrders").' '.img_info($langs->trans("AddCRIfTooLong")).''; $variablename='SUPPLIER_ORDER_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php index 069c90ead8a..8bd034bef48 100644 --- a/htdocs/admin/supplier_proposal.php +++ b/htdocs/admin/supplier_proposal.php @@ -527,8 +527,8 @@ $var=! $var; print ''; print ''; print ''; -print ''; -print $langs->trans("FreeLegalTextOnSupplierProposal").' ('.$langs->trans("AddCRIfTooLong").')
'; +print ''; +print $langs->trans("FreeLegalTextOnSupplierProposal").' '.img_info($langs->trans("AddCRIfTooLong")).''; $variablename='SUPPLIER_PROPOSAL_FREE_TEXT'; if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { @@ -549,8 +549,8 @@ $var=!$var; print ""; print ''; print ""; -print ''; -print $langs->trans("WatermarkOnDraftSupplierProposal").'
'; +print ''; +print $langs->trans("WatermarkOnDraftSupplierProposal").''; print ''; print ''; print ''; diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php index b6043539c0d..29dc50bf7e1 100644 --- a/htdocs/don/admin/donation.php +++ b/htdocs/don/admin/donation.php @@ -209,15 +209,149 @@ $head = donation_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("Donations"), 0, 'payment'); -/* - * Params - */ -print load_fiche_titre($langs->trans("Options")); + +// Document templates +print load_fiche_titre($langs->trans("DonationsModels"), '', ''); + +// Defined the template definition table +$type='donation'; +$def = array(); +$sql = "SELECT nom"; +$sql.= " FROM ".MAIN_DB_PREFIX."document_model"; +$sql.= " WHERE type = '".$type."'"; +$resql=$db->query($sql); +if ($resql) +{ + $i = 0; + $num_rows=$db->num_rows($resql); + while ($i < $num_rows) + { + $array = $db->fetch_array($resql); + array_push($def, $array[0]); + $i++; + } +} +else +{ + dol_print_error($db); +} print ''; print ''; -print ''; -//print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print ''; +print "\n"; + +clearstatcache(); + +$handle=opendir($dir); + +$var=True; +if (is_resource($handle)) +{ + while (($file = readdir($handle))!==false) + { + if (preg_match('/\.modules\.php$/i',$file)) + { + $var = !$var; + $name = substr($file, 0, dol_strlen($file) -12); + $classname = substr($file, 0, dol_strlen($file) -12); + + require_once $dir.'/'.$file; + $module=new $classname($db); + + // Show modules according to features level + if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue; + if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; + + if ($module->isEnabled()) + { + print ''; + print ''; + + // Active + if (in_array($name, $def)) + { + if ($conf->global->DON_ADDON_MODEL == $name) + { + print "'; + } + else + { + print "'; + } + } + else + { + print ""; + } + + // Default + if ($conf->global->DON_ADDON_MODEL == "$name") + { + print "'; + } + else + { + print "'; + } + + // Info + $htmltooltip = ''.$langs->trans("Name").': '.$module->name; + $htmltooltip.='
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); + if ($module->type == 'pdf') + { + $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; + } + $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; + $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); + $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); + print ''; + + // Preview + print ''; + + print "\n"; + } + } + } + closedir($handle); +} + +print '
'.$langs->trans("Parameters").' '.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Activated").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'; + echo $module->name; + print ''; + print $module->description; + print '\n"; + print img_picto($langs->trans("Enabled"),'switch_on'); + print '\n"; + print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"),'switch_on').''; + print '\n"; + print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').''; + print ""; + print img_picto($langs->trans("Default"),'on'); + print '"; + print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').''; + print ''; + print $form->textwithpicto('',$htmltooltip,-1,0); + print ''; + print ''.img_object($langs->trans("Preview"),'generic').''; + print '

'; + +/* + * Params + */ +print load_fiche_titre($langs->trans("Options"), '', ''); + +print ''; +print ''; +print ''; +print '\n"; +print ''; print "\n"; $var=true; @@ -228,7 +362,7 @@ print ''; -print ''; print '\n"; @@ -266,7 +400,7 @@ print ''; if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) { print '
'; - print load_fiche_titre($langs->trans("FrenchOptions")); + print load_fiche_titre($langs->trans("FrenchOptions"), '', ''); print '
'.$langs->trans("Parameters").''.$langs->trans("Value")."
'; +print ''; $label = $langs->trans("AccountAccounting"); print ''; @@ -250,9 +384,9 @@ print ''; print ''; $var=! $var; -print '
'; -print $langs->trans("FreeTextOnDonations").'
'; -print ''; +print '
'; +print $langs->trans("FreeTextOnDonations").' '.img_info($langs->trans("AddCRIfTooLong")).''; +print ''; print ''; print ''; print "
'; print ''; @@ -317,139 +451,6 @@ if (preg_match('/fr/i',$conf->global->MAIN_INFO_SOCIETE_COUNTRY)) print "
\n"; } -// Document templates -print '
'; -print load_fiche_titre($langs->trans("DonationsModels")); - -// Defined the template definition table -$type='donation'; -$def = array(); -$sql = "SELECT nom"; -$sql.= " FROM ".MAIN_DB_PREFIX."document_model"; -$sql.= " WHERE type = '".$type."'"; -$resql=$db->query($sql); -if ($resql) -{ - $i = 0; - $num_rows=$db->num_rows($resql); - while ($i < $num_rows) - { - $array = $db->fetch_array($resql); - array_push($def, $array[0]); - $i++; - } -} -else -{ - dol_print_error($db); -} - -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print "\n"; - -clearstatcache(); - -$handle=opendir($dir); - -$var=True; -if (is_resource($handle)) -{ - while (($file = readdir($handle))!==false) - { - if (preg_match('/\.modules\.php$/i',$file)) - { - $var = !$var; - $name = substr($file, 0, dol_strlen($file) -12); - $classname = substr($file, 0, dol_strlen($file) -12); - - require_once $dir.'/'.$file; - $module=new $classname($db); - - // Show modules according to features level - if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue; - if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue; - - if ($module->isEnabled()) - { - print ''; - print ''; - - // Active - if (in_array($name, $def)) - { - if ($conf->global->DON_ADDON_MODEL == $name) - { - print "'; - } - else - { - print "'; - } - } - else - { - print ""; - } - - // Default - if ($conf->global->DON_ADDON_MODEL == "$name") - { - print "'; - } - else - { - print "'; - } - - // Info - $htmltooltip = ''.$langs->trans("Name").': '.$module->name; - $htmltooltip.='
'.$langs->trans("Type").': '.($module->type?$module->type:$langs->trans("Unknown")); - if ($module->type == 'pdf') - { - $htmltooltip.='
'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur; - } - $htmltooltip.='

'.$langs->trans("FeaturesSupported").':'; - $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); - $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); - print ''; - - // Preview - print ''; - - print "\n"; - } - } - } - closedir($handle); -} - -print '
'.$langs->trans("Name").''.$langs->trans("Description").''.$langs->trans("Activated").''.$langs->trans("Default").''.$langs->trans("ShortInfo").''.$langs->trans("Preview").'
'; - echo $module->name; - print ''; - print $module->description; - print '\n"; - print img_picto($langs->trans("Enabled"),'switch_on'); - print '\n"; - print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Enabled"),'switch_on').''; - print '\n"; - print 'scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"),'switch_off').''; - print ""; - print img_picto($langs->trans("Default"),'on'); - print '"; - print 'scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"),'off').''; - print ''; - print $form->textwithpicto('',$htmltooltip,-1,0); - print ''; - print ''.img_object($langs->trans("Preview"),'generic').''; - print '
'; - llxFooter(); $db->close();