From bc395b247aa46c5b42410b3aab95ca1bf416c73e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 16 Feb 2019 08:00:16 +0100 Subject: [PATCH 1/2] fix html5 in variant --- htdocs/variants/admin/admin.php | 14 +++++++------- htdocs/variants/card.php | 4 ++-- .../class/ProductCombination2ValuePair.class.php | 12 ++++++------ htdocs/variants/combinations.php | 12 ++++++------ htdocs/variants/create.php | 2 +- htdocs/variants/list.php | 12 ++++++------ 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/htdocs/variants/admin/admin.php b/htdocs/variants/admin/admin.php index fe28e73fcaa..9a9d67f5ffc 100644 --- a/htdocs/variants/admin/admin.php +++ b/htdocs/variants/admin/admin.php @@ -52,22 +52,22 @@ print load_fiche_titre($title, $linkback, 'title_setup'); dol_fiche_head(array(), 'general', $tab, 0, 'product'); print '
'; -print ''; +print '
'; print ''; -print ''."\n"; -print ''."\n"; -print ''."\n"; +print ''."\n"; print ''; print ''; -if(isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) { +if (isset($conf->global->PRODUIT_ATTRIBUTES_SEPARATOR)) { $separator = $conf->global->PRODUIT_ATTRIBUTES_SEPARATOR; } else { $separator = "_"; } -print ''; +print ''; print '
'.$langs->trans("Parameters").''.$langs->trans("Value").' 
'.$langs->trans("Parameters").''."\n"; +print ''.$langs->trans("Value").''."\n"; +print ' 
'.$langs->trans('HideProductCombinations').''; print $form->selectyesno("PRODUIT_ATTRIBUTES_HIDECHILD", $conf->global->PRODUIT_ATTRIBUTES_HIDECHILD, 1).'
'.$langs->trans('CombinationsSeparator').'
'; -print '
'; +print '
'; print '
'; // End of page diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php index fa45b1ad0ef..e7444ed5fb8 100644 --- a/htdocs/variants/card.php +++ b/htdocs/variants/card.php @@ -266,7 +266,7 @@ print $form->formconfirm( id)): ?> - +     @@ -274,7 +274,7 @@ print $form->formconfirm( ref) ?> value) ?> - + diff --git a/htdocs/variants/class/ProductCombination2ValuePair.class.php b/htdocs/variants/class/ProductCombination2ValuePair.class.php index e07ba6077e7..80246cbe1dd 100644 --- a/htdocs/variants/class/ProductCombination2ValuePair.class.php +++ b/htdocs/variants/class/ProductCombination2ValuePair.class.php @@ -111,12 +111,12 @@ class ProductCombination2ValuePair public function fetchByFkCombination($fk_combination) { $sql = "SELECT - c.rowid, - c2v.fk_prod_attr_val, - c2v.fk_prod_attr, - c2v.fk_prod_combination -FROM ".MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr -WHERE c2v.fk_prod_combination = ".(int) $fk_combination; + c.rowid, + c2v.fk_prod_attr_val, + c2v.fk_prod_attr, + c2v.fk_prod_combination + FROM ".MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr + WHERE c2v.fk_prod_combination = ".(int) $fk_combination; $sql .= $this->db->order('c.rang', 'asc'); diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php index 8c5b80b4cc9..5d8f0fe11ce 100644 --- a/htdocs/variants/combinations.php +++ b/htdocs/variants/combinations.php @@ -502,9 +502,9 @@ if (! empty($id) || ! empty($ref)) print ''; print ''."\n"; print ''."\n"; - if($valueid > 0) { - print ''."\n"; - } + if($valueid > 0) { + print ''."\n"; + } print dol_fiche_head(); @@ -641,7 +641,7 @@ if (! empty($id) || ! empty($ref)) } } elseif ($action === 'copy') { -print $form->formconfirm( + print $form->formconfirm( 'combinations.php?id='.$id, $langs->trans('CloneCombinationsProduct'), $langs->trans('ConfirmCloneProductCombinations'), @@ -795,8 +795,8 @@ print $form->formconfirm( variation_price >= 0 ? '+' : '').price($currcomb->variation_price).($currcomb->variation_price_percentage ? ' %' : '') ?> isProduct()) print ''.($currcomb->variation_weight >= 0 ? '+' : '').price($currcomb->variation_weight).' '.measuring_units_string($prodstatic->weight_units, 'weight').''; ?> - getLibStatut(2, 0) ?> - getLibStatut(2, 1) ?> + getLibStatut(2, 0) ?> + getLibStatut(2, 1) ?> diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php index 4f2d53bb75f..59edd15d8c6 100644 --- a/htdocs/variants/create.php +++ b/htdocs/variants/create.php @@ -77,7 +77,7 @@ print ''; ?> - +
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php index f230923be7f..481640d0daa 100644 --- a/htdocs/variants/list.php +++ b/htdocs/variants/list.php @@ -116,17 +116,17 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1; - - + + $attribute): ?> - - - + + @@ -151,4 +151,4 @@ $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1; // End of page llxFooter(); -$db->close(); \ No newline at end of file +$db->close(); From 0255336549b4545f8569f9cc00a8561eb23cc277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Sat, 16 Feb 2019 10:29:15 +0100 Subject: [PATCH 2/2] fix html5 user --- htdocs/core/tpl/admin_extrafields_add.tpl.php | 2 +- .../core/tpl/admin_extrafields_edit.tpl.php | 2 +- .../core/tpl/admin_extrafields_view.tpl.php | 28 +++--- htdocs/core/tpl/advtarget.tpl.php | 46 +++++++--- htdocs/user/agenda_extsites.php | 5 +- htdocs/user/bank.php | 88 +++++++++---------- htdocs/user/card.php | 22 ++--- htdocs/user/clicktodial.php | 6 +- htdocs/user/document.php | 2 +- htdocs/user/group/card.php | 28 +++--- htdocs/user/group/ldap.php | 9 +- htdocs/user/group/list.php | 25 +++--- htdocs/user/group/perms.php | 18 ++-- htdocs/user/hierarchy.php | 11 ++- htdocs/user/home.php | 14 +-- htdocs/user/ldap.php | 4 +- htdocs/user/list.php | 58 ++++++------ htdocs/user/notify/card.php | 8 +- htdocs/user/param_ihm.php | 4 +- htdocs/user/passwordforgotten.php | 6 +- htdocs/user/perms.php | 22 ++--- 21 files changed, 214 insertions(+), 194 deletions(-) diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php index f6f3bcd82b6..45c620db456 100644 --- a/htdocs/core/tpl/admin_extrafields_add.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php @@ -203,7 +203,7 @@ $langs->load("modulebuilder"); -
">      +
">      ">
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php index 6191a4f92b7..1ba83bc393f 100644 --- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php @@ -266,7 +266,7 @@ else -
">      +
">      ">
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php index 7e05580f77d..ac7ee20139a 100644 --- a/htdocs/core/tpl/admin_extrafields_view.tpl.php +++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php @@ -58,15 +58,15 @@ print '
'; print ''; print ''; print ''; -print ''; +print ''; print ''; -print ''; -print ''; -print ''; -print ''; -print ''; +print ''; +print ''; +print ''; +print ''; +print ''; if ($conf->multicompany->enabled) { - print ''; + print ''; } print ''; print "\n"; @@ -86,15 +86,15 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel print "\n"; print "\n"; print "\n"; - print '\n"; + print '\n"; print '\n"; - print '\n"; - print '\n"; - print '\n"; - print '\n"; - print '\n"; + print '\n"; + print '\n"; + print '\n"; + print '\n"; + print '\n"; if (! empty($conf->multicompany->enabled)) { - print ''; + print ''; } print '\n"; diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php index ea5b6e06e4d..dadfff3e62e 100644 --- a/htdocs/core/tpl/advtarget.tpl.php +++ b/htdocs/core/tpl/advtarget.tpl.php @@ -53,10 +53,10 @@ print '
trans('Ref') ?> trans('Label') ?>trans('NbOfDifferentValues') ?>trans('NbProducts') ?>trans('NbOfDifferentValues') ?>trans('NbProducts') ?>
ref) ?> label) ?>countChildValues() ?>countChildProducts() ?> + countChildValues() ?>countChildProducts() ?> '.$langs->trans("LabelOrTranslationKey").''.$langs->trans("TranslationString").''.$langs->trans("AttributeCode").''.$langs->trans("Type").''.$langs->trans("Size").''.$langs->trans("Size").''.$langs->trans("ComputedFormula").''.$langs->trans("Unique").''.$langs->trans("Required").''.$langs->trans("AlwaysEditable").''.$form->textwithpicto($langs->trans("Visible"), $langs->trans("VisibleDesc")).''.$form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")).''.$langs->trans("Unique").''.$langs->trans("Required").''.$langs->trans("AlwaysEditable").''.$form->textwithpicto($langs->trans("Visible"), $langs->trans("VisibleDesc")).''.$form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")).''.$langs->trans("Entities").''.$langs->trans("Entities").' 
".$langs->trans($extrafields->attributes[$elementtype]['label'][$key])."".$key."".$type2label[$extrafields->attributes[$elementtype]['type'][$key]]."'.$extrafields->attributes[$elementtype]['size'][$key]."'.$extrafields->attributes[$elementtype]['size'][$key]."'.dol_trunc($extrafields->attributes[$elementtype]['computed'][$key], 20)."'.yn($extrafields->attributes[$elementtype]['unique'][$key])."'.yn($extrafields->attributes[$elementtype]['required'][$key])."'.yn($extrafields->attributes[$elementtype]['alwayseditable'][$key])."'.$extrafields->attributes[$elementtype]['list'][$key]."'.yn($extrafields->attributes[$elementtype]['totalizable'][$key])."'.yn($extrafields->attributes[$elementtype]['unique'][$key])."'.yn($extrafields->attributes[$elementtype]['required'][$key])."'.yn($extrafields->attributes[$elementtype]['alwayseditable'][$key])."'.$extrafields->attributes[$elementtype]['list'][$key]."'.yn($extrafields->attributes[$elementtype]['totalizable'][$key])."'.($extrafields->attributes[$elementtype]['entityid'][$key]==0?$langs->trans("All"):$extrafields->attributes[$elementtype]['entitylabel'][$key]).''.($extrafields->attributes[$elementtype]['entityid'][$key]==0?$langs->trans("All"):$extrafields->attributes[$elementtype]['entitylabel'][$key]).''.img_edit().''; print "  ".img_delete()."