From 4e0ef01389b4c499c7f57d00917b36ea42d89c7e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Thu, 25 Apr 2013 01:13:13 +0200 Subject: [PATCH] Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap --- dev/test/testdiv.php | 6 ++-- htdocs/adherents/fiche.php | 2 +- htdocs/adherents/liste.php | 8 ++--- htdocs/adherents/type.php | 8 ++--- htdocs/admin/agenda_extsites.php | 4 +-- htdocs/admin/bank.php | 2 +- htdocs/admin/commande.php | 4 +-- htdocs/admin/contract.php | 2 +- htdocs/admin/dict.php | 2 +- htdocs/admin/expedition.php | 4 +-- htdocs/admin/facture.php | 4 +-- htdocs/admin/fichinter.php | 2 +- htdocs/admin/livraison.php | 2 +- htdocs/admin/menus/edit.php | 4 +-- htdocs/admin/propal.php | 2 +- htdocs/admin/proxy.php | 14 ++++---- htdocs/admin/security.php | 2 +- htdocs/admin/security_other.php | 6 ++-- htdocs/admin/supplier_invoice.php | 2 +- htdocs/admin/supplier_order.php | 2 +- htdocs/admin/syslog.php | 2 +- htdocs/admin/tools/eaccelerator.php | 14 ++++---- htdocs/admin/tools/listevents.php | 6 ++-- htdocs/admin/tools/listsessions.php | 6 ++-- htdocs/bookmarks/liste.php | 2 +- htdocs/cashdesk/tpl/ticket.tpl.php | 6 ++-- htdocs/categories/categorie.php | 2 +- htdocs/categories/viewcat.php | 8 ++--- htdocs/comm/action/contact.php | 4 +-- htdocs/comm/action/fiche.php | 32 ++++++++--------- htdocs/comm/action/index.php | 22 ++++++------ htdocs/comm/action/listactions.php | 6 ++-- htdocs/comm/fiche.php | 26 +++++++------- htdocs/comm/index.php | 22 ++++++------ htdocs/comm/mailing/cibles.php | 4 +-- htdocs/comm/mailing/index.php | 2 +- htdocs/comm/mailing/liste.php | 4 +-- htdocs/comm/propal.php | 4 +-- htdocs/comm/propal/index.php | 26 +++++++------- htdocs/comm/propal/list.php | 8 ++--- htdocs/comm/prospect/list.php | 4 +-- htdocs/comm/remx.php | 18 +++++----- htdocs/commande/fiche.php | 4 +-- htdocs/commande/index.php | 20 +++++------ htdocs/commande/liste.php | 16 ++++----- htdocs/commande/orderstoinvoice.php | 8 ++--- htdocs/compta/bank/account.php | 12 +++---- htdocs/compta/bank/rappro.php | 16 ++++----- htdocs/compta/bank/releve.php | 6 ++-- htdocs/compta/bank/search.php | 8 ++--- htdocs/compta/charges/index.php | 2 +- htdocs/compta/dons/index.php | 2 +- htdocs/compta/facture.php | 35 ++++++++++--------- htdocs/compta/facture/impayees.php | 8 ++--- htdocs/compta/facture/list.php | 6 ++-- htdocs/compta/facture/stats/index.php | 3 +- htdocs/compta/index.php | 24 ++++++------- htdocs/compta/localtax/clients.php | 2 +- htdocs/compta/localtax/index.php | 12 +++---- htdocs/compta/recap-compta.php | 4 +-- htdocs/compta/sociales/index.php | 2 +- htdocs/compta/stats/index.php | 4 +-- htdocs/compta/tva/clients.php | 2 +- htdocs/compta/tva/index.php | 12 +++---- htdocs/compta/tva/quadri.php | 10 +++--- htdocs/compta/tva/quadri_detail.php | 2 +- htdocs/contrat/fiche.php | 6 ++-- htdocs/contrat/index.php | 14 ++++---- htdocs/contrat/liste.php | 2 +- htdocs/contrat/services.php | 2 +- htdocs/core/boxes/box_actions.php | 2 +- htdocs/core/boxes/box_contracts.php | 2 +- htdocs/core/boxes/box_ficheinter.php | 2 +- htdocs/core/boxes/box_produits.php | 2 +- .../core/boxes/box_produits_alerte_stock.php | 2 +- htdocs/core/boxes/modules_boxes.php | 2 +- htdocs/core/class/commonobject.class.php | 2 +- htdocs/core/class/html.form.class.php | 6 ++-- htdocs/core/class/html.formfile.class.php | 8 ++--- .../browser/default/frmupload.php | 4 +-- htdocs/core/lib/agenda.lib.php | 26 +++++++------- htdocs/core/lib/company.lib.php | 12 +++---- htdocs/core/lib/project.lib.php | 6 ++-- htdocs/core/lib/sendings.lib.php | 6 ++-- htdocs/core/lib/usergroups.lib.php | 2 +- htdocs/core/menus/standard/auguria_menu.php | 17 ++++++--- htdocs/core/menus/standard/eldy_menu.php | 19 ++++++---- htdocs/core/modules/dons/html_cerfafr.html | 8 ++--- htdocs/core/tpl/contacts.tpl.php | 6 ++-- .../core/tpl/freeproductline_create.tpl.php | 2 +- htdocs/core/tpl/login.tpl.php | 10 +++--- htdocs/core/tpl/objectline_add.tpl.php | 2 +- htdocs/core/tpl/objectline_view.tpl.php | 18 +++++----- htdocs/core/tpl/passwordforgotten.tpl.php | 8 ++--- htdocs/expedition/contact.php | 6 ++-- htdocs/expedition/index.php | 2 +- htdocs/exports/export.php | 6 ++-- htdocs/exports/index.php | 2 +- htdocs/fichinter/fiche.php | 4 +-- htdocs/fichinter/list.php | 2 +- htdocs/fourn/commande/fiche.php | 16 ++++----- htdocs/fourn/commande/history.php | 4 +-- htdocs/fourn/commande/index.php | 14 ++++---- htdocs/fourn/facture/contact.php | 2 +- htdocs/fourn/facture/document.php | 4 +-- htdocs/fourn/facture/fiche.php | 26 +++++++------- htdocs/fourn/facture/impayees.php | 2 +- htdocs/fourn/facture/index.php | 10 +++--- htdocs/fourn/facture/note.php | 4 +-- htdocs/fourn/facture/paiement.php | 6 ++-- htdocs/fourn/fiche.php | 18 +++++----- htdocs/fourn/index.php | 10 +++--- htdocs/fourn/recap-fourn.php | 4 +-- htdocs/ftp/index.php | 12 +++---- htdocs/imports/import.php | 4 +-- htdocs/imports/index.php | 2 +- htdocs/index.php | 6 ++-- htdocs/install/check.php | 4 +-- htdocs/install/repair.php | 4 +-- htdocs/install/upgrade.php | 4 +-- htdocs/install/upgrade2.php | 2 +- htdocs/product/admin/product.php | 4 +-- htdocs/product/fiche.php | 6 ++-- htdocs/product/index.php | 6 ++-- htdocs/product/liste.php | 6 ++-- htdocs/product/reassort.php | 6 ++-- htdocs/projet/admin/project.php | 2 +- htdocs/projet/contact.php | 4 +-- htdocs/projet/index.php | 2 +- htdocs/projet/tasks/contact.php | 4 +-- htdocs/projet/tasks/time.php | 10 +++--- htdocs/public/members/new.php | 2 +- htdocs/societe/admin/societe.php | 10 +++--- .../canvas/company/tpl/card_create.tpl.php | 4 +-- .../canvas/company/tpl/card_edit.tpl.php | 4 +-- .../canvas/company/tpl/card_view.tpl.php | 4 +-- .../canvas/individual/tpl/card_view.tpl.php | 2 +- htdocs/societe/consumption.php | 2 +- htdocs/societe/index.php | 4 +-- htdocs/societe/soc.php | 12 +++---- htdocs/societe/societe.php | 8 ++--- htdocs/theme/amarok/style.css.php | 13 +++---- htdocs/theme/auguria/style.css.php | 3 ++ htdocs/theme/bureau2crea/style.css.php | 3 ++ htdocs/theme/cameleo/style.css.php | 3 ++ htdocs/theme/eldy/style.css.php | 25 +++++++++---- htdocs/user/group/index.php | 2 +- htdocs/user/group/perms.php | 6 ++-- htdocs/user/home.php | 2 +- htdocs/user/index.php | 4 +-- htdocs/user/param_ihm.php | 8 ++--- htdocs/user/perms.php | 10 +++--- 152 files changed, 563 insertions(+), 526 deletions(-) diff --git a/dev/test/testdiv.php b/dev/test/testdiv.php index 78917a8d940..8700be5b2ab 100644 --- a/dev/test/testdiv.php +++ b/dev/test/testdiv.php @@ -33,14 +33,14 @@ <!-- Login --> <tr> <td valign="bottom"> <strong><label for="username">Login</label></strong>fds fs df sdf gdsfgsdf r </td> -<td valign="bottom" nowrap="nowrap"> +<td valign="bottom" class="nowrap"> <input type="text" id="username" name="username" class="flat" size="15" maxlength="40" value="" tabindex="1" /> </td> </tr> <!-- Password --> -<tr><td valign="top" nowrap="nowrap"> <strong><label for="password">Mot de passe</label></strong> </td> -<td valign="top" nowrap="nowrap"> +<tr><td valign="top" class="nowrap"> <strong><label for="password">Mot de passe</label></strong> </td> +<td valign="top" class="nowrap"> <input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="" tabindex="2" /> </td></tr> diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 76b2b2d23f5..0453633afc4 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -1403,7 +1403,7 @@ else print '</td></tr>'; // Zip / Town - print '<tr><td nowrap="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td class="valeur">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td></tr>'; + print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td class="valeur">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td></tr>'; // Country print '<tr><td>'.$langs->trans("Country").'</td><td class="valeur">'; diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index 27ddd052225..d4beb3ecdd9 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -304,7 +304,7 @@ if ($resql) // Type $membertypestatic->id=$objp->type_id; $membertypestatic->libelle=$objp->type; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $membertypestatic->getNomUrl(1,32); print '</td>'; @@ -315,21 +315,21 @@ if ($resql) print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n"; // Statut - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $memberstatic->LibStatut($objp->statut,$objp->cotisation,$datefin,2); print "</td>"; // End of subscription date if ($datefin) { - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print dol_print_date($datefin,'day'); if ($datefin < ($now - $conf->adherent->cotisation->warning_delay) && $objp->statut > 0) print " ".img_warning($langs->trans("SubscriptionLate")); print '</td>'; } else { - print '<td align="left" nowrap="nowrap">'; + print '<td align="left" class="nowrap">'; if ($objp->cotisation == 'yes') { print $langs->trans("SubscriptionNotReceived"); diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php index 2120d2d2a83..d221619acf4 100644 --- a/htdocs/adherents/type.php +++ b/htdocs/adherents/type.php @@ -540,7 +540,7 @@ if ($rowid > 0) print "<td>".$objp->login."</td>\n"; // Type - /*print '<td nowrap="nowrap">'; + /*print '<td class="nowrap">'; $membertypestatic->id=$objp->type_id; $membertypestatic->libelle=$objp->type; print $membertypestatic->getNomUrl(1,12); @@ -554,14 +554,14 @@ if ($rowid > 0) print "<td>".dol_print_email($objp->email,0,0,1)."</td>\n"; // Statut - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $adh->LibStatut($objp->statut,$objp->cotisation,$datefin,2); print "</td>"; // Date fin cotisation if ($datefin) { - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; if ($datefin < time() && $objp->statut > 0) { print dol_print_date($datefin,'day')." ".img_warning($langs->trans("SubscriptionLate")); @@ -574,7 +574,7 @@ if ($rowid > 0) } else { - print '<td align="left" nowrap="nowrap">'; + print '<td align="left" class="nowrap">'; if ($objp->cotisation == 'yes') { print $langs->trans("SubscriptionNotReceived"); diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php index d23d7c510ea..3e917ce03fc 100644 --- a/htdocs/admin/agenda_extsites.php +++ b/htdocs/admin/agenda_extsites.php @@ -199,13 +199,13 @@ while ($i <= $MAXAGENDA) $var=!$var; print "<tr ".$bc[$var].">"; // Nb - print '<td width="180" nowrap="nowrap">'.$langs->trans("AgendaExtNb",$key)."</td>"; + print '<td width="180" class="nowrap">'.$langs->trans("AgendaExtNb",$key)."</td>"; // Name print '<td><input type="text" class="flat hideifnotset" name="agenda_ext_name'.$key.'" value="'. (GETPOST('agenda_ext_name'.$key)?GETPOST('agenda_ext_name'.$key):$conf->global->$name) . '" size="28"></td>'; // URL print '<td><input type="url" class="flat hideifnotset" name="agenda_ext_src'.$key.'" value="'. (GETPOST('agenda_ext_src'.$key)?GETPOST('agenda_ext_src'.$key):$conf->global->$src) . '" size="60"></td>'; // Color (Possible colors are limited by Google) - print '<td nowrap="nowrap" align="right">'; + print '<td class="nowrap" align="right">'; //print $formadmin->selectColor($conf->global->$color, "google_agenda_color".$key, $colorlist); print $formother->selectColor((GETPOST("agenda_ext_color".$key)?GETPOST("agenda_ext_color".$key):$conf->global->$color), "agenda_ext_color".$key, 'extsitesconfig', 1, '', 'hideifnotset'); print '</td>'; diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php index 6ba81a5cbee..9fc80d8b3f7 100644 --- a/htdocs/admin/bank.php +++ b/htdocs/admin/bank.php @@ -165,7 +165,7 @@ while ($i < $nbofbank) print '<td>'.$bankorder[$i][0]."</td><td>\n"; print $bankorder[$i][1]; print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmparray=explode(' ',$bankorder[$i][2]); foreach($tmparray as $key => $val) { diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 861a15bfebc..898d20648ec 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -234,7 +234,7 @@ print '<table class="noborder" width="100%">'; print '<tr class="liste_titre">'; print '<td>'.$langs->trans("Name").'</td>'; print '<td>'.$langs->trans("Description").'</td>'; -print '<td nowrap="nowrap">'.$langs->trans("Example").'</td>'; +print '<td class="nowrap">'.$langs->trans("Example").'</td>'; print '<td align="center" width="60">'.$langs->trans("Status").'</td>'; print '<td align="center" width="16">'.$langs->trans("Infos").'</td>'; print '</tr>'."\n"; @@ -274,7 +274,7 @@ foreach ($dirmodels as $reldir) print '</td>'; // Show example of numbering model - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php index 5e32dd097d0..24a4ba180c2 100644 --- a/htdocs/admin/contract.php +++ b/htdocs/admin/contract.php @@ -146,7 +146,7 @@ if (is_resource($handle)) print '</td>'; // Show example of numbering model - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp=='NotConfigured') print $langs->trans($tmp); diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index ef64ad34527..d82169b7be3 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -1111,7 +1111,7 @@ if ($id) $url = $_SERVER["PHP_SELF"].'?'.($page?'page='.$page.'&':'').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(! empty($obj->rowid)?$obj->rowid:(! empty($obj->code)?$obj->code:'')).'&code='.(! empty($obj->code)?$obj->code:'').'&id='.$id.'&'; // Active - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; if ($iserasable) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>'; else { diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 28e5b912de2..1ac15bed9ed 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -266,7 +266,7 @@ foreach ($dirmodels as $reldir) print '</td>'; // Show example of numbering module - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; @@ -361,7 +361,7 @@ print '<td width="140">'.$langs->trans("Name").'</td>'; print '<td>'.$langs->trans("Description").'</td>'; print '<td align="center" width="60">'.$langs->trans("Status").'</td>'; print '<td align="center" width="60">'.$langs->trans("Default").'</td>'; -print '<td align="center" width="80" nowrap="nowrap">'.$langs->trans("Infos").'</td>'; +print '<td align="center" width="80" class="nowrap">'.$langs->trans("Infos").'</td>'; print "</tr>\n"; clearstatcache(); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 35768104e39..ac2d89c1169 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -319,7 +319,7 @@ print '<table class="noborder" width="100%">'; print '<tr class="liste_titre">'; print '<td>'.$langs->trans("Name").'</td>'; print '<td>'.$langs->trans("Description").'</td>'; -print '<td nowrap="nowrap">'.$langs->trans("Example").'</td>'; +print '<td class="nowrap">'.$langs->trans("Example").'</td>'; print '<td align="center" width="60">'.$langs->trans("Status").'</td>'; print '<td align="center" width="16">'.$langs->trans("Infos").'</td>'; print '</tr>'."\n"; @@ -371,7 +371,7 @@ foreach ($dirmodels as $reldir) print '</td>'; // Show example of numbering module - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php index 023593ea2a7..95b2bffffb5 100644 --- a/htdocs/admin/fichinter.php +++ b/htdocs/admin/fichinter.php @@ -263,7 +263,7 @@ foreach ($dirmodels as $reldir) print '</td>'; // Show example of numbering model - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); diff --git a/htdocs/admin/livraison.php b/htdocs/admin/livraison.php index 677e2b3773b..9bee4befa03 100644 --- a/htdocs/admin/livraison.php +++ b/htdocs/admin/livraison.php @@ -253,7 +253,7 @@ foreach ($dirmodels as $reldir) print '</td>'; // Show example of numbering module - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index f7bd7ad95d7..67388dbb330 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -305,7 +305,7 @@ if ($action == 'create') print '<td>'.$langs->trans('DetailMenuHandler').'</td></tr>'; //User - print '<tr><td nowrap="nowrap" class="fieldrequired">'.$langs->trans('MenuForUsers').'</td>'; + print '<tr><td class="nowrap fieldrequired">'.$langs->trans('MenuForUsers').'</td>'; print '<td><select class="flat" name="user">'; print '<option value="2" selected>'.$langs->trans("AllMenus").'</option>'; print '<option value="0">'.$langs->trans('Internal').'</option>'; @@ -406,7 +406,7 @@ elseif ($action == 'edit') print '<tr><td class="fieldrequired">'.$langs->trans('MenuHandler').'</td><td>'.$handler.'</td><td>'.$langs->trans('DetailMenuHandler').'</td></tr>'; // User - print '<tr><td nowrap="nowrap" class="fieldrequired">'.$langs->trans('MenuForUsers').'</td><td><select class="flat" name="user">'; + print '<tr><td class="nowrap fieldrequired">'.$langs->trans('MenuForUsers').'</td><td><select class="flat" name="user">'; print '<option value="2"'.($menu->user==2?' selected="true"':'').'>'.$langs->trans("AllMenus").'</option>'; print '<option value="0"'.($menu->user==0?' selected="true"':'').'>'.$langs->trans('Internal').'</option>'; print '<option value="1"'.($menu->user==1?' selected="true"':'').'>'.$langs->trans('External').'</option>'; diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index d7cfcc0b67f..13f9eb32f46 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -302,7 +302,7 @@ foreach ($dirmodels as $reldir) print '</td>'; // Show example of numbering module - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index ac3c911577b..5fe56bafaea 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -132,7 +132,7 @@ $var=!$var; print '<tr '.$bc[$var].'>'; print '<td>'.$langs->trans("ConnectionTimeout").'</td><td align="right">'; print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print '<input class="flat" name="MAIN_USE_CONNECT_TIMEOUT" type="text" size="4" value="'.(isset($_POST["MAIN_USE_CONNECT_TIMEOUT"])?GETPOST("MAIN_USE_CONNECT_TIMEOUT"):$conf->global->MAIN_USE_CONNECT_TIMEOUT).'">'; print ' '.strtolower($langs->trans("Seconds")); print '</td>'; @@ -142,7 +142,7 @@ $var=!$var; print '<tr '.$bc[$var].'>'; print '<td>'.$langs->trans("ResponseTimeout").'</td><td align="right">'; print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print '<input class="flat" name="MAIN_USE_RESPONSE_TIMEOUT" type="text" size="4" value="'.$conf->global->MAIN_USE_RESPONSE_TIMEOUT.'">'; print ' '.strtolower($langs->trans("Seconds")); print '</td>'; @@ -152,7 +152,7 @@ $var=!$var; print '<tr '.$bc[$var].'>'; print '<td>'.$langs->trans("MAIN_PROXY_USE").'</td><td align="right">'; print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print $form->selectyesno('MAIN_PROXY_USE',$conf->global->MAIN_PROXY_USE,1); print '</td>'; print '</tr>'; @@ -161,7 +161,7 @@ $var=!$var; print '<tr '.$bcdd[$var].'>'; print '<td>'.$langs->trans("MAIN_PROXY_HOST").'</td><td align="right">'; print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print '<input class="flat" name="MAIN_PROXY_HOST" type="text" size="16" value="'.$conf->global->MAIN_PROXY_HOST.'">'; print '</td>'; print '</tr>'; @@ -170,7 +170,7 @@ $var=!$var; print '<tr '.$bcdd[$var].'>'; print '<td>'.$langs->trans("MAIN_PROXY_PORT").'</td><td align="right">'; print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print '<input class="flat" name="MAIN_PROXY_PORT" type="text" size="4" value="'.$conf->global->MAIN_PROXY_PORT.'">'; print '</td>'; print '</tr>'; @@ -179,7 +179,7 @@ $var=!$var; print '<tr '.$bcdd[$var].'>'; print '<td>'.$langs->trans("MAIN_PROXY_USER").'</td><td align="right">'; print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print '<input class="flat" name="MAIN_PROXY_USER" type="text" size="16" value="'.$conf->global->MAIN_PROXY_USER.'">'; print '</td>'; print '</tr>'; @@ -188,7 +188,7 @@ $var=!$var; print '<tr '.$bcdd[$var].'>'; print '<td>'.$langs->trans("MAIN_PROXY_PASS").'</td><td align="right">'; print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print '<input class="flat" name="MAIN_PROXY_PASS" type="text" size="16" value="'.$conf->global->MAIN_PROXY_PASS.'">'; print '</td>'; print '</tr>'; diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php index 9c4bfc67af4..83d2d5f8947 100644 --- a/htdocs/admin/security.php +++ b/htdocs/admin/security.php @@ -247,7 +247,7 @@ foreach ($arrayhandler as $key => $module) print '</td>'; // Show example of numbering module - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; } elseif ($tmp=='NotConfigured') print $langs->trans($tmp); diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index f24a63ba76e..b78a201b9d1 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -154,7 +154,7 @@ print '<tr '.$bc[$var].'>'; print '<td>'.$langs->trans("SessionTimeOut").'</td><td align="right">'; print $form->textwithpicto('',$langs->trans("SessionExplanation",ini_get("session.gc_probability"),ini_get("session.gc_divisor"))); print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print '<input class="flat" name="MAIN_SESSION_TIMEOUT" type="text" size="6" value="'.htmlentities($conf->global->MAIN_SESSION_TIMEOUT).'"> '.strtolower($langs->trans("Seconds")); print '</td>'; print '<td align="right">'; @@ -250,7 +250,7 @@ $max=@ini_get('upload_max_filesize'); if ($max) print ' '.$langs->trans("MustBeLowerThanPHPLimit",$max*1024,$langs->trans("Kb")).'.'; else print ' '.$langs->trans("NoMaxSizeByPHPLimit").'.'; print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UPLOAD_DOC).'"> '.$langs->trans("Kb"); print '</td>'; print '<td align="right">'; @@ -265,7 +265,7 @@ print '<tr '.$bc[$var].'>'; print '<td>'.$langs->trans("UMask").'</td><td align="right">'; print $form->textwithpicto('',$langs->trans("UMaskExplanation")); print '</td>'; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UMASK).'">'; print '</td>'; print '<td align="right">'; diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php index d99698473a4..b724774237c 100644 --- a/htdocs/admin/supplier_invoice.php +++ b/htdocs/admin/supplier_invoice.php @@ -251,7 +251,7 @@ foreach ($dirmodels as $reldir) print '</td>'; // Show example of numbering model - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php index f80e6c3b28b..2b4feda1b8d 100644 --- a/htdocs/admin/supplier_order.php +++ b/htdocs/admin/supplier_order.php @@ -251,7 +251,7 @@ foreach ($dirmodels as $reldir) print '</td>'; // Show example of numbering module - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) { $langs->load("errors"); print '<div class="error">'.$langs->trans($tmp).'</div>'; diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php index 075f975adb2..f42f846e9d6 100644 --- a/htdocs/admin/syslog.php +++ b/htdocs/admin/syslog.php @@ -192,7 +192,7 @@ foreach ($syslogModules as $moduleName) print $module->getName(); print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $setuparray=$module->configure(); if ($setuparray) { diff --git a/htdocs/admin/tools/eaccelerator.php b/htdocs/admin/tools/eaccelerator.php index fec29ea5fd0..a3f046f4510 100644 --- a/htdocs/admin/tools/eaccelerator.php +++ b/htdocs/admin/tools/eaccelerator.php @@ -165,11 +165,11 @@ function create_script_table($list) foreach($list as $script) { ?> <tr <?php $var = ! $var; print $bc[$var]; ?>> <td><?php print dol_trunc($script['file'],80,'left'); ?></td> - <td align="center" nowrap="nowrap"><?php print dol_print_date($script['mtime'],'dayhour'); ?></td> - <td align="right" nowrap="nowrap"><?php print number_format($script['size'] / 1024, 2); ?> + <td align="center" class="nowrap"><?php print dol_print_date($script['mtime'],'dayhour'); ?></td> + <td align="right" class="nowrap"><?php print number_format($script['size'] / 1024, 2); ?> KB</td> - <td align="right" nowrap="nowrap"><?php print $script['reloads']; ?> (<?php print $script['usecount']; ?>)</td> - <td align="right" nowrap="nowrap"><?php print $script['hits']; ?></td> + <td align="right" class="nowrap"><?php print $script['reloads']; ?> (<?php print $script['usecount']; ?>)</td> + <td align="right" class="nowrap"><?php print $script['hits']; ?></td> </tr> <?php } ?> </table> @@ -199,10 +199,10 @@ function create_key_table($list) ?> <tr <?php $var = ! $var; print $bc[$var]; ?>> <td><?php print dol_trunc($key['name'],80,'left'); ?></td> - <td align="center" nowrap="nowrap"><?php dol_print_date($key['created'],'dayhour'); ?></td> - <td align="right" nowrap="nowrap"><?php print number_format($key['size']/1024, 3); ?> + <td align="center" class="nowrap"><?php dol_print_date($key['created'],'dayhour'); ?></td> + <td align="right" class="nowrap"><?php print number_format($key['size']/1024, 3); ?> KB</td> - <td align="right" nowrap="nowrap"><?php + <td align="right" class="nowrap"><?php if ($key['ttl'] == -1) { print 'expired'; } elseif ($key['ttl'] == 0) { diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php index 284520bce48..5347b709410 100644 --- a/htdocs/admin/tools/listevents.php +++ b/htdocs/admin/tools/listevents.php @@ -206,18 +206,18 @@ if ($result) print '<tr '.$bc[$var].'>'; // Date - print '<td align="left" nowrap="nowrap">'.dol_print_date($db->jdate($obj->dateevent),'%Y-%m-%d %H:%M:%S').'</td>'; + print '<td align="left" class="nowrap">'.dol_print_date($db->jdate($obj->dateevent),'%Y-%m-%d %H:%M:%S').'</td>'; // Code print '<td>'.$obj->type.'</td>'; // IP - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print dol_print_ip($obj->ip); print '</td>'; // Login - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; if ($obj->fk_user) { $userstatic->id=$obj->fk_user; diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php index 0193ed9d833..780e4427078 100644 --- a/htdocs/admin/tools/listsessions.php +++ b/htdocs/admin/tools/listsessions.php @@ -151,16 +151,16 @@ if ($savehandler == 'files') print '<td>'.$sessionentry['login'].'</td>'; // ID - print '<td align="left" nowrap="nowrap">'; + print '<td align="left" class="nowrap">'; if ("$key" == session_id()) print $form->textwithpicto($key,$langs->trans("YourSession")); else print $key; print '</td>'; // Date creation - print '<td align="left" nowrap="nowrap">'.dol_print_date($sessionentry['creation'],'%Y-%m-%d %H:%M:%S').'</td>'; + print '<td align="left" class="nowrap">'.dol_print_date($sessionentry['creation'],'%Y-%m-%d %H:%M:%S').'</td>'; // Date modification - print '<td align="left" nowrap="nowrap">'.dol_print_date($sessionentry['modification'],'%Y-%m-%d %H:%M:%S').'</td>'; + print '<td align="left" class="nowrap">'.dol_print_date($sessionentry['modification'],'%Y-%m-%d %H:%M:%S').'</td>'; // Age print '<td>'.$sessionentry['age'].'</td>'; diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php index 371870047d9..c3634b6c726 100644 --- a/htdocs/bookmarks/liste.php +++ b/htdocs/bookmarks/liste.php @@ -170,7 +170,7 @@ if ($resql) print '<td align="right">'.$obj->position."</td>"; // Actions - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; if ($user->rights->bookmark->creer) { print "<a href=\"".DOL_URL_ROOT."/bookmarks/fiche.php?action=edit&id=".$obj->bid."&backtopage=".urlencode($_SERVER["PHP_SELF"])."\">".img_edit()."</a> "; diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php index ddce4bf1e83..cae461fe7fc 100644 --- a/htdocs/cashdesk/tpl/ticket.tpl.php +++ b/htdocs/cashdesk/tpl/ticket.tpl.php @@ -140,9 +140,9 @@ print $object->ref; <table class="totaux"> <?php -echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalHT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prixTotalHt(),'MT')." ".$conf->currency."</td></tr>\n"; -echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalVAT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->montantTva(),'MT')." ".$conf->currency."</td></tr>\n"; -echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalTTC").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prixTotalTtc(),'MT')." ".$conf->currency."</td></tr>\n"; +echo '<tr><th class="nowrap">'.$langs->trans("TotalHT").'</th><td class="nowrap">'.price2num($obj_facturation->prixTotalHt(),'MT')." ".$conf->currency."</td></tr>\n"; +echo '<tr><th class="nowrap">'.$langs->trans("TotalVAT").'</th><td class="nowrap">'.price2num($obj_facturation->montantTva(),'MT')." ".$conf->currency."</td></tr>\n"; +echo '<tr><th class="nowrap">'.$langs->trans("TotalTTC").'</th><td class="nowrap">'.price2num($obj_facturation->prixTotalTtc(),'MT')." ".$conf->currency."</td></tr>\n"; ?> </table> diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php index ec2a2b49d63..a930637f627 100644 --- a/htdocs/categories/categorie.php +++ b/htdocs/categories/categorie.php @@ -277,7 +277,7 @@ if ($socid) // Assujeti a TVA ou pas print '<tr>'; - print '<td nowrap="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">'; + print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">'; print yn($soc->tva_assuj); print '</td>'; print '</tr>'; diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 57cffd387de..36ed1bd4ded 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -258,7 +258,7 @@ if ($object->type == 0) { $var=!$var; print "\t<tr ".$bc[$var].">\n"; - print '<td nowrap="nowrap" valign="top">'; + print '<td class="nowrap" valign="top">'; print $prod->getNomUrl(1,'category'); print "</td>\n"; print '<td valign="top">'.$prod->libelle."</td>\n"; @@ -309,7 +309,7 @@ if ($object->type == 1) $var=!$var; print "\t<tr ".$bc[$var].">\n"; - print '<td nowrap="nowrap" valign="top">'; + print '<td class="nowrap" valign="top">'; print $soc->getNomUrl(1,'category_supplier'); print "</td>\n"; // Link to delete from category @@ -361,7 +361,7 @@ if($object->type == 2) $i++; $var=!$var; print "\t<tr ".$bc[$var].">\n"; - print '<td nowrap="nowrap" valign="top">'; + print '<td class="nowrap" valign="top">'; print $soc->getNomUrl(1,'category'); print "</td>\n"; // Link to delete from category @@ -413,7 +413,7 @@ if ($object->type == 3) { $var=!$var; print "\t<tr ".$bc[$var].">\n"; - print '<td nowrap="nowrap" valign="top">'; + print '<td class="nowrap" valign="top">'; $member->ref=$member->login; print $member->getNomUrl(1,0,'category'); print "</td>\n"; diff --git a/htdocs/comm/action/contact.php b/htdocs/comm/action/contact.php index b3819ce3a04..87a13f28c55 100644 --- a/htdocs/comm/action/contact.php +++ b/htdocs/comm/action/contact.php @@ -266,7 +266,7 @@ if ($id > 0 || ! empty($ref)) // Ligne ajout pour contact interne print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print img_object('','user').' '.$langs->trans("Users"); print '</td>'; @@ -298,7 +298,7 @@ if ($id > 0 || ! empty($ref)) $var=!$var; print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); print '</td>'; diff --git a/htdocs/comm/action/fiche.php b/htdocs/comm/action/fiche.php index 4b4917715b5..618a6e4fa3e 100644 --- a/htdocs/comm/action/fiche.php +++ b/htdocs/comm/action/fiche.php @@ -473,7 +473,7 @@ if ($action == 'create') // Date start $datep=$actioncomm->datep; if (GETPOST('datep','int',1)) $datep=dol_stringtotime(GETPOST('datep','int',1),0); - print '<tr><td width="30%" nowrap="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td>'; + print '<tr><td width="30%" class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td>'; if (GETPOST("afaire") == 1) $form->select_date($datep,'ap',1,1,0,"action",1,1,0,0,'fulldayend'); else if (GETPOST("afaire") == 2) $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldayend'); else $form->select_date($datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart'); @@ -514,12 +514,12 @@ if ($action == 'create') // Assigned to $var=false; - print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>'; + print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>'; $form->select_users(GETPOST("affectedto")?GETPOST("affectedto"):(! empty($actioncomm->usertodo->id) && $actioncomm->usertodo->id > 0 ? $actioncomm->usertodo->id : $user->id),'affectedto',1); print '</td></tr>'; // Busy - print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("Busy").'</td><td>'; + print '<tr><td width="30%" class="nowrap">'.$langs->trans("Busy").'</td><td>'; print '<input id="transparency" type="checkbox" name="transparency" value="'.$actioncomm->transparency.'">'; print '</td></tr>'; @@ -536,7 +536,7 @@ if ($action == 'create') print '<table class="border" width="100%">'; // Societe, contact - print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionOnCompany").'</td><td>'; + print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionOnCompany").'</td><td>'; if (GETPOST('socid','int') > 0) { $societe = new Societe($db); @@ -711,7 +711,7 @@ if ($id > 0) if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1'? $backtopage : $_SERVER["HTTP_REFERER"]).'">'; dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action'); - + print '<table class="border" width="100%">'; // Ref @@ -732,7 +732,7 @@ if ($id > 0) print '<tr><td class="fieldrequired">'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($act->fulldayevent?' checked="checked"':'').'></td></tr>'; // Date start - print '<tr><td nowrap="nowrap" class="fieldrequired">'.$langs->trans("DateActionStart").'</td><td colspan="3">'; + print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").'</span></td><td colspan="3">'; if (GETPOST("afaire") == 1) $form->select_date($act->datep,'ap',1,1,0,"action",1,1,0,0,'fulldaystart'); else if (GETPOST("afaire") == 2) $form->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart'); else $form->select_date($act->datep,'ap',1,1,1,"action",1,1,0,0,'fulldaystart'); @@ -745,7 +745,7 @@ if ($id > 0) print '</td></tr>'; // Status - print '<tr><td nowrap="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">'; + print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">'; $percent=GETPOST("percentage")?GETPOST("percentage"):$act->percentage; print $htmlactions->form_select_status_action('formaction',$percent,1); print '</td></tr>'; @@ -756,19 +756,19 @@ if ($id > 0) print '</table><br><br><table class="border" width="100%">'; // Assigned to - print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">'; + print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">'; print $form->select_dolusers($act->usertodo->id>0?$act->usertodo->id:-1,'affectedto',1); print '</td></tr>'; // Busy - print '<tr><td nowrap="nowrap">'.$langs->trans("Busy").'</td><td>'; + print '<tr><td class="nowrap">'.$langs->trans("Busy").'</td><td>'; print '<input id="transparency" type="checkbox" name="transparency"'.($act->transparency?' checked="checked"':'').'">'; print '</td></tr>'; // Realised by if ($conf->global->AGENDA_ENABLE_DONEBY) { - print '<tr><td nowrap="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">'; + print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">'; print $form->select_dolusers($act->userdone->id> 0?$act->userdone->id:-1,'doneby',1); print '</td></tr>'; } @@ -838,7 +838,7 @@ if ($id > 0) print '</table>'; dol_fiche_end(); - + print '<center><input type="submit" class="button" name="edit" value="'.$langs->trans("Save").'">'; print ' <input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">'; print '</center>'; @@ -848,7 +848,7 @@ if ($id > 0) else { dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action'); - + // Affichage fiche action en mode visu print '<table class="border" width="100%">'; @@ -916,7 +916,7 @@ if ($id > 0) print '</td></tr>'; // Status - print '<tr><td nowrap="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="2">'; + print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="2">'; print $act->getLibStatut(4); print '</td></tr>'; @@ -926,19 +926,19 @@ if ($id > 0) print '</table><br><br><table class="border" width="100%">'; // Assigned to - print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">'; + print '<tr><td width="30%" class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">'; if ($act->usertodo->id > 0) print $act->usertodo->getNomUrl(1); print '</td></tr>'; // Busy - print '<tr><td nowrap="nowrap">'.$langs->trans("Busy").'</td><td colspan="3">'; + print '<tr><td class="nowrap">'.$langs->trans("Busy").'</td><td colspan="3">'; print yn(($act->transparency > 0)?1:0); print '</td></tr>'; // Done by if ($conf->global->AGENDA_ENABLE_DONEBY) { - print '<tr><td nowrap="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">'; + print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">'; if ($act->userdone->id > 0) print $act->userdone->getNomUrl(1); print '</td></tr>'; } diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 813c2578374..fd9df1ea848 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -780,7 +780,7 @@ if (empty($action) || $action == 'show_month') // View by month { $style='cal_other_month cal_past'; if ($iter_day == 6) $style.=' cal_other_month_right'; - echo ' <td class="'.$style.'" width="14%" valign="top" nowrap="nowrap">'; + echo ' <td class="'.$style.' nowrap" width="14%" valign="top">'; show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam); echo " </td>\n"; } @@ -796,7 +796,7 @@ if (empty($action) || $action == 'show_month') // View by month if ($today) $style='cal_today'; if ($curtime < $todaytms) $style.=' cal_past'; - echo ' <td class="'.$style.'" width="14%" valign="top" nowrap="nowrap">'; + echo ' <td class="'.$style.' nowrap" width="14%" valign="top">'; show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam); echo " </td>\n"; } @@ -805,7 +805,7 @@ if (empty($action) || $action == 'show_month') // View by month { $style='cal_other_month'; if ($iter_day == 6) $style.=' cal_other_month_right'; - echo ' <td class="'.$style.'" width="14%" valign="top" nowrap="nowrap">'; + echo ' <td class="'.$style.' nowrap" width="14%" valign="top">'; show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam); echo "</td>\n"; } @@ -855,7 +855,7 @@ elseif ($action == 'show_week') // View by week if ($todayarray['mday']==$tmpday && $todayarray['mon']==$month && $todayarray['year']==$year) $today=1; if ($today) $style='cal_today'; - echo ' <td class="'.$style.'" width="14%" valign="top" nowrap="nowrap">'; + echo ' <td class="'.$style.' nowrap" width="14%" valign="top">'; show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300); echo " </td>\n"; } @@ -863,7 +863,7 @@ elseif ($action == 'show_week') // View by week { $style='cal_current_month'; if ($iter_day == 6) $style.=' cal_other_month_right'; - echo ' <td class="'.$style.'" width="14%" valign="top" nowrap="nowrap">'; + echo ' <td class="'.$style.' nowrap" width="14%" valign="top">'; show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300); echo "</td>\n"; } @@ -892,7 +892,7 @@ else // View by day echo ' <td align="center">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n"; echo " </tr>\n"; echo " <tr>\n"; - echo ' <td class="'.$style.'" width="14%" valign="top" nowrap="nowrap">'; + echo ' <td class="'.$style.' nowrap" width="14%" valign="top">'; $maxnbofchar=80; show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300); echo "</td>\n"; @@ -947,7 +947,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa print '<div id="dayevent_'.sprintf("%04d",$year).sprintf("%02d",$month).sprintf("%02d",$day).'" class="dayevent">'."\n"; $curtime = dol_mktime(0, 0, 0, $month, $day, $year); print '<table class="nobordernopadding" width="100%">'; - print '<tr><td align="left" nowrap="nowrap">'; + print '<tr><td align="left" class="nowrap">'; print '<a href="'.DOL_URL_ROOT.'/comm/action/index.php?'; print 'action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year; print $newparam; @@ -956,7 +956,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa if ($showinfo) print dol_print_date($curtime,'daytext'); else print dol_print_date($curtime,'%d'); print '</a>'; - print '</td><td align="right" nowrap="nowrap">'; + print '</td><td align="right" class="nowrap">'; if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) { //$param='month='.$monthshown.'&year='.$year; @@ -966,7 +966,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa print '</a>'; } print '</td></tr>'; - print '<tr height="'.$minheight.'"><td valign="top" colspan="2" nowrap="nowrap" style="padding-bottom: 2px;">'; + print '<tr height="'.$minheight.'"><td valign="top" colspan="2" class="nowrap" style="padding-bottom: 2px;">'; //$curtime = dol_mktime (0, 0, 0, $month, $day, $year); $i=0; $nummytasks=0; $numother=0; $numbirthday=0; $numical=0; $numicals=array(); @@ -1034,7 +1034,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa print '<div id="event_'.$ymd.'_'.$i.'" class="event '.$cssclass.'">'; print '<ul class="cal_event"><li class="cal_event">'; print '<table class="cal_event" style="background: #'.$color.'; -moz-border-radius:4px; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).')); " width="100%"><tr>'; - print '<td nowrap="nowrap" class="cal_event">'; + print '<td class="nowrap cal_event">'; if ($event->type_code == 'BIRTHDAY') // It's a birthday { print $event->getNomUrl(1,$maxnbofchar,'cal_event','birthday','contact'); @@ -1155,7 +1155,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa print '</td>'; // Status - Percent - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') print $event->getLibStatut(3,1); else print ' '; print '</td></tr></table>'; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index 9e7a7a959bb..c0b8430b75e 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -276,7 +276,7 @@ if ($resql) //print dol_trunc($obj->label,12); //print '</td>'; - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print dol_print_date($db->jdate($obj->dp),"day"); $late=0; if ($obj->percent == 0 && $obj->dp && $db->jdate($obj->dp) < ($now - $delay_warning)) $late=1; @@ -286,7 +286,7 @@ if ($resql) if ($late) print img_warning($langs->trans("Late")).' '; print '</td>'; - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print dol_print_date($db->jdate($obj->dp2),"day"); print '</td>'; @@ -354,7 +354,7 @@ if ($resql) print '</td>'; // Status/Percent - print '<td align="right" nowrap="nowrap">'.$actionstatic->LibStatut($obj->percent,6).'</td>'; + print '<td align="right" class="nowrap">'.$actionstatic->LibStatut($obj->percent,6).'</td>'; print "</tr>\n"; $i++; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index ae8026d2b68..88b136b8167 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -236,7 +236,7 @@ if ($id > 0) print "</td></tr>"; // Zip / Town - print '<tr><td nowrap="nowrap">'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td>'; + print '<tr><td class="nowrap">'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td>'; print '<td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town."</td>"; print '</tr>'; @@ -261,7 +261,7 @@ if ($id > 0) // Assujeti a TVA ou pas print '<tr>'; - print '<td nowrap="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">'; + print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">'; print yn($object->tva_assuj); print '</td>'; print '</tr>'; @@ -271,10 +271,10 @@ if ($id > 0) { if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { - print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; + print '<tr><td class="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; print yn($object->localtax1_assuj); print '</td></tr>'; - print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">'; + print '<tr><td class="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">'; print yn($object->localtax2_assuj); print '</td></tr>'; } @@ -503,14 +503,14 @@ if ($id > 0) { $objp = $db->fetch_object($resql); print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap"><a href="propal.php?id='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a>'."\n"; + print '<td class="nowrap"><a href="propal.php?id='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a>'."\n"; if ( ($db->jdate($objp->dp) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == 1 ) { print " ".img_warning(); } print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n"; print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>'; - print '<td align="right" style="min-width: 60px" nowrap="nowrap">'.$propal_static->LibStatut($objp->fk_statut,5).'</td></tr>'; + print '<td align="right" style="min-width: 60px" class="nowrap">'.$propal_static->LibStatut($objp->fk_statut,5).'</td></tr>'; $var=!$var; $i++; } @@ -579,10 +579,10 @@ if ($id > 0) $objp = $db->fetch_object($resql); $var=!$var; print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->cid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref."</a>\n"; + print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->cid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$objp->ref."</a>\n"; print '</td><td align="right" width="80">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n"; print '<td align="right" style="min-width: 60px">'.price($objp->total_ht).'</td>'; - print '<td align="right" style="min-width: 60px" nowrap="nowrap">'.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'</td></tr>'; + print '<td align="right" style="min-width: 60px" class="nowrap">'.$commande_static->LibStatut($objp->fk_statut,$objp->facture,5).'</td></tr>'; $i++; } $db->free($resql); @@ -631,14 +631,14 @@ if ($id > 0) $objp = $db->fetch_object($resql); $var=!$var; print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $contrat->id=$objp->id; $contrat->ref=$objp->ref?$objp->ref:$objp->id; print $contrat->getNomUrl(1,12); print "</td>\n"; print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->dc),'day')."</td>\n"; print '<td width="20"> </td>'; - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; $contrat->fetch_lines(); print $contrat->getLibStatut(4); print "</td>\n"; @@ -692,7 +692,7 @@ if ($id > 0) $fichinter_static->statut=$objp->fk_statut; print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/fiche.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a></td>'."\n"; + print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/fiche.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"),"propal").' '.$objp->ref.'</a></td>'."\n"; //print '<td align="right" width="80">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n"; print '<td align="right" width="120">'.convertSecondToTime($objp->duration).'</td>'."\n"; print '<td align="right" width="100">'.$fichinter_static->getLibStatut(5).'</td>'."\n"; @@ -753,7 +753,7 @@ if ($id > 0) $objp = $db->fetch_object($resql); $var=!$var; print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $facturestatic->id=$objp->facid; $facturestatic->ref=$objp->facnumber; $facturestatic->type=$objp->type; @@ -769,7 +769,7 @@ if ($id > 0) } print '<td align="right" width="120">'.price($objp->total_ttc).'</td>'; - print '<td align="right" nowrap="nowrap" width="100" >'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'</td>'; + print '<td align="right" class="nowrap" width="100" >'.($facturestatic->LibStatut($objp->paye,$objp->statut,5,$objp->am)).'</td>'; print "</tr>\n"; $i++; } diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index de442152c14..367ab558194 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -157,19 +157,19 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) { $obj = $db->fetch_object($resql); $var=!$var; - print '<tr '.$bc[$var].'><td nowrap="nowrap">'; + print '<tr '.$bc[$var].'><td class="nowrap">'; $propalstatic->id=$obj->rowid; $propalstatic->ref=$obj->ref; print $propalstatic->getNomUrl(1); print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $companystatic->id=$obj->socid; $companystatic->name=$obj->name; $companystatic->client=$obj->client; $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1,'customer',16); print '</td>'; - print '<td align="right" nowrap="nowrap">'.price($obj->total_ht).'</td></tr>'; + print '<td align="right" class="nowrap">'.price($obj->total_ht).'</td></tr>'; $i++; $total += $obj->total_ht; } @@ -224,15 +224,15 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) { $var=!$var; $obj = $db->fetch_object($resql); - print '<tr '.$bc[$var].'><td nowrap="nowrap"><a href="../commande/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>'; - print '<td nowrap="nowrap">'; + print '<tr '.$bc[$var].'><td class="nowrap"><a href="../commande/fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref.'</a></td>'; + print '<td class="nowrap">'; $companystatic->id=$obj->socid; $companystatic->name=$obj->name; $companystatic->client=$obj->client; $companystatic->canvas=$obj->canvas; print $companystatic->getNomUrl(1,'customer',16); print '</td>'; - print '<td align="right" nowrap="nowrap">'.price($obj->total_ttc).'</td></tr>'; + print '<td align="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>'; $i++; $total += $obj->total_ttc; } @@ -295,7 +295,7 @@ if (! empty($conf->societe->enabled) && $user->rights->societe->lire) $companystatic->client=$objp->client; $companystatic->canvas=$objp->canvas; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'.$companystatic->getNomUrl(1,'customer',48).'</td>'; + print '<td class="nowrap">'.$companystatic->getNomUrl(1,'customer',48).'</td>'; print '<td align="right" nowrap>'; print $companystatic->getLibCustProspStatut(); print "</td>"; @@ -351,7 +351,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->societe->lire) $companystatic->name=$objp->name; $companystatic->canvas=$objp->canvas; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'.$companystatic->getNomUrl(1,'supplier',44).'</td>'; + print '<td class="nowrap">'.$companystatic->getNomUrl(1,'supplier',44).'</td>'; print '<td align="right">'.dol_print_date($db->jdate($objp->dm),'day').'</td>'; print '</tr>'; $var=!$var; @@ -481,16 +481,16 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) print '<tr '.$bc[$var].'>'; // Ref - print '<td nowrap="nowrap" width="140">'; + print '<td class="nowrap" width="140">'; $propalstatic->id=$obj->propalid; $propalstatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td class="nobordernopadding" nowrap="nowrap">'; + print '<td class="nobordernopadding nowrap">'; print $propalstatic->getNomUrl(1); print '</td>'; - print '<td width="18" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="18" class="nobordernopadding nowrap">'; if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print '</td>'; print '<td width="16" align="center" class="nobordernopadding">'; diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php index 22c7de7c5f2..c533a01c5c5 100644 --- a/htdocs/comm/mailing/cibles.php +++ b/htdocs/comm/mailing/cibles.php @@ -483,7 +483,7 @@ if ($object->fetch($id) >= 0) if ($obj->statut == 0) { print '<td align="center"> </td>'; - print '<td align="right" nowrap="nowrap">'.$langs->trans("MailingStatusNotSent"); + print '<td align="right" class="nowrap">'.$langs->trans("MailingStatusNotSent"); if ($user->rights->mailing->creer) { print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")); } @@ -492,7 +492,7 @@ if ($object->fetch($id) >= 0) else { print '<td align="center">'.$obj->date_envoi.'</td>'; - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; if ($obj->statut==-1) print $langs->trans("MailingStatusError").' '.img_error(); if ($obj->statut==1) print $langs->trans("MailingStatusSent").' '.img_picto($langs->trans("MailingStatusSent"),'statut4'); if ($obj->statut==2) print $langs->trans("MailingStatusRead").' '.img_picto($langs->trans("MailingStatusRead"),'statut6'); diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 8c1be3b3926..088ee43a02a 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -176,7 +176,7 @@ if ($result) $var=!$var; print "<tr $bc[$var]>"; - print '<td nowrap="nowrap"><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>'; + print '<td class="nowrap"><a href="fiche.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowEMail"),"email").' '.$obj->rowid.'</a></td>'; print '<td>'.dol_trunc($obj->titre,38).'</td>'; print '<td align="center">'.dol_print_date($db->jdate($obj->date_creat),'day').'</td>'; print '<td align="center">'.($obj->nbemail?$obj->nbemail:"0").'</td>'; diff --git a/htdocs/comm/mailing/liste.php b/htdocs/comm/mailing/liste.php index 1a09441b499..b05f859f54e 100644 --- a/htdocs/comm/mailing/liste.php +++ b/htdocs/comm/mailing/liste.php @@ -161,10 +161,10 @@ if ($result) print '</td>'; } // Last send - print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($obj->date_envoi),'day').'</td>'; + print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->date_envoi),'day').'</td>'; print '</td>'; // Status - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; if ($filteremail) { if ($obj->sendstatut==-1) print $langs->trans("MailingStatusError").' '.img_error(); diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 2a7c92dce56..ab536ddee63 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1290,7 +1290,7 @@ if ($action == 'create') print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td colspan="2"><input name="duree_validite" size="5" value="'.$conf->global->PROPALE_VALIDITY_DURATION.'"> '.$langs->trans("days").'</td></tr>'; // Terms of payment - print '<tr><td nowrap="nowrap" class="fieldrequired">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">'; + print '<tr><td class="nowrap fieldrequired">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">'; $form->select_conditions_paiements($soc->cond_reglement,'cond_reglement_id'); print '</td></tr>'; @@ -1561,7 +1561,7 @@ else // Ref client print '<tr><td>'; - print '<table class="nobordernopadding" width="100%"><tr><td nowrap="nowrap">'; + print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">'; print $langs->trans('RefCustomer').'</td><td align="left">'; print '</td>'; if ($action != 'refclient' && ! empty($object->brouillon)) print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=refclient&id='.$object->id.'">'.img_edit($langs->trans('Modify')).'</a></td>'; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index 971f6d10a86..2a31d4a48b7 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -184,7 +184,7 @@ if (! empty($conf->propal->enabled)) $propalstatic->id=$obj->rowid; $propalstatic->ref=$obj->ref; - print '<td nowrap="nowrap">'.$propalstatic->getNomUrl(1).'</td>'; + print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>'; $companystatic->id=$obj->socid; $companystatic->name=$obj->socname; @@ -242,17 +242,17 @@ if ($resql) $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td width="20%" nowrap="nowrap">'; + print '<td width="20%" class="nowrap">'; $propalstatic->id=$obj->rowid; $propalstatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="96" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="96" class="nobordernopadding nowrap">'; print $propalstatic->getNomUrl(1); print '</td>'; - print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="16" class="nobordernopadding nowrap">'; print ' '; print '</td>'; @@ -321,16 +321,16 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire) print '<tr '.$bc[$var].'>'; // Ref - print '<td nowrap="nowrap" width="140">'; + print '<td class="nowrap" width="140">'; $propalstatic->id=$obj->propalid; $propalstatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td class="nobordernopadding" nowrap="nowrap">'; + print '<td class="nobordernopadding nowrap">'; print $propalstatic->getNomUrl(1); print '</td>'; - print '<td width="18" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="18" class="nobordernopadding nowrap">'; if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print '</td>'; print '<td width="16" align="center" class="nobordernopadding">'; @@ -403,17 +403,17 @@ if (! empty($conf->propal->enabled)) $var=!$var; $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $propalstatic->id=$obj->rowid; $propalstatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="96" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="96" class="nobordernopadding nowrap">'; print $propalstatic->getNomUrl(1); print '</td>'; - print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="16" class="nobordernopadding nowrap">'; print ' '; print '</td>'; @@ -475,17 +475,17 @@ if (! empty($conf->propal->enabled)) $var=!$var; $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td width="20%" nowrap="nowrap">'; + print '<td width="20%" class="nowrap">'; $propalstatic->id=$obj->rowid; $propalstatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="96" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="96" class="nobordernopadding nowrap">'; print $propalstatic->getNomUrl(1); print '</td>'; - print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="16" class="nobordernopadding nowrap">'; print ' '; print '</td>'; diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php index 1d4d5b82c24..4787cb3ae3e 100644 --- a/htdocs/comm/propal/list.php +++ b/htdocs/comm/propal/list.php @@ -301,17 +301,17 @@ if ($result) $now = dol_now(); $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $objectstatic->id=$objp->propalid; $objectstatic->ref=$objp->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td class="nobordernopadding" nowrap="nowrap">'; + print '<td class="nobordernopadding nowrap">'; print $objectstatic->getNomUrl(1); print '</td>'; - print '<td width="20" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="20" class="nobordernopadding nowrap">'; if ($objp->fk_statut == 1 && $db->jdate($objp->dfv) < ($now - $conf->propal->cloture->warning_delay)) print img_warning($langs->trans("Late")); print '</td>'; @@ -333,7 +333,7 @@ if ($result) print '</td>'; // Customer ref - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $objp->ref_client; print '</td>'; diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php index bd0f6376f1f..873ef051612 100755 --- a/htdocs/comm/prospect/list.php +++ b/htdocs/comm/prospect/list.php @@ -402,12 +402,12 @@ if ($resql) print $prospectstatic->getLibProspLevel(); print "</td>"; // Statut - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print $prospectstatic->LibProspStatut($obj->fk_stcomm,2); print "</td>"; //$sts = array(-1,0,1,2,3); - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; foreach ($sts as $key => $value) { if ($value <> $obj->fk_stcomm) diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 7f92b7e65c0..56dec89394d 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -323,7 +323,7 @@ if ($socid > 0) print '<tr class="liste_titre">'; print '<td width="120" align="left">'.$langs->trans("Date").'</td>'; // Need 120+ for format with AM/PM print '<td align="left">'.$langs->trans("ReasonDiscount").'</td>'; - print '<td width="150" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>'; + print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>'; print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>'; print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>'; print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>'; @@ -342,7 +342,7 @@ if ($socid > 0) print '<td>'.dol_print_date($db->jdate($obj->dc),'dayhour').'</td>'; if ($obj->description == '(CREDIT_NOTE)') { - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $facturestatic->id=$obj->fk_facture_source; $facturestatic->ref=$obj->ref; $facturestatic->type=$obj->type; @@ -351,7 +351,7 @@ if ($socid > 0) } elseif ($obj->description == '(DEPOSIT)') { - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $facturestatic->id=$obj->fk_facture_source; $facturestatic->ref=$obj->ref; $facturestatic->type=$obj->type; @@ -364,7 +364,7 @@ if ($socid > 0) print $obj->description; print '</td>'; } - print '<td nowrap="nowrap">'.$langs->trans("NotConsumed").'</td>'; + print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>'; print '<td align="right">'.price($obj->amount_ht).'</td>'; print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>'; print '<td align="right">'.price($obj->amount_ttc).'</td>'; @@ -373,7 +373,7 @@ if ($socid > 0) print '</td>'; if ($user->rights->societe->creer || $user->rights->facture->creer) { - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$objsoc->id.'&action=split&remid='.$obj->rowid.'">'.img_picto($langs->trans("SplitDiscount"),'split').'</a>'; print ' '; print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$objsoc->id.'&action=remove&remid='.$obj->rowid.'">'.img_delete($langs->trans("RemoveDiscount")).'</a>'; @@ -459,7 +459,7 @@ if ($socid > 0) print '<tr class="liste_titre">'; print '<td width="120" align="left">'.$langs->trans("Date").'</td>'; // Need 120+ for format with AM/PM print '<td align="left">'.$langs->trans("ReasonDiscount").'</td>'; - print '<td width="150" nowrap="nowrap">'.$langs->trans("ConsumedBy").'</td>'; + print '<td width="150" class="nowrap">'.$langs->trans("ConsumedBy").'</td>'; print '<td width="120" align="right">'.$langs->trans("AmountHT").'</td>'; print '<td width="80" align="right">'.$langs->trans("VATRate").'</td>'; print '<td width="120" align="right">'.$langs->trans("AmountTTC").'</td>'; @@ -499,7 +499,7 @@ if ($socid > 0) print '<td>'.dol_print_date($db->jdate($obj->dc),'dayhour').'</td>'; if ($obj->description == '(CREDIT_NOTE)') { - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $facturestatic->id=$obj->fk_facture_source; $facturestatic->ref=$obj->ref; $facturestatic->type=$obj->type; @@ -508,7 +508,7 @@ if ($socid > 0) } elseif ($obj->description == '(DEPOSIT)') { - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $facturestatic->id=$obj->fk_facture_source; $facturestatic->ref=$obj->ref; $facturestatic->type=$obj->type; @@ -521,7 +521,7 @@ if ($socid > 0) print $obj->description; print '</td>'; } - print '<td align="left" nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>'; + print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->rowid.'">'.img_object($langs->trans("ShowBill"),'bill').' '.$obj->facnumber.'</a></td>'; print '<td align="right">'.price($obj->amount_ht).'</td>'; print '<td align="right">'.price2num($obj->tva_tx,'MU').'%</td>'; print '<td align="right">'.price($obj->amount_ttc).'</td>'; diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 4801305a091..1166dcbd8e1 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1565,7 +1565,7 @@ if ($action == 'create' && $user->rights->commande->creer) print "</td></tr>"; // Conditions de reglement - print '<tr><td nowrap="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">'; + print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td colspan="2">'; $form->select_conditions_paiements($cond_reglement_id,'cond_reglement_id',-1,1); print '</td></tr>'; @@ -1907,7 +1907,7 @@ else // Ref commande client print '<tr><td>'; - print '<table class="nobordernopadding" width="100%"><tr><td nowrap="nowrap">'; + print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">'; print $langs->trans('RefCustomer').'</td><td align="left">'; print '</td>'; if ($action != 'refcustomer' && $object->brouillon) print '<td align="right"><a href="'.$_SERVER['PHP_SELF'].'?action=refcustomer&id='.$object->id.'">'.img_edit($langs->trans('Modify')).'</a></td>'; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index e0e2e09df73..d8b45e1b9af 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -195,7 +195,7 @@ if (! empty($conf->commande->enabled)) $var=!$var; $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print "<a href=\"fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>"; print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td></tr>'; $i++; @@ -247,17 +247,17 @@ if ($resql) $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td width="20%" nowrap="nowrap">'; + print '<td width="20%" class="nowrap">'; $commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="96" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="96" class="nobordernopadding nowrap">'; print $commandestatic->getNomUrl(1); print '</td>'; - print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="16" class="nobordernopadding nowrap">'; print ' '; print '</td>'; @@ -316,17 +316,17 @@ if (! empty($conf->commande->enabled)) $var=!$var; $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td nowrap="nowrap" width="20%">'; + print '<td class="nowrap" width="20%">'; $commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="96" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="96" class="nobordernopadding nowrap">'; print $commandestatic->getNomUrl(1); print '</td>'; - print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="16" class="nobordernopadding nowrap">'; print ' '; print '</td>'; @@ -387,17 +387,17 @@ if (! empty($conf->commande->enabled)) $var=!$var; $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td width="20%" nowrap="nowrap">'; + print '<td width="20%" class="nowrap">'; $commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="96" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="96" class="nobordernopadding nowrap">'; print $commandestatic->getNomUrl(1); print '</td>'; - print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="16" class="nobordernopadding nowrap">'; print ' '; print '</td>'; diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index b628dc2d5db..7ba7ddc82bd 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -304,17 +304,17 @@ if ($resql) $objp = $db->fetch_object($resql); $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $generic_commande->id=$objp->rowid; $generic_commande->ref=$objp->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td class="nobordernopadding" nowrap="nowrap">'; + print '<td class="nobordernopadding nowrap">'; print $generic_commande->getNomUrl(1,($viewstatut != 2?0:$objp->fk_statut)); print '</td>'; - print '<td width="20" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="20" class="nobordernopadding nowrap">'; if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $db->jdate($objp->date_valid) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning"); print '</td>'; @@ -375,10 +375,10 @@ if ($resql) print '</td>'; // Amount HT - print '<td align="right" nowrap="nowrap">'.price($objp->total_ht).'</td>'; + print '<td align="right" class="nowrap">'.price($objp->total_ht).'</td>'; // Statut - print '<td align="right" nowrap="nowrap">'.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).'</td>'; + print '<td align="right" class="nowrap">'.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).'</td>'; print '</tr>'; @@ -391,10 +391,10 @@ if ($resql) { $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap" colspan="5">'.$langs->trans('TotalHT').'</td>'; + print '<td class="nowrap" colspan="5">'.$langs->trans('TotalHT').'</td>'; // Total HT - print '<td align="right" nowrap="nowrap">'.price($total).'</td>'; - print '<td nowrap="nowrap"> </td>'; + print '<td align="right" class="nowrap">'.price($total).'</td>'; + print '<td class="nowrap"> </td>'; print '</tr>'; } diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 42a39dd9fa8..664f9ce0f1b 100755 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -607,17 +607,17 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) $objp = $db->fetch_object($resql); $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $generic_commande->id=$objp->rowid; $generic_commande->ref=$objp->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td class="nobordernopadding" nowrap="nowrap">'; + print '<td class="nobordernopadding nowrap">'; print $generic_commande->getNomUrl(1,$objp->fk_statut); print '</td>'; - print '<td width="20" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="20" class="nobordernopadding nowrap">'; if (($objp->fk_statut > 0) && ($objp->fk_statut < 3) && $db->jdate($objp->date_valid) < ($now - $conf->commande->client->warning_delay)) print img_picto($langs->trans("Late"),"warning"); print '</td>'; @@ -642,7 +642,7 @@ if (($action != 'create' && $action != 'add') || ! empty($mesgs)) print '</td>'; // Statut - print '<td align="right" nowrap="nowrap">'.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).'</td>'; + print '<td align="right" class="nowrap">'.$generic_commande->LibStatut($objp->fk_statut,$objp->facturee,5).'</td>'; // Checkbox print '<td align="center">'; diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php index 7830abef655..2aad34cd229 100644 --- a/htdocs/compta/bank/account.php +++ b/htdocs/compta/bank/account.php @@ -351,10 +351,10 @@ if ($id > 0 || ! empty($ref)) print '</tr>'; print '<tr '.$bc[false].'>'; - print '<td nowrap="nowrap" colspan="2">'; + print '<td class="nowrap" colspan="2">'; $form->select_date($dateop,'op',0,0,0,'transaction'); print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $form->select_types_paiements((GETPOST('operation')?GETPOST('operation'):($object->courant == 2 ? 'LIQ' : '')),'operation','1,2',2,1); print '</td><td>'; print '<input name="num_chq" class="flat" type="text" size="4" value="'.GETPOST("num_chq").'"></td>'; @@ -505,9 +505,9 @@ if ($id > 0 || ! empty($ref)) print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'.dol_print_date($db->jdate($objp->do),"day")."</td>\n"; + print '<td class="nowrap">'.dol_print_date($db->jdate($objp->do),"day")."</td>\n"; - print '<td nowrap="nowrap">'.dol_print_date($db->jdate($objp->dv),"day"); + print '<td class="nowrap">'.dol_print_date($db->jdate($objp->dv),"day"); print "</td>\n"; // Payment type @@ -636,11 +636,11 @@ if ($id > 0 || ! empty($ref)) // Amount if ($objp->amount < 0) { - print '<td align="right" nowrap="nowrap">'.price($objp->amount * -1).'</td><td> </td>'."\n"; + print '<td align="right" class="nowrap">'.price($objp->amount * -1).'</td><td> </td>'."\n"; } else { - print '<td> </td><td align="right" nowrap="nowrap"> '.price($objp->amount).'</td>'."\n"; + print '<td> </td><td align="right" class="nowrap"> '.price($objp->amount).'</td>'."\n"; } // Balance diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php index e38ce88633a..da28602314a 100644 --- a/htdocs/compta/bank/rappro.php +++ b/htdocs/compta/bank/rappro.php @@ -238,10 +238,10 @@ if ($resql) print '<td align="center">'.$langs->trans("DateValueShort").'</td>'; print '<td>'.$langs->trans("Type").'</td>'; print '<td>'.$langs->trans("Description").'</td>'; - print '<td align="right" width="60" nowrap="nowrap">'.$langs->trans("Debit").'</td>'; - print '<td align="right" width="60" nowrap="nowrap">'.$langs->trans("Credit").'</td>'; + print '<td align="right" width="60" class="nowrap">'.$langs->trans("Debit").'</td>'; + print '<td align="right" width="60" class="nowrap">'.$langs->trans("Credit").'</td>'; print '<td align="center" width="80">'.$langs->trans("Action").'</td>'; - print '<td align="center" width="60" nowrap="nowrap">'.$langs->trans("ToConciliate").'</td>'; + print '<td align="center" width="60" class="nowrap">'.$langs->trans("ToConciliate").'</td>'; print "</tr>\n"; @@ -258,12 +258,12 @@ if ($resql) // print "<input type=\"hidden\" name=\"rowid\" value=\"".$objp->rowid."\">"; // Date op - print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($objp->do),"day").'</td>'; + print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->do),"day").'</td>'; // Date value if (! $objp->rappro && ($user->rights->banque->modifier || $user->rights->banque->consolidate)) { - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv),"day")."</span>"; print ' <span> '; print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&account='.$acct->id.'&rowid='.$objp->rowid.'">'; @@ -282,7 +282,7 @@ if ($resql) // Type + Number $label=($langs->trans("PaymentType".$objp->type)!="PaymentType".$objp->type)?$langs->trans("PaymentType".$objp->type):$objp->type; // $objp->type is a code if ($label=='SOLD') $label=''; - print '<td nowrap="nowrap">'.$label.($objp->num_chq?' '.$objp->num_chq:'').'</td>'; + print '<td class="nowrap">'.$label.($objp->num_chq?' '.$objp->num_chq:'').'</td>'; // Description print '<td valign="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'">'; @@ -390,7 +390,7 @@ if ($resql) // If not already reconciliated if ($user->rights->banque->modifier) { - print '<td align="center" width="30" nowrap="nowrap">'; + print '<td align="center" width="30" class="nowrap">'; print '<a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'&orig_account='.$acct->id.'">'; print img_edit(); @@ -418,7 +418,7 @@ if ($resql) if ($db->jdate($objp->do) <= $now) { - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(! empty($_POST['rowid'][$objp->rowid])?' checked="checked"':'').'>'; // print '<input class="flat" name="num_releve" type="text" value="'.$objp->num_releve.'" size="8">'; // print ' '; diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php index 044b4b70ebc..2a6ddd762d3 100644 --- a/htdocs/compta/bank/releve.php +++ b/htdocs/compta/bank/releve.php @@ -281,10 +281,10 @@ else print "<tr $bc[$var]>"; // Date operation - print '<td nowrap="nowrap" align="center">'.dol_print_date($db->jdate($objp->do),"day").'</td>'; + print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->do),"day").'</td>'; // Date de valeur - print '<td align="center" valign="center" nowrap="nowrap">'; + print '<td align="center" valign="center" class="nowrap">'; print '<a href="releve.php?action=dvprev&num='.$num.'&account='.$acct->id.'&dvid='.$objp->rowid.'">'; print img_previous().'</a> '; print dol_print_date($db->jdate($objp->dv),"day") .' '; @@ -293,7 +293,7 @@ else print "</td>\n"; // Num cheque - print '<td nowrap="nowrap">'.$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'').'</td>'; + print '<td class="nowrap">'.$objp->fk_type.' '.($objp->num_chq?$objp->num_chq:'').'</td>'; // Libelle print '<td valign="center"><a href="'.DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$objp->rowid.'&account='.$acct->id.'">'; diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php index 9117a099fb5..bdfda680d6d 100644 --- a/htdocs/compta/bank/search.php +++ b/htdocs/compta/bank/search.php @@ -209,15 +209,15 @@ if ($resql) print "<tr $bc[$var]>"; // Ref - print '<td align="left" nowrap="nowrap">'; + print '<td align="left" class="nowrap">'; print "<a href=\"ligne.php?rowid=".$objp->rowid.'">'.img_object($langs->trans("ShowPayment"),"payment").' '.$objp->rowid."</a> "; print '</td>'; // Date ope - print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($objp->do),"day")."</td>\n"; + print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->do),"day")."</td>\n"; // Date value - print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($objp->dv),"day")."</td>\n"; + print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->dv),"day")."</td>\n"; // Payment type print "<td align=\"center\">"; @@ -266,7 +266,7 @@ if ($resql) } // Bank account - print '<td align="left" nowrap="nowrap">'; + print '<td align="left" class="nowrap">'; $bankaccountstatic->id=$objp->bankid; $bankaccountstatic->label=$objp->bankref; print $bankaccountstatic->getNomUrl(1); diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php index 05c60f59294..2c26a5d6361 100644 --- a/htdocs/compta/charges/index.php +++ b/htdocs/compta/charges/index.php @@ -205,7 +205,7 @@ if (empty($_GET["mode"]) || $_GET["mode"] != 'sconly') $total = 0 ; print '<table class="noborder" width="100%">'; print '<tr class="liste_titre">'; - print '<td width="120" nowrap="nowrap">'.$langs->trans("PeriodEndDate").'</td>'; + print '<td width="120" class="nowrap">'.$langs->trans("PeriodEndDate").'</td>'; print "<td>".$langs->trans("Label")."</td>"; print '<td align="right" width="10%">'.$langs->trans("ExpectedToPay")."</td>"; print '<td align="right" width="10%">'.$langs->trans("RefPayment")."</td>"; diff --git a/htdocs/compta/dons/index.php b/htdocs/compta/dons/index.php index 13c4301dad5..36c1e897c44 100644 --- a/htdocs/compta/dons/index.php +++ b/htdocs/compta/dons/index.php @@ -175,7 +175,7 @@ if ($resql) $donation_static->id=$obj->rowid; $donation_static->ref=$obj->ref?$obj->ref:$obj->rowid; - print '<td width="96" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="96" class="nobordernopadding nowrap">'; print $donation_static->getNomUrl(1); print '</td>'; diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 6c190bac20b..f9d8aefda2f 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -49,6 +49,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $langs->load('bills'); $langs->load('companies'); $langs->load('products'); +$langs->load('banks'); $langs->load('main'); if (! empty($conf->margin->enabled)) $langs->load('margins'); @@ -878,17 +879,17 @@ else if ($action == 'add' && $user->rights->facture->creer) if ($_POST['type'] == 3) { $typeamount=GETPOST('typedeposit','alpha'); $valuedeposit=GETPOST('valuedeposit','int'); - + if ($typeamount=='amount') { $amountdeposit=$valuedeposit; }else { $amountdeposit=0; - + dol_include_once('/'.$element.'/class/'.$subelement.'.class.php'); - + $classname = ucfirst($subelement); $srcobject = new $classname($db); - + dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add deposit line"); $result=$srcobject->fetch($object->origin_id); if ($result > 0) @@ -900,7 +901,7 @@ else if ($action == 'add' && $user->rights->facture->creer) { $totalamount=+$lines[$i]->subprice; } - + if ($totalamount!=0) { $amountdeposit=($totalamount*$valuedeposit)/100; } @@ -910,9 +911,9 @@ else if ($action == 'add' && $user->rights->facture->creer) $mesgs[]=$srcobject->error; $error++; } - + } - + $result = $object->addline( $id, $langs->trans('Deposit'), @@ -940,7 +941,7 @@ else if ($action == 'add' && $user->rights->facture->creer) 0, $langs->trans('Deposit') ); - + }else { @@ -2117,7 +2118,7 @@ if ($action == 'create') // Deposit print '<tr height="18"><td width="16px" valign="middle">'; print '<input type="radio" name="type" value="3"'.(GETPOST('type')==3?' checked="checked"':'').'>'; - print '</td><td valign="middle" nowrap="nowrap">'; + print '</td><td valign="middle" class="nowrap">'; $desc=$form->textwithpicto($langs->trans("InvoiceDeposit"),$langs->transnoentities("InvoiceDepositDesc"),1); print '<table class="nobordernopadding"><tr><td>'.$desc.'</td>'; if (($origin=='propal') ) { @@ -2340,21 +2341,21 @@ if ($action == 'create') $form->select_produits('','idprod'.$i,'',$conf->product->limit_size); print '</td>'; print '<td><input type="text" size="2" name="qty'.$i.'" value="1"></td>'; - print '<td nowrap="nowrap"><input type="text" size="1" name="remise_percent'.$i.'" value="'.$soc->remise_client.'">%</td>'; + print '<td class="nowrap"><input type="text" size="1" name="remise_percent'.$i.'" value="'.$soc->remise_client.'">%</td>'; print '<td> </td>'; // Si le module service est actif, on propose des dates de debut et fin a la ligne if (! empty($conf->service->enabled)) { - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td class="nobordernopadding" nowrap="nowrap">'; + print '<td class="nobordernopadding nowrap">'; print $langs->trans('From').' '; - print '</td><td class="nobordernopadding" nowrap="nowrap">'; + print '</td><td class="nobordernopadding nowrap">'; print $form->select_date('','date_start'.$i,$usehm,$usehm,1,"add"); print '</td></tr>'; - print '<td class="nobordernopadding" nowrap="nowrap">'; + print '<td class="nobordernopadding nowrap">'; print $langs->trans('to').' '; - print '</td><td class="nobordernopadding" nowrap="nowrap">'; + print '</td><td class="nobordernopadding nowrap">'; print $form->select_date('','date_end'.$i,$usehm,$usehm,1,"add"); print '</td></tr></table>'; print '</td>'; @@ -3090,7 +3091,7 @@ else if ($id > 0 || ! empty($ref)) else print $langs->trans('ExcessReceived'); print ' :</td>'; print '<td align="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($resteapayeraffiche).'</b></td>'; - print '<td nowrap="nowrap"> </td></tr>'; + print '<td class="nowrap"> </td></tr>'; } else // Credit note { @@ -3108,7 +3109,7 @@ else if ($id > 0 || ! empty($ref)) else print $langs->trans('ExcessPaydBack'); print ' :</td>'; print '<td align="right" style="border: 1px solid;" bgcolor="#f0f0f0"><b>'.price($sign * $resteapayeraffiche).'</b></td>'; - print '<td nowrap="nowrap"> </td></tr>'; + print '<td class="nowrap"> </td></tr>'; // Sold credit note //print '<tr><td colspan="'.$nbcols.'" align="right">'.$langs->trans('TotalTTC').' :</td>'; diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php index 240ad867358..441da8c959e 100644 --- a/htdocs/compta/facture/impayees.php +++ b/htdocs/compta/facture/impayees.php @@ -332,7 +332,7 @@ if ($resql) print "<tr ".$bc[$var].">"; $classname = "impayee"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $facturestatic->id=$objp->facid; $facturestatic->ref=$objp->facnumber; @@ -341,12 +341,12 @@ if ($resql) print '<table class="nobordernopadding"><tr class="nocellnopadd">'; // Ref - print '<td class="nobordernopadding" nowrap="nowrap">'; + print '<td class="nobordernopadding nowrap">'; print $facturestatic->getNomUrl(1); print '</td>'; // Warning picto - print '<td width="20" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="20" class="nobordernopadding nowrap">'; if ($date_limit < ($now - $conf->facture->client->warning_delay) && ! $objp->paye && $objp->fk_statut == 1) print img_warning($langs->trans("Late")); print '</td>'; @@ -385,7 +385,7 @@ if ($resql) //print '<td align="right">'.((! empty($objp->am) || ! empty($cn))?price($objp->total_ttc-$objp->am-$cn):' ').'</td>'; // Status of invoice - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am); print '</td>'; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index 952fc760af5..ca2a94d35e2 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -322,7 +322,7 @@ if ($resql) $datelimit=$db->jdate($objp->datelimite); print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $facturestatic->id=$objp->facid; $facturestatic->ref=$objp->facnumber; @@ -332,7 +332,7 @@ if ($resql) print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td class="nobordernopadding" nowrap="nowrap">'; + print '<td class="nobordernopadding nowrap">'; print $facturestatic->getNomUrl(1,'',200,0,$notetoshow); print $objp->increment; print '</td>'; @@ -377,7 +377,7 @@ if ($resql) print '<td align="right">'.(! empty($paiement)?price($paiement).' '.$langs->getCurrencySymbol($conf->currency):' ').'</td>'; // Affiche statut de la facture - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$paiement,$objp->type); print "</td>"; //print "<td> </td>"; diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php index bfc50b11ae8..0b4a341e1c2 100644 --- a/htdocs/compta/facture/stats/index.php +++ b/htdocs/compta/facture/stats/index.php @@ -54,7 +54,8 @@ $endyear=$year; * View */ -$langs->load("bills"); +$langs->load("bills"); +$langs->load("companies"); $form=new Form($db); diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index ad4d032d5a9..5889d50e069 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -217,19 +217,19 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) while ($i < $num && $i < 20) { $obj = $db->fetch_object($resql); - print '<tr '.$bc[$var].'><td nowrap="nowrap">'; + print '<tr '.$bc[$var].'><td class="nowrap">'; $facturestatic->ref=$obj->facnumber; $facturestatic->id=$obj->rowid; $facturestatic->type=$obj->type; print $facturestatic->getNomUrl(1,''); print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $companystatic->id=$obj->socid; $companystatic->nom=$obj->nom; $companystatic->client=1; print $companystatic->getNomUrl(1,'',16); print '</td>'; - print '<td align="right" nowrap="nowrap">'.price($obj->total_ttc).'</td>'; + print '<td align="right" class="nowrap">'.price($obj->total_ttc).'</td>'; print '</tr>'; $tot_ttc+=$obj->total_ttc; $i++; @@ -369,16 +369,16 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $obj = $db->fetch_object($resql); print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="110" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="110" class="nobordernopadding nowrap">'; $facturestatic->ref=$obj->facnumber; $facturestatic->id=$obj->rowid; $facturestatic->type=$obj->type; print $facturestatic->getNomUrl(1,''); print '</td>'; - print '<td width="20" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="20" class="nobordernopadding nowrap">'; if ($obj->fk_statut == 1 && ! $obj->paye && $db->jdate($obj->datelimite) < ($now - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late")); print '</td>'; print '<td width="16" align="right" class="nobordernopadding">'; @@ -761,16 +761,16 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="110" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="110" class="nobordernopadding nowrap">'; print $commandestatic->getNomUrl(1); print '</td>'; - print '<td width="20" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="20" class="nobordernopadding nowrap">'; print ' '; print '</td>'; print '<td width="16" align="right" class="nobordernopadding">'; @@ -861,16 +861,16 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire) $obj = $db->fetch_object($resql); print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="110" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="110" class="nobordernopadding nowrap">'; $facturestatic->ref=$obj->facnumber; $facturestatic->id=$obj->rowid; $facturestatic->type=$obj->type; print $facturestatic->getNomUrl(1,''); print '</td>'; - print '<td width="20" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="20" class="nobordernopadding nowrap">'; if ($db->jdate($obj->datelimite) < ($now - $conf->facture->client->warning_delay)) print img_warning($langs->trans("Late")); print '</td>'; print '<td width="16" align="right" class="nobordernopadding">'; diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php index 2676dc78e94..d82e7fabad9 100644 --- a/htdocs/compta/localtax/clients.php +++ b/htdocs/compta/localtax/clients.php @@ -275,7 +275,7 @@ if (is_array($coll_list)) $diff = $x_paye_sum; print '<tr class="liste_total">'; print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>'; - print '<td class="liste_total" nowrap="nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n"; + print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n"; print "</tr>\n"; } diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php index 2d5e77a4065..0d46cd7ae11 100644 --- a/htdocs/compta/localtax/index.php +++ b/htdocs/compta/localtax/index.php @@ -59,7 +59,7 @@ function pt ($db, $sql, $date) $total = 0; print '<table class="noborder" width="100%">'; print '<tr class="liste_titre">'; - print '<td nowrap="nowrap" width="60%">'.$date.'</td>'; + print '<td class="nowrap" width="60%">'.$date.'</td>'; print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<td> </td>'."\n"; print "</tr>\n"; @@ -69,10 +69,10 @@ function pt ($db, $sql, $date) $obj = $db->fetch_object($result); $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'.$obj->dm."</td>\n"; + print '<td class="nowrap">'.$obj->dm."</td>\n"; $total = $total + $obj->mm; - print '<td nowrap="nowrap" align="right">'.price($obj->mm)."</td><td > </td>\n"; + print '<td class="nowrap" align="right">'.price($obj->mm)."</td><td > </td>\n"; print "</tr>\n"; $i++; @@ -179,9 +179,9 @@ for ($m = 1 ; $m < 13 ; $m++ ) if ($i > 2) { print '<tr class="liste_total">'; print '<td align="right">'.$langs->trans("SubTotal").':</td>'; - print '<td nowrap="nowrap" align="right">'.price($subtotalcoll).'</td>'; - print '<td nowrap="nowrap" align="right">'.price($subtotalpaye).'</td>'; - print '<td nowrap="nowrap" align="right">'.price($subtotalpaye).'</td>'; + print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td>'; + print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td>'; + print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td>'; print '<td> </td></tr>'; $i = 0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0; diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php index 0cc7e2008e6..78c81f9ab9c 100644 --- a/htdocs/compta/recap-compta.php +++ b/htdocs/compta/recap-compta.php @@ -151,7 +151,7 @@ if ($socid > 0) // Author $userstatic->id=$objf->userid; $userstatic->login=$objf->login; - print '<td nowrap="nowrap" align="right">'; + print '<td class="nowrap" align="right">'; print $userstatic->getLoginUrl(1); print '</td>'; @@ -191,7 +191,7 @@ if ($socid > 0) // Author $userstatic->id=$objp->userid; $userstatic->login=$objp->login; - print '<td nowrap="nowrap" align="right">'; + print '<td class="nowrap" align="right">'; print $userstatic->getLoginUrl(1); print '</td>'; diff --git a/htdocs/compta/sociales/index.php b/htdocs/compta/sociales/index.php index 516f1bb9326..2c5f1736d1b 100644 --- a/htdocs/compta/sociales/index.php +++ b/htdocs/compta/sociales/index.php @@ -204,7 +204,7 @@ if ($resql) // Due date print '<td width="110" align="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>'; - print '<td align="right" nowrap="nowrap">'.$chargesociale_static->LibStatut($obj->paye,5).'</a></td>'; + print '<td align="right" class="nowrap">'.$chargesociale_static->LibStatut($obj->paye,5).'</a></td>'; print '</tr>'; $i++; diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php index 64abd53ae15..2d90767cffb 100644 --- a/htdocs/compta/stats/index.php +++ b/htdocs/compta/stats/index.php @@ -352,7 +352,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++) // Montant total if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear,$maxyear))) { - print '<td align="right" nowrap="nowrap">'.($total[$annee]?price($total[$annee]):"0")."</td>"; + print '<td align="right" class="nowrap">'.($total[$annee]?price($total[$annee]):"0")."</td>"; } else { @@ -364,7 +364,7 @@ for ($annee = $year_start ; $annee <= $year_end ; $annee++) { if ($total[$annee-1] && $total[$annee]) { $percent=(round(($total[$annee]-$total[$annee-1])/$total[$annee-1],4)*100); - print '<td align="right" nowrap="nowrap">'.($percent>=0?"+$percent":"$percent").'%</td>'; + print '<td align="right" class="nowrap">'.($percent>=0?"+$percent":"$percent").'%</td>'; } if ($total[$annee-1] && ! $total[$annee]) { diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php index 956edd92ff7..a5e0e7fdbb9 100644 --- a/htdocs/compta/tva/clients.php +++ b/htdocs/compta/tva/clients.php @@ -316,7 +316,7 @@ if (is_array($coll_list)) $diff = $x_coll_sum - $x_paye_sum; print '<tr class="liste_total">'; print '<td class="liste_total" colspan="4">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>'; - print '<td class="liste_total" nowrap="nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n"; + print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n"; print "</tr>\n"; } diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php index 53473ed68ff..354d8c86535 100644 --- a/htdocs/compta/tva/index.php +++ b/htdocs/compta/tva/index.php @@ -64,7 +64,7 @@ function pt ($db, $sql, $date) $total = 0; print '<table class="noborder" width="100%">'; print '<tr class="liste_titre">'; - print '<td nowrap="nowrap" width="60%">'.$date.'</td>'; + print '<td class="nowrap" width="60%">'.$date.'</td>'; print '<td align="right">'.$langs->trans("Amount").'</td>'; print '<td> </td>'."\n"; print "</tr>\n"; @@ -74,10 +74,10 @@ function pt ($db, $sql, $date) $obj = $db->fetch_object($result); $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'.$obj->dm."</td>\n"; + print '<td class="nowrap">'.$obj->dm."</td>\n"; $total = $total + $obj->mm; - print '<td nowrap="nowrap" align="right">'.price($obj->mm)."</td><td > </td>\n"; + print '<td class="nowrap" align="right">'.price($obj->mm)."</td><td > </td>\n"; print "</tr>\n"; $i++; @@ -188,9 +188,9 @@ for ($m = 1 ; $m < 13 ; $m++ ) if ($i > 2) { print '<tr class="liste_total">'; print '<td align="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.($m/3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>'; - print '<td nowrap="nowrap" align="right">'.price($subtotalcoll).'</td>'; - print '<td nowrap="nowrap" align="right">'.price($subtotalpaye).'</td>'; - print '<td nowrap="nowrap" align="right">'.price($subtotal).'</td>'; + print '<td class="nowrap" align="right">'.price($subtotalcoll).'</td>'; + print '<td class="nowrap" align="right">'.price($subtotalpaye).'</td>'; + print '<td class="nowrap" align="right">'.price($subtotal).'</td>'; print '<td> </td></tr>'; $i = 0; $subtotalcoll=0; $subtotalpaye=0; $subtotal=0; diff --git a/htdocs/compta/tva/quadri.php b/htdocs/compta/tva/quadri.php index e5aa35a1c05..393a9ee4efc 100644 --- a/htdocs/compta/tva/quadri.php +++ b/htdocs/compta/tva/quadri.php @@ -293,13 +293,13 @@ if ($conf->global->COMPTA_MODE == "CREANCES-DETTES") } print '<tr class="liste_total">'; print '<td align="right">'.$langs->trans("Total").':</td>'; - print '<td nowrap="nowrap" align="right">'.price($subtot_coll_total).'</td>'; - print '<td nowrap="nowrap" align="right">'.price($subtot_coll_vat).'</td>'; + print '<td class="nowrap" align="right">'.price($subtot_coll_total).'</td>'; + print '<td class="nowrap" align="right">'.price($subtot_coll_vat).'</td>'; print '<td></td>'; - print '<td nowrap="nowrap" align="right">'.price($subtot_paye_total).'</td>'; - print '<td nowrap="nowrap" align="right">'.price($subtot_paye_vat).'</td>'; + print '<td class="nowrap" align="right">'.price($subtot_paye_total).'</td>'; + print '<td class="nowrap" align="right">'.price($subtot_paye_vat).'</td>'; print '<td></td>'; - print '<td nowrap="nowrap" align="right"><b>'.price($total).'</b>'; + print '<td class="nowrap" align="right"><b>'.price($total).'</b>'; print '</td>'; print '</tr>'; diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php index cf03b860ba6..88c1be06409 100644 --- a/htdocs/compta/tva/quadri_detail.php +++ b/htdocs/compta/tva/quadri_detail.php @@ -617,7 +617,7 @@ else $diff = $x_coll_sum - $x_paye_sum; print '<tr class="liste_total">'; print '<td class="liste_total" colspan="'.$span.'">'.$langs->trans("TotalToPay").($q?', '.$langs->trans("Quadri").' '.$q:'').'</td>'; - print '<td class="liste_total" nowrap="nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n"; + print '<td class="liste_total nowrap" align="right"><b>'.price(price2num($diff,'MT'))."</b></td>\n"; print "</tr>\n"; $i++; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index d3ef925158b..ae5a1190c49 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -1171,10 +1171,10 @@ else } if ($conf->margin->enabled) - print '<td align="right" nowrap="nowrap">'.price($objp->pa_ht).'</td>'; + print '<td align="right" class="nowrap">'.price($objp->pa_ht).'</td>'; // Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme) - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0)) { print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=move&rowid='.$objp->rowid.'">'; @@ -1272,7 +1272,7 @@ else print '</td>'; print '<td align="right"><input size="5" type="text" name="elprice" value="'.price($objp->subprice).'"></td>'; print '<td align="center"><input size="2" type="text" name="elqty" value="'.$objp->qty.'"></td>'; - print '<td align="right" nowrap="nowrap"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>'; + print '<td align="right" class="nowrap"><input size="1" type="text" name="elremise_percent" value="'.$objp->remise_percent.'">%</td>'; if ($conf->margin->enabled) { print '<td align="right">'; if ($objp->fk_product) diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index 2e9ab1b1cb6..845eaad86bb 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -334,7 +334,7 @@ if ($result) $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td width="110" nowrap="nowrap">'; + print '<td width="110" class="nowrap">'; $staticcontrat->ref=($obj->ref?$obj->ref:$obj->cid); $staticcontrat->id=$obj->cid; print $staticcontrat->getNomUrl(1,16); @@ -400,7 +400,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td width="110" nowrap="nowrap">'; + print '<td width="110" class="nowrap">'; $staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat); $staticcontrat->id=$obj->fk_contrat; print $staticcontrat->getNomUrl(1,16); @@ -426,7 +426,7 @@ if ($resql) $staticcompany->nom=$obj->nom; print $staticcompany->getNomUrl(1,'',20); print '</td>'; - print '<td nowrap="nowrap" align="right"><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">'; + print '<td class="nowrap" align="right"><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">'; $dateend=$db->jdate($obj->date_fin_validite); print $staticcontratligne->LibStatut($obj->statut, 3, ($dateend && $dateend < $now)?1:0); print '</a></td>'; @@ -481,12 +481,12 @@ if ($resql) $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td width="110" nowrap="nowrap">'; + print '<td width="110" class="nowrap">'; $staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat); $staticcontrat->id=$obj->fk_contrat; print $staticcontrat->getNomUrl(1,16); print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; if ($obj->fk_product > 0) { $productstatic->id=$obj->fk_product; @@ -561,12 +561,12 @@ if ($resql) $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td width="110" nowrap="nowrap">'; + print '<td width="110" class="nowrap">'; $staticcontrat->ref=($obj->ref?$obj->ref:$obj->fk_contrat); $staticcontrat->id=$obj->fk_contrat; print $staticcontrat->getNomUrl(1,16); print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; if ($obj->fk_product > 0) { $productstatic->id=$obj->fk_product; diff --git a/htdocs/contrat/liste.php b/htdocs/contrat/liste.php index 2155b3d9720..2042b5c45f7 100644 --- a/htdocs/contrat/liste.php +++ b/htdocs/contrat/liste.php @@ -133,7 +133,7 @@ if ($resql) $obj = $db->fetch_object($resql); $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap"><a href="fiche.php?id='.$obj->cid.'">'; + print '<td class="nowrap"><a href="fiche.php?id='.$obj->cid.'">'; print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .'</a>'; if ($obj->nb_late) print img_warning($langs->trans("Late")); print '</td>'; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 868b8cc1a0d..ea42df9e01d 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -247,7 +247,7 @@ if ($resql) if ($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < ($now - $conf->contrat->services->expires->warning_delay) && $obj->statut < 5) print img_warning($langs->trans("Late")); else print ' '; print '</td>'; - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; if ($obj->cstatut == 0) // If contract is draft, we say line is also draft { print $contractstatic->LibStatut(0,5,($obj->date_fin_validite && $db->jdate($obj->date_fin_validite) < $now)); diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php index 6c6a6d8d036..cbc8e7ee5b7 100644 --- a/htdocs/core/boxes/box_actions.php +++ b/htdocs/core/boxes/box_actions.php @@ -114,7 +114,7 @@ class box_actions extends ModeleBoxes 'text' => dol_trunc($objp->nom,24), 'url' => DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid); - $this->info_box_contents[$i][4] = array('td' => 'align="left" nowrap="nowrap"', + $this->info_box_contents[$i][4] = array('td' => 'align="left" class="nowrap"', 'text' => dol_print_date($datelimite, "dayhour")); $this->info_box_contents[$i][5] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php index cf2ee151ebe..7dea6ed7f04 100644 --- a/htdocs/core/boxes/box_contracts.php +++ b/htdocs/core/boxes/box_contracts.php @@ -114,7 +114,7 @@ class box_contracts extends ModeleBoxes $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => dol_print_date($datec,'day')); - $this->info_box_contents[$i][5] = array('td' => 'align="right" nowrap="nowrap"', + $this->info_box_contents[$i][5] = array('td' => 'align="right" class="nowrap"', 'text' => $contractstatic->getLibStatut(6), 'asis'=>1 ); diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php index 78a81139654..765224baccc 100644 --- a/htdocs/core/boxes/box_ficheinter.php +++ b/htdocs/core/boxes/box_ficheinter.php @@ -112,7 +112,7 @@ class box_ficheinter extends ModeleBoxes $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => dol_print_date($datec,'day')); - $this->info_box_contents[$i][5] = array('td' => 'align="right" nowrap="nowrap"', + $this->info_box_contents[$i][5] = array('td' => 'align="right" class="nowrap"', 'text' => $ficheinterstatic->getLibStatut(6), 'asis'=>1 ); diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php index 7eda1bc04b3..c9e668b271e 100644 --- a/htdocs/core/boxes/box_produits.php +++ b/htdocs/core/boxes/box_produits.php @@ -120,7 +120,7 @@ class box_produits extends ModeleBoxes $this->info_box_contents[$i][2] = array('td' => 'align="right"', 'text' => $price); - $this->info_box_contents[$i][3] = array('td' => 'align="left" nowrap="nowrap"', + $this->info_box_contents[$i][3] = array('td' => 'align="left" class="nowrap"', 'text' => $price_base_type); $this->info_box_contents[$i][4] = array('td' => 'align="right"', diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php index 57c2cc4de4c..a003451d8e9 100644 --- a/htdocs/core/boxes/box_produits_alerte_stock.php +++ b/htdocs/core/boxes/box_produits_alerte_stock.php @@ -127,7 +127,7 @@ class box_produits_alerte_stock extends ModeleBoxes $this->info_box_contents[$i][2] = array('td' => 'align="right"', 'text' => $price); - $this->info_box_contents[$i][3] = array('td' => 'align="left" nowrap="nowrap"', + $this->info_box_contents[$i][3] = array('td' => 'align="left" class="nowrap"', 'text' => $price_base_type); $this->info_box_contents[$i][4] = array('td' => 'align="center"', diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index c930fece2e5..cf9e7f6fd32 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -164,7 +164,7 @@ class ModeleBoxes // Can't be abtract as it is instanciated to build "empty" } if ($conf->use_javascript_ajax) { - print '</td><td class="nocellnopadd boxclose" nowrap="nowrap">'; + print '</td><td class="nocellnopadd boxclose nowrap">'; // The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object print img_picto($langs->trans("MoveBox",$this->box_id),'grip','class="boxhandle hideonsmartphone" style="cursor:move;"'); print img_picto($langs->trans("Close",$this->box_id),'close','class="boxclose" rel="x:y" style="cursor:pointer;" id="imgclose'.$this->box_id.'"'); diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 01165bb466a..5b47b3811fb 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -2744,7 +2744,7 @@ abstract class CommonObject print '<td width="10"></td>'; - print '<td nowrap="nowrap"></td>'; // No width to allow autodim + print '<td class="nowrap"></td>'; // No width to allow autodim print "</tr>\n"; diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 49f7268b875..003045d737f 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -103,7 +103,7 @@ class Form } else { - $ret.='<table class="nobordernopadding" width="100%"><tr><td nowrap="nowrap">'; + $ret.='<table class="nobordernopadding" width="100%"><tr><td class="nowrap">'; $ret.=$langs->trans($text); $ret.='</td>'; if (GETPOST('action') != 'edit'.$htmlname && $perm) $ret.='<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&id='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'),1).'</a></td>'; @@ -2878,7 +2878,7 @@ class Form print '<input type="hidden" name="action" value="setabsolutediscount">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">'; - print '<tr><td nowrap="nowrap">'; + print '<tr><td class="nowrap">'; if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) { if (! $filter || $filter=="fk_facture_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->currency)).': '; // If we want deposit to be substracted to payments only and not to total of final invoice @@ -2893,7 +2893,7 @@ class Form if ($filter) $newfilter.=' AND ('.$filter.')'; $nbqualifiedlines=$this->select_remises($selected,$htmlname,$newfilter,$socid,$maxvalue); print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; if ($nbqualifiedlines > 0) { print ' <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"'; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 699977c05ff..f9c7b54b12c 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -91,7 +91,7 @@ class FormFile if (! empty($options)) print '<td>'.$options.'</td>'; - print '<td valign="middle" nowrap="nowrap">'; + print '<td valign="middle" class="nowrap">'; $max=$conf->global->MAIN_UPLOAD_DOC; // En Kb $maxphp=@ini_get('upload_max_filesize'); // En inconnu @@ -479,7 +479,7 @@ class FormFile $out.= "<tr ".$bc[$var].">"; // Show file name with link to download - $out.= '<td nowrap="nowrap">'; + $out.= '<td class="nowrap">'; $out.= '<a data-ajax="false" href="'.DOL_URL_ROOT . '/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'"'; $mime=dol_mimetype($relativepath,'',0); if (preg_match('/text/',$mime)) $out.= ' target="_blank"'; @@ -490,11 +490,11 @@ class FormFile // Show file size $size=(! empty($file['size'])?$file['size']:dol_filesize($filedir."/".$file["name"])); - $out.= '<td align="right" nowrap="nowrap">'.dol_print_size($size).'</td>'; + $out.= '<td align="right" class="nowrap">'.dol_print_size($size).'</td>'; // Show file date $date=(! empty($file['date'])?$file['date']:dol_filemtime($filedir."/".$file["name"])); - $out.= '<td align="right" nowrap="nowrap">'.dol_print_date($date, 'dayhour').'</td>'; + $out.= '<td align="right" class="nowrap">'.dol_print_date($date, 'dayhour').'</td>'; if ($delallowed) { diff --git a/htdocs/core/filemanagerdol/browser/default/frmupload.php b/htdocs/core/filemanagerdol/browser/default/frmupload.php index 18496585bd2..dd58eded713 100755 --- a/htdocs/core/filemanagerdol/browser/default/frmupload.php +++ b/htdocs/core/filemanagerdol/browser/default/frmupload.php @@ -124,12 +124,12 @@ window.onload = function() <form id="frmUpload" action="" target="frmUploadWorker" method="post" enctype="multipart/form-data" onsubmit="return OnSubmit();"> <table class="fullHeight" cellspacing="0" cellpadding="0" width="100%" border="0"> <tr> - <td nowrap="nowrap"> + <td class="nowrap"> <span id="eUploadMessage">Upload a new file in this folder</span><br> <table cellspacing="0" cellpadding="0" width="100%" border="0"> <tr> <td width="100%"><input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file"></td> - <td nowrap="nowrap"> <input id="btnUpload" type="submit" value="Upload"></td> + <td class="nowrap"> <input id="btnUpload" type="submit" value="Upload"></td> </tr> </table> </td> diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index a11fdac4dda..2e2d764b861 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -60,40 +60,40 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt print '<table class="nobordernopadding" width="100%">'; if ($canedit || ! empty($conf->projet->enabled)) { - print '<tr><td nowrap="nowrap">'; + print '<tr><td class="nowrap">'; print '<table class="nobordernopadding">'; if ($canedit) { print '<tr>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $langs->trans("ActionsAskedBy"); - print ' </td><td nowrap="nowrap">'; + print ' </td><td class="nowrap">'; print $form->select_dolusers($filtera,'userasked',1,'',!$canedit); print '</td>'; print '</tr>'; print '<tr>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $langs->trans("or").' '.$langs->trans("ActionsToDoBy"); - print ' </td><td nowrap="nowrap">'; + print ' </td><td class="nowrap">'; print $form->select_dolusers($filtert,'usertodo',1,'',!$canedit); print '</td></tr>'; print '<tr>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $langs->trans("or").' '.$langs->trans("ActionsDoneBy"); - print ' </td><td nowrap="nowrap">'; + print ' </td><td class="nowrap">'; print $form->select_dolusers($filterd,'userdone',1,'',!$canedit); print '</td></tr>'; include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php'; $formactions=new FormActions($db); print '<tr>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $langs->trans("Type"); - print ' </td><td nowrap="nowrap">'; + print ' </td><td class="nowrap">'; print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0)); @@ -103,9 +103,9 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt if (! empty($conf->projet->enabled) && $user->rights->projet->lire) { print '<tr>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $langs->trans("Project").' '; - print '</td><td nowrap="nowrap">'; + print '</td><td class="nowrap">'; select_projects($socid?$socid:-1, $pid, 'projectid', 64); print '</td></tr>'; } @@ -114,7 +114,7 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt print '</td>'; // Buttons - print '<td align="center" valign="middle" nowrap="nowrap">'; + print '<td align="center" valign="middle" class="nowrap">'; print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" class="button" style="width:120px" name="viewcal" value="'.$langs->trans("ViewCal").'">'; print '<br>'; print img_picto($langs->trans("ViewWeek"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" class="button" style="width:120px" name="viewweek" value="'.$langs->trans("ViewWeek").'">'; @@ -127,7 +127,7 @@ function print_actions_filter($form,$canedit,$status,$year,$month,$day,$showbirt // Legend if ($conf->use_javascript_ajax && is_array($showextcals)) { - print '<td align="center" valign="middle" nowrap="nowrap">'; + print '<td align="center" valign="middle" class="nowrap">'; print '<script type="text/javascript">'."\n"; print 'jQuery(document).ready(function () {'."\n"; print 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });'."\n"; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index a684046b180..ccd8ed36c79 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -807,7 +807,7 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0) $out.="<tr ".$bc[$var].">"; - $out.='<td width="120" align="left" nowrap="nowrap">'.dol_print_date($datep,'dayhour')."</td>\n"; + $out.='<td width="120" align="left" class="nowrap">'.dol_print_date($datep,'dayhour')."</td>\n"; // Picto warning $out.='<td width="16">'; @@ -840,14 +840,14 @@ function show_actions_todo($conf,$langs,$db,$object,$objcon='',$noprint=0) $out.='<td> </td>'; } - $out.='<td width="80" nowrap="nowrap">'; + $out.='<td width="80" class="nowrap">'; $userstatic->id=$obj->fk_user_author; $userstatic->login=$obj->login; $out.=$userstatic->getLoginUrl(1); $out.='</td>'; // Statut - $out.='<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>'; + $out.='<td class="nowrap" width="20">'.$actionstatic->LibStatut($obj->percent,3).'</td>'; $out.="</tr>\n"; $i++; @@ -1050,7 +1050,7 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0) $out.="<tr ".$bc[$var].">"; // Champ date - $out.='<td width="120" nowrap="nowrap">'; + $out.='<td width="120" class="nowrap">'; if ($histo[$key]['date']) $out.=dol_print_date($histo[$key]['date'],'dayhour'); else if ($histo[$key]['datestart']) $out.=dol_print_date($histo[$key]['datestart'],'dayhour'); $out.="</td>\n"; @@ -1125,14 +1125,14 @@ function show_actions_done($conf,$langs,$db,$object,$objcon='',$noprint=0) } // Auteur - $out.='<td nowrap="nowrap" width="80">'; + $out.='<td class="nowrap" width="80">'; $userstatic->id=$histo[$key]['userid']; $userstatic->login=$histo[$key]['login']; $out.=$userstatic->getLoginUrl(1); $out.='</td>'; // Statut - $out.='<td nowrap="nowrap" width="20">'.$actionstatic->LibStatut($histo[$key]['percent'],3).'</td>'; + $out.='<td class="nowrap" width="20">'.$actionstatic->LibStatut($histo[$key]['percent'],3).'</td>'; $out.="</tr>\n"; $i++; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 7f4be0bc8a3..76323b4eb40 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -467,7 +467,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t print '<td></td>'; print '<td></td>'; if ($addordertick) print '<td class="hideonsmartphone"></td>'; - print '<td align="right" nowrap="nowrap" class="liste_total">'.convertSecondToTime($total).'</td>'; + print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total).'</td>'; print '</tr>'; } @@ -576,7 +576,7 @@ function projectLinesb(&$inc, $parent, $lines, &$level, &$projectsrole, &$tasksr $disabledtask=1; } - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $s =$form->select_date('',$lines[$i]->id,'','','',"addtime",1,0,1,$disabledtask); $s.=' '; $s.=$form->select_duration($lines[$i]->id,'',$disabledtask); @@ -772,7 +772,7 @@ function print_projecttasks_array($db, $socid, $projectsListId, $mytasks=0) { $var=!$var; print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $projectstatic->ref=$objp->ref; print $projectstatic->getNomUrl(1); print ' - '.$objp->title.'</td>'; diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php index 2d4728c07d4..10dffc40faa 100644 --- a/htdocs/core/lib/sendings.lib.php +++ b/htdocs/core/lib/sendings.lib.php @@ -195,7 +195,7 @@ function show_list_sending_receive($origin,$origin_id,$filter='') print "<tr $bc[$var]>"; // Sending id - print '<td align="left" nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.'<a></td>'; + print '<td align="left" class="nowrap"><a href="'.DOL_URL_ROOT.'/expedition/fiche.php?id='.$objp->expedition_id.'">'.img_object($langs->trans("ShowSending"),'sending').' '.$objp->exp_ref.'<a></td>'; // Description if ($objp->fk_product > 0) @@ -267,10 +267,10 @@ function show_list_sending_receive($origin,$origin_id,$filter='') //print '<td align="center">'.$objp->qty_asked.'</td>'; // Date creation - print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($objp->date_creation),'day').'</td>'; + print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_creation),'day').'</td>'; // Date shipping creation - print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($objp->date_delivery),'day').'</td>'; + print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($objp->date_delivery),'day').'</td>'; // Qty shipped print '<td align="center">'.$objp->qty_shipped.'</td>'; diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php index 10099ab7feb..041234bf206 100644 --- a/htdocs/core/lib/usergroups.lib.php +++ b/htdocs/core/lib/usergroups.lib.php @@ -257,7 +257,7 @@ function show_theme($fuser,$edit=0,$foruserprofile=false) print '<tr '.$bc[$var].'>'; print '<td>'.$langs->trans("DefaultSkin").'</td>'; print '<td>'.$conf->global->MAIN_THEME.'</td>'; - print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>'; + print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>'; print '<td> </td>'; print '</tr>'; } diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php index d82c4889335..959e5ffe51b 100644 --- a/htdocs/core/menus/standard/auguria_menu.php +++ b/htdocs/core/menus/standard/auguria_menu.php @@ -183,6 +183,7 @@ class MenuManager { $res=print_auguria_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1); + print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n"; foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' { print '<ul data-role="listview" data-inset="true">'; @@ -206,11 +207,16 @@ class MenuManager //var_dump($canonrelurl); //var_dump($canonnexturl); print '<ul>'."\n"; - if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')) - || strpos($canonrelurl,'/product/index.php') || strpos($canonrelurl,'/compta/bank/index.php')) + if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))) + || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false)) { - // We add sub entry - print str_pad('',1).'<li data-role="list-divider" class="lilevel1"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n"; + // We add sub entry + print str_pad('',1).'<li data-role="list-divider" class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic + print '<a href="'.$relurl.'">'; + print str_pad('',12,' '); + print $langs->trans(ucfirst($val['mainmenu'])."Dashboard"); + print '</a>'; + print '</li>'."\n"; } foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' { @@ -220,7 +226,8 @@ class MenuManager $canonurl2=preg_replace('/\?.*$/','',$val2['url']); //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']); if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2=''; - print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).'">'; + if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic + else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">'; // ui-btn to highlight on clic if ($relurl2) print '<a href="'.$relurl2.'">'; print str_pad('',($val2['level']+1)*12,' '); print $val2['titre']; diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php index 935546ce846..89df28fee5c 100644 --- a/htdocs/core/menus/standard/eldy_menu.php +++ b/htdocs/core/menus/standard/eldy_menu.php @@ -137,6 +137,7 @@ class MenuManager { $res=print_eldy_menu($this->db,$this->atarget,$this->type_user,$this->tabMenu,$this->menu,1); + print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n"; foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' { print '<ul data-role="listview" data-inset="true">'; @@ -157,14 +158,19 @@ class MenuManager $canonrelurl=preg_replace('/\?.*$/','',$relurl); $canonnexturl=preg_replace('/\?.*$/','',$nexturl); - //var_dump($canonrelurl); + //var_dump($canonrelurl); //var_dump($canonnexturl); print '<ul>'."\n"; - if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')) - || strpos($canonrelurl,'/product/index.php') || strpos($canonrelurl,'/compta/bank/index.php')) + if (($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools'))) + || (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false)) { // We add sub entry - print str_pad('',1).'<li data-role="list-divider" class="lilevel1"><a href="'.$relurl.'">'.$langs->trans(ucfirst($val['mainmenu'])."Dashboard").'</a></li>'."\n"; + print str_pad('',1).'<li data-role="list-divider" class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic + print '<a href="'.$relurl.'">'; + print str_pad('',12,' '); + print $langs->trans(ucfirst($val['mainmenu'])."Dashboard"); + print '</a>'; + print '</li>'."\n"; } foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' { @@ -174,9 +180,10 @@ class MenuManager $canonurl2=preg_replace('/\?.*$/','',$val2['url']); //var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']); if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2=''; - print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).'">'; + if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic + else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">'; // ui-btn to highlight on clic if ($relurl2) print '<a href="'.$relurl2.'">'; - print str_pad('',($val2['level']+1)*12,' '); + print str_pad('',($val2['level']+1)*12,' '); print $val2['titre']; if ($relurl2) print '</a>'; print '</li>'."\n"; diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html index 5e6bcd510e4..2f21e1c0afe 100644 --- a/htdocs/core/modules/dons/html_cerfafr.html +++ b/htdocs/core/modules/dons/html_cerfafr.html @@ -11,21 +11,21 @@ <table width="100%" border="0" cellspacing="0" cellpadding="1" bgcolor="#ffffff"> <tr> - <td width="15%" nowrap="nowrap" valign="middle">Cerfa No 11580 01</td> + <td width="15%" class="nowrap" valign="middle">Cerfa No 11580 01</td> - <td nowrap="nowrap" align="center" valign="middle"> + <td class="nowrap" align="center" valign="middle"> <font size="+2">__DonationReceipt__</font><br> __FrenchArticle__ </td> - <td width="15%" nowrap="nowrap" align="center" valign="middle"> + <td width="15%" class="nowrap" align="center" valign="middle"> __DonationRef__ <table width="100%" border="0" bgcolor="#000000" cellspacing="0" cellpadding="3"> <tr bgcolor="#ffffff" align="center"> <td nowrap> <table border="0" cellspacing="0" cellpadding="1"> <tr> - <td width="40" nowrap="nowrap">No:</td> + <td width="40" class="nowrap">No:</td> <td align="center">__REF__ </td> </tr> </table> diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index fff8df198d2..33a488f5807 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -60,7 +60,7 @@ $userstatic=new User($db); <input type="hidden" name="source" value="internal" /> <tr <?php echo $bc[$var]; ?>> - <td nowrap="nowrap"><?php echo img_object('','user').' '.$langs->trans("Users"); ?></td> + <td class="nowrap"><?php echo img_object('','user').' '.$langs->trans("Users"); ?></td> <td><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></td> <td><?php echo $form->select_users($user->id,'userid',0,(! empty($userAlreadySelected)?$userAlreadySelected:'')); ?></td> <td><?php echo $formcompany->selectTypeContact($object, '', 'type','internal'); ?></td> @@ -77,7 +77,7 @@ $userstatic=new User($db); <?php $var=!$var; ?> <tr <?php echo $bc[$var]; ?>> - <td nowrap="nowrap"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></td> + <td class="nowrap"><?php echo img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); ?></td> <?php if ($conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) { ?> <td> <?php @@ -176,7 +176,7 @@ $userstatic=new User($db); <?php echo $contactstatic->LibStatut($tab[$i]['status'],3); ?> <?php if ($object->statut >= 0) echo '</a>'; ?> </td> - <td align="center" nowrap="nowrap" colspan="2"> + <td align="center" class="nowrap" colspan="2"> <?php if ($permission) { ?> <a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletecontact&lineid='.$tab[$i]['rowid']; ?>"><?php echo img_delete(); ?></a> <?php } ?> diff --git a/htdocs/core/tpl/freeproductline_create.tpl.php b/htdocs/core/tpl/freeproductline_create.tpl.php index 7c6268d30cd..666b0d59896 100644 --- a/htdocs/core/tpl/freeproductline_create.tpl.php +++ b/htdocs/core/tpl/freeproductline_create.tpl.php @@ -100,7 +100,7 @@ if (! empty($conf->margin->enabled) && ! empty($object->element) && in_array($ob <td align="right"><input type="text" size="5" name="price_ht" value="<?php echo (isset($_POST["price_ht"])?$_POST["price_ht"]:''); ?>"> </td> <td align="right"><input type="text" size="2" name="qty" value="<?php echo (isset($_POST["qty"])?$_POST["qty"]:1); ?>"></td> - <td align="right" nowrap="nowrap"><input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" name="remise_percent"><span class="hideonsmartphone">%</span></td> + <td align="right" class="nowrap"><input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" name="remise_percent"><span class="hideonsmartphone">%</span></td> <?php $colspan = 4; if (! empty($usemargins)) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 7f10efcc1ec..2ad1d1f7bb2 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -73,13 +73,13 @@ $(document).ready(function () { <!-- Login --> <tr> <td valign="bottom" class="loginfield"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong></td> -<td valign="bottom" nowrap="nowrap"> +<td valign="bottom" class="nowrap"> <input type="text" id="username" name="username" class="flat" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" /> </td> </tr> <!-- Password --> -<tr><td valign="top" class="loginfield" nowrap="nowrap"><strong><label for="password"><?php echo $langs->trans('Password'); ?></label></strong></td> -<td valign="top" nowrap="nowrap"> +<tr><td valign="top" class="loginfield nowrap"><strong><label for="password"><?php echo $langs->trans('Password'); ?></label></strong></td> +<td valign="top" class="nowrap"> <input id="password" name="password" class="flat" type="password" size="15" maxlength="30" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="off" /> </td></tr> <?php @@ -95,8 +95,8 @@ if (! empty($hookmanager->resArray['options'])) { ?> <?php if ($captcha) { ?> <!-- Captcha --> - <tr><td valign="middle" class="loginfield" nowrap="nowrap"><b><?php echo $langs->trans('SecurityCode'); ?></b></td> - <td valign="top" nowrap="nowrap" align="left" class="none"> + <tr><td valign="middle" class="loginfield nowrap"><b><?php echo $langs->trans('SecurityCode'); ?></b></td> + <td valign="top" class="nowrap none" align="left"> <table class="login_table_securitycode" style="width: 100px;"><tr> <td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="4" /></td> diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php index 6a7cffcb3fc..ebf63f6b08d 100644 --- a/htdocs/core/tpl/objectline_add.tpl.php +++ b/htdocs/core/tpl/objectline_add.tpl.php @@ -160,7 +160,7 @@ if (! empty($conf->margin->enabled)) { <input type="hidden" id="origin_price_ttc_cache" name="origin_price_ttc_cache" value="" /> </td> <td align="right"><input type="text" size="3" id="qty" name="qty" value="<?php echo (GETPOST('qty')?GETPOST('qty'):1); ?>"></td> - <td align="right" nowrap="nowrap"> + <td align="right" class="nowrap"> <input type="text" size="1" value="<?php echo $buyer->remise_client; ?>" id="remise_percent" name="remise_percent">% <input type="hidden" id="origin_remise_percent" name="origin_remise_percent" value="<?php echo $buyer->remise_client; ?>" /> </td> diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php index 059cf7b83d4..4fd05e4679c 100644 --- a/htdocs/core/tpl/objectline_view.tpl.php +++ b/htdocs/core/tpl/objectline_view.tpl.php @@ -95,15 +95,15 @@ ?> </td> - <td align="right" nowrap="nowrap"><?php echo vatrate($line->tva_tx,'%',$line->info_bits); ?></td> + <td align="right" class="nowrap"><?php echo vatrate($line->tva_tx,'%',$line->info_bits); ?></td> - <td align="right" nowrap="nowrap"><?php echo price($line->subprice); ?></td> + <td align="right" class="nowrap"><?php echo price($line->subprice); ?></td> <?php if ($conf->global->MAIN_FEATURES_LEVEL > 1) { ?> - <td align="right" nowrap="nowrap"> </td> + <td align="right" class="nowrap"> </td> <?php } ?> - <td align="right" nowrap="nowrap"> + <td align="right" class="nowrap"> <?php if ((($line->info_bits & 2) != 2) && $line->special_code != 3) { // I comment this because it shows info even when not required // for example always visible on invoice but must be visible only if stock module on and stock decrease option is on invoice validation and status is not validated @@ -121,19 +121,19 @@ if (! empty($conf->margin->enabled)) { ?> - <td align="right" nowrap="nowrap"><?php echo price($line->pa_ht); ?></td> + <td align="right" class="nowrap"><?php echo price($line->pa_ht); ?></td> <?php if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {?> - <td align="right" nowrap="nowrap"><?php echo (($line->pa_ht == 0)?'n/a':price($line->marge_tx).'%'); ?></td> + <td align="right" class="nowrap"><?php echo (($line->pa_ht == 0)?'n/a':price($line->marge_tx).'%'); ?></td> <?php } if (! empty($conf->global->DISPLAY_MARK_RATES)) {?> - <td align="right" nowrap="nowrap"><?php echo price($line->marque_tx).'%'; ?></td> + <td align="right" class="nowrap"><?php echo price($line->marque_tx).'%'; ?></td> <?php } } ?> <?php if ($line->special_code == 3) { ?> - <td align="right" nowrap="nowrap"><?php echo $langs->trans('Option'); ?></td> + <td align="right" class="nowrap"><?php echo $langs->trans('Option'); ?></td> <?php } else { ?> - <td align="right" nowrap="nowrap"><?php echo price($line->total_ht); ?></td> + <td align="right" class="nowrap"><?php echo price($line->total_ht); ?></td> <?php } ?> <?php if ($this->statut == 0 && $user->rights->$element->creer) { ?> diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index ebb987a954a..29df45e6ebc 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -60,8 +60,8 @@ $(document).ready(function () { <!-- Login --> <tr> -<td valign="bottom" class="loginfield" nowrap="nowrap"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong></td> -<td valign="bottom" nowrap="nowrap"> +<td valign="bottom" class="loginfield nowrap"><strong><label for="username"><?php echo $langs->trans('Login'); ?></label></strong></td> +<td valign="bottom" class="nowrap"> <input type="text" <?php echo $disabled; ?> id="username" name="username" class="flat" size="15" maxlength="40" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" /> </td> </tr> @@ -80,8 +80,8 @@ if (! empty($hookmanager->resArray['options'])) { <?php if ($captcha) { ?> <!-- Captcha --> - <tr><td valign="middle" class="loginfield" nowrap="nowrap"><strong><label for="securitycode"><?php echo $langs->trans('SecurityCode'); ?></label></strong></td> - <td valign="top" nowrap="nowrap" align="left" class="none"> + <tr><td valign="middle" class="loginfield nowrap"><strong><label for="securitycode"><?php echo $langs->trans('SecurityCode'); ?></label></strong></td> + <td valign="top" class="nowrap none" align="left"> <table class="login_table_securitycode" style="width: 100px;"><tr> <td><input id="securitycode" class="flat" type="text" size="6" maxlength="5" name="code" tabindex="4" /></td> diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php index 73e2da6ea0d..c907cf89ba0 100644 --- a/htdocs/expedition/contact.php +++ b/htdocs/expedition/contact.php @@ -263,7 +263,7 @@ if ($id > 0 || ! empty($ref)) // Ligne ajout pour contact interne print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print img_object('','user').' '.$langs->trans("Users"); print '</td>'; @@ -292,7 +292,7 @@ if ($id > 0 || ! empty($ref)) $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); print '</td>'; @@ -397,7 +397,7 @@ if ($id > 0 || ! empty($ref)) print '</td>'; // Icon update et delete - print '<td align="center" nowrap="nowrap" colspan="2">'; + print '<td align="center" class="nowrap" colspan="2">'; if ($object->statut < 5 && $user->rights->expedition->creer) { print ' '; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index 1d4fc31d706..3153a9a9ef2 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -145,7 +145,7 @@ if ($resql) $var=!$var; $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $orderstatic->id=$obj->rowid; $orderstatic->ref=$obj->ref; print $orderstatic->getNomUrl(1); diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index b40988ca571..721196bdb1e 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -540,7 +540,7 @@ if ($step == 2 && $datatoexport) $entityicon=(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity); $entitylang=(! empty($entitytolang[$entity])?$entitytolang[$entity]:$entity); - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; // If value of entityicon=entitylang='icon:Label' $tmparray=explode(':',$entityicon); if (count($tmparray) >=2) @@ -704,7 +704,7 @@ if ($step == 3 && $datatoexport) $entityicon=(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity); $entitylang=(! empty($entitytolang[$entity])?$entitytolang[$entity]:$entity); - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; // If value of entityicon=entitylang='icon:Label' $tmparray=explode(':',$entityicon); if (count($tmparray) >=2) @@ -871,7 +871,7 @@ if ($step == 4 && $datatoexport) $entityicon=(! empty($entitytoicon[$entity])?$entitytoicon[$entity]:$entity); $entitylang=(! empty($entitytolang[$entity])?$entitytolang[$entity]:$entity); - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; // If value of entityicon=entitylang='icon:Label' $tmparray=explode(':',$entityicon); if (count($tmparray) >=2) diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index df85821229d..d37f9ad336e 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -135,7 +135,7 @@ foreach($liste as $key => $val) $text=$model->getDriverDescForKey($key); print '<td>'.$form->textwithpicto($model->getDriverLabelForKey($key),$text).'</td>'; print '<td>'.$model->getLibLabelForKey($key).'</td>'; - print '<td nowrap="nowrap" align="right">'.$model->getLibVersionForKey($key).'</td>'; + print '<td class="nowrap" align="right">'.$model->getLibVersionForKey($key).'</td>'; print '</tr>'; } diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php index 0684c4695ce..941b5232f54 100644 --- a/htdocs/fichinter/fiche.php +++ b/htdocs/fichinter/fiche.php @@ -1288,7 +1288,7 @@ else if ($id > 0 || ! empty($ref)) print '</td>'; // Date d'intervention - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; $form->select_date($db->jdate($objp->date_intervention),'di',1,1,0,"date_intervention"); print '</td>'; @@ -1343,7 +1343,7 @@ else if ($id > 0 || ! empty($ref)) print '</td>'; // Date intervention - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; $now=dol_now(); $timearray=dol_getdate($now); if (!GETPOST('diday','int')) $timewithnohour=dol_mktime(0,0,0,$timearray['mon'],$timearray['mday'],$timearray['year']); diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 936338ec2bc..a96187dc41d 100755 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -153,7 +153,7 @@ if ($result) $i++; } print '<tr class="liste_total"><td colspan="5" class="liste_total">'.$langs->trans("Total").'</td>'; - print '<td align="right" nowrap="nowrap" class="liste_total">'.convertSecondToTime($total).'</td><td> </td>'; + print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total).'</td><td> </td>'; print '</tr>'; print '</table>'; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index cad571686e8..cbe5388164e 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -1446,22 +1446,22 @@ elseif (! empty($object->id)) print '</td>'; - print '<td align="right" nowrap="nowrap">'.vatrate($line->tva_tx).'%</td>'; + print '<td align="right" class="nowrap">'.vatrate($line->tva_tx).'%</td>'; - print '<td align="right" nowrap="nowrap">'.price($line->subprice)."</td>\n"; + print '<td align="right" class="nowrap">'.price($line->subprice)."</td>\n"; - print '<td align="right" nowrap="nowrap">'.$line->qty.'</td>'; + print '<td align="right" class="nowrap">'.$line->qty.'</td>'; if ($line->remise_percent > 0) { - print '<td align="right" nowrap="nowrap">'.dol_print_reduction($line->remise_percent,$langs)."</td>\n"; + print '<td align="right" class="nowrap">'.dol_print_reduction($line->remise_percent,$langs)."</td>\n"; } else { print '<td> </td>'; } - print '<td align="right" nowrap="nowrap">'.price($line->total_ht).'</td>'; + print '<td align="right" class="nowrap">'.price($line->total_ht).'</td>'; if ($object->statut == 0 && $user->rights->fournisseur->commande->creer) { print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=editline&rowid='.$line->id.'#'.$line->id.'">'; @@ -1528,7 +1528,7 @@ elseif (! empty($object->id)) print '</td>'; print '<td align="right"><input size="5" type="text" name="pu" value="'.price($line->subprice).'"></td>'; print '<td align="right"><input size="2" type="text" name="qty" value="'.$line->qty.'"></td>'; - print '<td align="right" nowrap="nowrap"><input size="1" type="text" name="remise_percent" value="'.$line->remise_percent.'"><span class="hideonsmartphone">%</span></td>'; + print '<td align="right" class="nowrap"><input size="1" type="text" name="remise_percent" value="'.$line->remise_percent.'"><span class="hideonsmartphone">%</span></td>'; print '<td align="center" colspan="4"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">'; print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>'; print '</tr>' . "\n"; @@ -1596,7 +1596,7 @@ elseif (! empty($object->id)) print '</td>'; print '<td align="right"><input type="text" name="pu" size="5" value="'.GETPOST('pu').'"></td>'; print '<td align="right"><input type="text" name="qty" value="'.(GETPOST('qty')?GETPOST('qty'):'1').'" size="2"></td>'; - print '<td align="right" nowrap="nowrap"><input type="text" name="remise_percent" size="1" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):$object->thirdparty->remise_client).'"><span class="hideonsmartphone">%</span></td>'; + print '<td align="right" class="nowrap"><input type="text" name="remise_percent" size="1" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):$object->thirdparty->remise_client).'"><span class="hideonsmartphone">%</span></td>'; print '<td align="center" colspan="4"><input type="submit" class="button" value="'.$langs->trans('Add').'"></td>'; print '</tr>'; @@ -1653,7 +1653,7 @@ elseif (! empty($object->id)) print '</td>'; print '<td align="right"><input type="text" size="2" id="pqty" name="pqty" value="'.(GETPOST('pqty')?GETPOST('pqty'):'1').'"></td>'; - print '<td align="right" nowrap="nowrap"><input type="text" size="1" id="p_remise_percent" name="p_remise_percent" value="'.(GETPOST('p_remise_percent')?GETPOST('p_remise_percent'):$object->thirdparty->remise_client).'"><span class="hideonsmartphone">%</span></td>'; + print '<td align="right" class="nowrap"><input type="text" size="1" id="p_remise_percent" name="p_remise_percent" value="'.(GETPOST('p_remise_percent')?GETPOST('p_remise_percent'):$object->thirdparty->remise_client).'"><span class="hideonsmartphone">%</span></td>'; print '<td align="center" colspan="4"><input type="submit" id="addPredefinedProductButton" class="button" value="'.$langs->trans('Add').'"></td>'; print '</tr>'; diff --git a/htdocs/fourn/commande/history.php b/htdocs/fourn/commande/history.php index 77e5ddccf49..bb823288ac3 100644 --- a/htdocs/fourn/commande/history.php +++ b/htdocs/fourn/commande/history.php @@ -157,14 +157,14 @@ if ($id > 0 || ! empty($ref)) print '<td width="20%">'.dol_print_date($db->jdate($obj->dl),"dayhour")."</td>\n"; // Statut - print '<td nowrap="nowrap">'.$commande->LibStatut($obj->fk_statut,4)."</td>\n"; + print '<td class="nowrap">'.$commande->LibStatut($obj->fk_statut,4)."</td>\n"; // User print '<td align="center"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$obj->rowid.'">'; print img_object($langs->trans("ShowUser"),'user').' '.$obj->login.'</a></td>'; // Comment - print '<td nowrap="nowrap" title="'.dol_escape_htmltag($obj->comment).'">'.dol_trunc($obj->comment,48)."</td>\n"; + print '<td class="nowrap" title="'.dol_escape_htmltag($obj->comment).'">'.dol_trunc($obj->comment,48)."</td>\n"; print '</tr>'; diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index f8101a185fe..86490fc9c8f 100755 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -231,7 +231,7 @@ if (! empty($conf->fournisseur->enabled)) $var=!$var; $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print "<a href=\"fiche.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>"; print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td></tr>'; $i++; @@ -330,17 +330,17 @@ if ($resql) $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; - print '<td width="20%" nowrap="nowrap">'; + print '<td width="20%" class="nowrap">'; $commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; - print '<td width="96" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="96" class="nobordernopadding nowrap">'; print $commandestatic->getNomUrl(1); print '</td>'; - print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; + print '<td width="16" class="nobordernopadding nowrap">'; print ' '; print '</td>'; @@ -398,17 +398,17 @@ while ($i < $num) $var=!$var; $obj = $db->fetch_object($resql); print "<tr $bc[$var]>"; -print '<td nowrap="nowrap">'; +print '<td class="nowrap">'; $commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref; print '<table class="nobordernopadding"><tr class="nocellnopadd">'; -print '<td width="96" class="nobordernopadding" nowrap="nowrap">'; +print '<td width="96" class="nobordernopadding nowrap">'; print $commandestatic->getNomUrl(1); print '</td>'; -print '<td width="16" class="nobordernopadding" nowrap="nowrap">'; +print '<td width="16" class="nobordernopadding nowrap">'; print ' '; print '</td>'; diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php index 00c0875f65d..c96018c4d33 100644 --- a/htdocs/fourn/facture/contact.php +++ b/htdocs/fourn/facture/contact.php @@ -150,7 +150,7 @@ if ($id > 0 || ! empty($ref)) print "</td></tr>"; // Ref supplier - print '<tr><td nowrap="nowrap">'.$langs->trans("RefSupplier").'</td><td colspan="3">'.$object->ref_supplier.'</td>'; + print '<tr><td class="nowrap">'.$langs->trans("RefSupplier").'</td><td colspan="3">'.$object->ref_supplier.'</td>'; print "</tr>\n"; // Third party diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php index f974b514b6b..490d05f8794 100644 --- a/htdocs/fourn/facture/document.php +++ b/htdocs/fourn/facture/document.php @@ -129,13 +129,13 @@ if ($object->id > 0) $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>'; // Ref - print '<tr><td width="30%" nowrap="nowrap">'.$langs->trans("Ref").'</td><td colspan="3">'; + print '<tr><td width="30%" class="nowrap">'.$langs->trans("Ref").'</td><td colspan="3">'; print $form->showrefnav($object, 'facid', $linkback, 1, 'rowid', 'ref'); print '</td>'; print "</tr>\n"; // Ref supplier - print '<tr><td nowrap="nowrap">'.$langs->trans("RefSupplier").'</td><td colspan="3">'.$object->ref_supplier.'</td>'; + print '<tr><td class="nowrap">'.$langs->trans("RefSupplier").'</td><td colspan="3">'.$object->ref_supplier.'</td>'; print "</tr>\n"; // Thirdparty diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 1ea01631f79..f7ade7b3d62 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -1390,7 +1390,7 @@ else $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>'; // Ref - print '<tr><td nowrap="nowrap" width="20%">'.$langs->trans("Ref").'</td><td colspan="4">'; + print '<tr><td class="nowrap" width="20%">'.$langs->trans("Ref").'</td><td colspan="4">'; print $form->showrefnav($object, 'ref', $linkback, 1, 'ref', 'ref'); print '</td>'; print "</tr>\n"; @@ -1504,7 +1504,7 @@ else $objp = $db->fetch_object($result); $var=!$var; print '<tr '.$bc[$var].'>'; - print '<td nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."</a></td>\n"; + print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.dol_print_date($db->jdate($objp->dp),'day')."</a></td>\n"; print '<td>'; print $form->form_modes_reglement(null, $objp->paiement_type,'none').' '.$objp->num_paiement; print '</td>'; @@ -1752,17 +1752,17 @@ else print '</td>'; // Unit price - print '<td align="right" nowrap="nowrap"><input size="4" name="puht" type="text" value="'.price($object->lines[$i]->pu_ht).'"></td>'; + print '<td align="right" class="nowrap"><input size="4" name="puht" type="text" value="'.price($object->lines[$i]->pu_ht).'"></td>'; - print '<td align="right" nowrap="nowrap"><input size="4" name="puttc" type="text" value=""></td>'; + print '<td align="right" class="nowrap"><input size="4" name="puttc" type="text" value=""></td>'; print '<td align="right"><input size="1" name="qty" type="text" value="'.$object->lines[$i]->qty.'"></td>'; - print '<td align="right" nowrap="nowrap"><input size="1" name="remise_percent" type="text" value="'.$object->lines[$i]->remise_percent.'"><span class="hideonsmartphone">%</span></td>'; + print '<td align="right" class="nowrap"><input size="1" name="remise_percent" type="text" value="'.$object->lines[$i]->remise_percent.'"><span class="hideonsmartphone">%</span></td>'; - print '<td align="right" nowrap="nowrap"> </td>'; + print '<td align="right" class="nowrap"> </td>'; - print '<td align="right" nowrap="nowrap"> </td>'; + print '<td align="right" class="nowrap"> </td>'; print '<td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans('Save').'">'; print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>'; @@ -1816,17 +1816,17 @@ else print '<td align="right">'.vatrate($object->lines[$i]->tva_tx, true, $object->lines[$i]->info_bits).'</td>'; // Unit price - print '<td align="right" nowrap="nowrap">'.price($object->lines[$i]->pu_ht,'MU').'</td>'; + print '<td align="right" class="nowrap">'.price($object->lines[$i]->pu_ht,'MU').'</td>'; - print '<td align="right" nowrap="nowrap">'.($object->lines[$i]->pu_ttc?price($object->lines[$i]->pu_ttc,'MU'):' ').'</td>'; + print '<td align="right" class="nowrap">'.($object->lines[$i]->pu_ttc?price($object->lines[$i]->pu_ttc,'MU'):' ').'</td>'; print '<td align="right">'.$object->lines[$i]->qty.'</td>'; print '<td align="right">'.(($object->lines[$i]->remise_percent > 0)?$object->lines[$i]->remise_percent.'%':'').'</td>'; - print '<td align="right" nowrap="nowrap">'.price($object->lines[$i]->total_ht).'</td>'; + print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ht).'</td>'; - print '<td align="right" nowrap="nowrap">'.price($object->lines[$i]->total_ttc).'</td>'; + print '<td align="right" class="nowrap">'.price($object->lines[$i]->total_ttc).'</td>'; print '<td align="center" width="16">'; if ($object->statut == 0) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit_line&etat=0&lineid='.$object->lines[$i]->rowid.'">'.img_edit().'</a>'; @@ -1903,7 +1903,7 @@ else print '<td align="right">'; print '<input size="1" name="qty" type="text" value="1">'; print '</td>'; - print '<td align="right" nowrap="nowrap"><input size="1" name="remise_percent" type="text" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):'0').'"><span class="hideonsmartphone">%</span></td>'; + print '<td align="right" class="nowrap"><input size="1" name="remise_percent" type="text" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):'0').'"><span class="hideonsmartphone">%</span></td>'; print '<td> </td>'; print '<td> </td>'; print '<td align="center" valign="middle" colspan="2"><input type="submit" class="button" value="'.$langs->trans('Add').'"></td></tr>'; @@ -1970,7 +1970,7 @@ else print '</td>'; print '<td align="right"><input type="text" id="pqty" name="qty" value="1" size="1"></td>'; - print '<td align="right" nowrap="nowrap"><input size="1" id="p_remise_percent" name="remise_percent" type="text" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):'0').'"><span class="hideonsmartphone">%</span></td>'; + print '<td align="right" class="nowrap"><input size="1" id="p_remise_percent" name="remise_percent" type="text" value="'.(GETPOST('remise_percent')?GETPOST('remise_percent'):'0').'"><span class="hideonsmartphone">%</span></td>'; print '<td> </td>'; print '<td> </td>'; print '<td align="center" valign="middle" colspan="2"><input type="submit" id="addPredefinedProductButton" class="button" value="'.$langs->trans("Add").'"></td>'; diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php index e88350aad57..664d2b0b0bc 100644 --- a/htdocs/fourn/facture/impayees.php +++ b/htdocs/fourn/facture/impayees.php @@ -260,7 +260,7 @@ if ($user->rights->fournisseur->facture->lire) print "<td align=\"right\">".price($objp->am)."</td>"; // Affiche statut de la facture - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; print $facturestatic->LibStatut($objp->paye,$objp->fk_statut,5,$objp->am); print '</td>'; diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php index 5934029aef3..80b76772f09 100644 --- a/htdocs/fourn/facture/index.php +++ b/htdocs/fourn/facture/index.php @@ -246,15 +246,15 @@ if ($resql) $var=!$var; print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $facturestatic->id=$obj->facid; $facturestatic->ref=$obj->ref; $facturestatic->ref_supplier=$obj->ref_supplier; print $facturestatic->getNomUrl(1); print "</td>\n"; - print '<td nowrap="nowrap">'.dol_trunc($obj->ref_supplier,10)."</td>"; - print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($obj->datef),'day').'</td>'; - print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($obj->date_echeance),'day'); + print '<td class="nowrap">'.dol_trunc($obj->ref_supplier,10)."</td>"; + print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datef),'day').'</td>'; + print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->date_echeance),'day'); if (($obj->paye == 0) && ($obj->fk_statut > 0) && $obj->date_echeance && $db->jdate($obj->date_echeance) < ($now - $conf->facture->fournisseur->warning_delay)) print img_picto($langs->trans("Late"),"warning"); print '</td>'; print '<td>'.dol_trunc($obj->libelle,36).'</td>'; @@ -268,7 +268,7 @@ if ($resql) $total_ttc+=$obj->total_ttc; // Affiche statut de la facture - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; // TODO le montant deja paye objp->am n'est pas definie //print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$objp->am); print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5); diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php index 116d0ce1c8b..a866407a82a 100644 --- a/htdocs/fourn/facture/note.php +++ b/htdocs/fourn/facture/note.php @@ -91,13 +91,13 @@ if ($id) $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/index.php'.(! empty($socid)?'?socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>'; // Ref - print '<tr><td width="20%" nowrap="nowrap">'.$langs->trans("Ref").'</td><td colspan="3">'; + print '<tr><td width="20%" class="nowrap">'.$langs->trans("Ref").'</td><td colspan="3">'; print $form->showrefnav($object, 'facid', $linkback, 1, 'rowid', 'ref', $morehtmlref); print '</td>'; print "</tr>\n"; // Ref supplier - print '<tr><td nowrap="nowrap">'.$langs->trans("RefSupplier").'</td><td colspan="3">'.$object->ref_supplier.'</td>'; + print '<tr><td class="nowrap">'.$langs->trans("RefSupplier").'</td><td colspan="3">'.$object->ref_supplier.'</td>'; print "</tr>\n"; // Company diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php index 9ee8f4d9a23..f9ab0cd0cab 100644 --- a/htdocs/fourn/facture/paiement.php +++ b/htdocs/fourn/facture/paiement.php @@ -472,10 +472,10 @@ if (empty($action)) print '<tr '.$bc[$var].'>'; // Ref payment - print '<td nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->pid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.$objp->pid.'</a></td>'; + print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fourn/paiement/fiche.php?id='.$objp->pid.'">'.img_object($langs->trans('ShowPayment'),'payment').' '.$objp->pid.'</a></td>'; // Date - print '<td nowrap="nowrap" align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n"; + print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n"; print '<td>'; if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->nom,32).'</a>'; @@ -494,7 +494,7 @@ if (empty($action)) // Ref invoice /*$invoicesupplierstatic->ref=$objp->ref_supplier; $invoicesupplierstatic->id=$objp->facid; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print $invoicesupplierstatic->getNomUrl(1); print '</td>';*/ diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php index 13ef8ea8523..e182639775c 100644 --- a/htdocs/fourn/fiche.php +++ b/htdocs/fourn/fiche.php @@ -103,7 +103,7 @@ if ($object->fetch($id)) if ($object->fournisseur) { print '<tr>'; - print '<td nowrap="nowrap">'.$langs->trans("SupplierCode"). '</td><td colspan="3">'; + print '<td class="nowrap">'.$langs->trans("SupplierCode"). '</td><td colspan="3">'; print $object->code_fournisseur; if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>'; print '</td>'; @@ -124,7 +124,7 @@ if ($object->fetch($id)) print '</td></tr>'; // Zip / Town - print '<tr><td nowrap="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td>'; + print '<tr><td class="nowrap">'.$langs->trans("Zip").' / '.$langs->trans("Town").'</td><td colspan="3">'.$object->zip.(($object->zip && $object->town)?' / ':'').$object->town.'</td>'; print '</tr>'; // Country @@ -148,7 +148,7 @@ if ($object->fetch($id)) // Assujetti a TVA ou pas print '<tr>'; - print '<td nowrap="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">'; + print '<td class="nowrap">'.$langs->trans('VATIsUsed').'</td><td colspan="3">'; print yn($object->tva_assuj); print '</td>'; print '</tr>'; @@ -159,10 +159,10 @@ if ($object->fetch($id)) { if($mysoc->localtax1_assuj=="1" && $mysoc->localtax2_assuj=="1") { - print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; + print '<tr><td class="nowrap">'.$langs->trans('LocalTax1IsUsedES').'</td><td colspan="3">'; print yn($object->localtax1_assuj); print '</td></tr>'; - print '<tr><td nowrap="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">'; + print '<tr><td class="nowrap">'.$langs->trans('LocalTax2IsUsedES').'</td><td colspan="3">'; print yn($object->localtax2_assuj); print '</td></tr>'; } @@ -299,7 +299,7 @@ if ($object->fetch($id)) print "-"; } print '</td>'; - print '<td align="right" nowrap="nowrap">'.$orderstatic->LibStatut($obj->fk_statut,5).'</td>'; + print '<td align="right" class="nowrap">'.$orderstatic->LibStatut($obj->fk_statut,5).'</td>'; print '</tr>'; $i++; } @@ -355,9 +355,9 @@ if ($object->fetch($id)) print '<td>'; print '<a href="facture/fiche.php?facid='.$obj->rowid.'">'; print img_object($langs->trans('ShowBill'),'bill').' '.$obj->ref_supplier.'</a> '.dol_trunc($obj->libelle,14).'</td>'; - print '<td align="center" nowrap="nowrap">'.dol_print_date($db->jdate($obj->df),'day').'</td>'; - print '<td align="right" nowrap="nowrap">'.price($obj->amount).'</td>'; - print '<td align="right" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->df),'day').'</td>'; + print '<td align="right" class="nowrap">'.price($obj->amount).'</td>'; + print '<td align="right" class="nowrap">'; print $facturestatic->LibStatut($obj->paye,$obj->fk_statut,5,$obj->am); print '</td>'; print '</tr>'; diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php index 70aacc894ad..b3475db0e43 100644 --- a/htdocs/fourn/index.php +++ b/htdocs/fourn/index.php @@ -134,18 +134,18 @@ if (! empty($conf->fournisseur->enabled)) { $var=!$var; $obj = $db->fetch_object($resql); - print '<tr '.$bc[$var].'><td nowrap="nowrap">'; + print '<tr '.$bc[$var].'><td class="nowrap">'; $commandestatic->id=$obj->rowid; $commandestatic->ref=$obj->ref; print $commandestatic->getNomUrl(1,'',16); print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $companystatic->id=$obj->socid; $companystatic->nom=$obj->nom; $companystatic->client=0; print $companystatic->getNomUrl(1,'',16); print '</td>'; - print '<td align="right" nowrap="nowrap">'.price($obj->total_ttc).'</td></tr>'; + print '<td align="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>'; $i++; $total += $obj->total_ttc; } @@ -191,13 +191,13 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture- { $obj = $db->fetch_object($resql); $var=!$var; - print '<tr '.$bc[$var].'><td nowrap="nowrap">'; + print '<tr '.$bc[$var].'><td class="nowrap">'; $facturestatic->ref=$obj->ref; $facturestatic->id=$obj->rowid; $facturestatic->type=$obj->type; print $facturestatic->getNomUrl(1,''); print '</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $companystatic->id=$obj->socid; $companystatic->nom=$obj->nom; $companystatic->client=0; diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php index 78cde75300f..63beb01eff4 100644 --- a/htdocs/fourn/recap-fourn.php +++ b/htdocs/fourn/recap-fourn.php @@ -149,7 +149,7 @@ if ($socid > 0) print '<td align="right">'.price($solde)."</td>\n"; // Author - print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objf->login.'</a></td>'; + print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objf->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objf->login.'</a></td>'; print "</tr>\n"; @@ -184,7 +184,7 @@ if ($socid > 0) print '<td align="right">'.price($solde)."</td>\n"; // Auteur - print '<td nowrap="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objp->login.'</a></td>'; + print '<td class="nowrap" width="50"><a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$objp->userid.'">'.img_object($langs->trans("ShowUser"),'user').' '.$objp->login.'</a></td>'; print '</tr>'; diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php index 63f98a2be14..e8416621de6 100644 --- a/htdocs/ftp/index.php +++ b/htdocs/ftp/index.php @@ -542,28 +542,28 @@ else if ($is_directory) print '</a>'; print '</td>'; // Size - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; if (! $is_directory && ! $is_link) print $vals[4]; else print ' '; print '</td>'; // Date - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print $vals[5].' '.$vals[6].' '.$vals[7]; print '</td>'; // User - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print $vals[2]; print '</td>'; // Group - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print $vals[3]; print '</td>'; // Permissions - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print $vals[0]; print '</td>'; // Action - print '<td align="right" width="64" nowrap="nowrap">'; + print '<td align="right" width="64" class="nowrap">'; if ($is_directory) { if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'§ion='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>'; diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index d6d35335bed..734ba94534c 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -511,7 +511,7 @@ if ($step == 3 && $datatoimport) print '<td>'; $text=$objmodelimport->getDriverDescForKey($format); print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text); - print '</td><td align="right" nowrap="nowrap"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>'; + print '</td><td align="right" class="nowrap"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a>'; print '</td></tr>'; @@ -847,7 +847,7 @@ if ($step == 4 && $datatoimport) $entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$entity; $entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$entity; - print '<td nowrap="nowrap" style="font-weight: normal">=>'.img_object('',$entityicon).' '.$langs->trans($entitylang).'</td>'; + print '<td class="nowrap" style="font-weight: normal">=>'.img_object('',$entityicon).' '.$langs->trans($entitylang).'</td>'; print '<td style="font-weight: normal">'; $newlabel=preg_replace('/\*$/','',$label); $text=$langs->trans($newlabel); diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index 0cfdb6dff43..ac9e9d645fa 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -125,7 +125,7 @@ foreach($liste as $key) $text=$model->getDriverDescForKey($key); print '<td>'.$form->textwithpicto($model->getDriverLabelForKey($key),$text).'</td>'; print '<td>'.$model->getLibLabelForKey($key).'</td>'; - print '<td nowrap="nowrap" align="right">'.$model->getLibVersionForKey($key).'</td>'; + print '<td class="nowrap" align="right">'.$model->getLibVersionForKey($key).'</td>'; print '</tr>'; } diff --git a/htdocs/index.php b/htdocs/index.php index 49404f72c65..3ba4e63e03e 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -80,9 +80,9 @@ print '<div class="fichecenter"><div class="fichethirdleft">'; print '<table class="noborder" width="100%">'; print '<tr class="liste_titre"><th class="liste_titre" colspan="2">'.$langs->trans("Informations").'</th></tr>'; print '<tr '.$bc[false].'>'; -print '<td nowrap="nowrap">'.$langs->trans("User").'</td><td>'.$user->getNomUrl(0).'</td></tr>'; +print '<td class="nowrap">'.$langs->trans("User").'</td><td>'.$user->getNomUrl(0).'</td></tr>'; print '<tr '.$bc[true].'>'; -print '<td nowrap="nowrap">'.$langs->trans("PreviousConnexion").'</td><td>'; +print '<td class="nowrap">'.$langs->trans("PreviousConnexion").'</td><td>'; if ($user->datepreviouslogin) print dol_print_date($user->datepreviouslogin,"dayhour",'tzuser'); else print $langs->trans("Unknown"); print '</td>'; @@ -471,7 +471,7 @@ foreach($dashboardlines as $key => $board) if ($board->nbtodolate > 0) print img_picto($langs->trans("NActionsLate",$board->nbtodolate),"warning"); else print ' '; print '</td>'; - print '<td nowrap="nowrap" align="right">'; + print '<td class="nowrap" align="right">'; print ' (>'.ceil($board->warning_delay).' '.$langs->trans("days").')'; print '</td>'; if ($showweather) diff --git a/htdocs/install/check.php b/htdocs/install/check.php index f0bda08bfc1..40210e83b58 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -339,7 +339,7 @@ else print '<table width="100%" class="listofchoices">'; // Show first install line - print '<tr class="listofchoices"><td class="listofchoices" nowrap="nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>'; + print '<tr class="listofchoices"><td class="listofchoices nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>'; print '</td>'; print '<td class="listofchoices">'; print $langs->trans("FreshInstallDesc"); @@ -400,7 +400,7 @@ else $version=preg_split('/[\.-]/',DOL_VERSION); $newversionfrombis=''; if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis=' '.$langs->trans("or").' '.$versionto; - print '<tr class="listofchoices"><td class="listofchoices" nowrap="nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>'; + print '<tr class="listofchoices"><td class="listofchoices nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>'; print '<td class="listofchoices">'; print $langs->trans("UpgradeDesc"); if ($ok) diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php index 32e1cf1ad49..24fb61dee4a 100644 --- a/htdocs/install/repair.php +++ b/htdocs/install/repair.php @@ -103,7 +103,7 @@ $db=getDoliDBInstance($conf->db->type,$conf->db->host,$conf->db->user,$conf->db- if ($db->connected == 1) { - print '<tr><td nowrap="nowrap">'; + print '<tr><td class="nowrap">'; print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>"; dolibarr_install_syslog("repair: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK")); $ok = 1; @@ -119,7 +119,7 @@ if ($ok) { if($db->database_selected == 1) { - print '<tr><td nowrap="nowrap">'; + print '<tr><td class="nowrap">'; print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>"; dolibarr_install_syslog("repair: Database connection successfull : $dolibarr_main_db_name"); $ok=1; diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php index 69168ff2425..886276197e3 100644 --- a/htdocs/install/upgrade.php +++ b/htdocs/install/upgrade.php @@ -121,7 +121,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) if ($db->connected == 1) { - print '<tr><td nowrap="nowrap">'; + print '<tr><td class="nowrap">'; print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n"; dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection")." : $dolibarr_main_db_host ".$langs->transnoentities("OK")); $ok = 1; @@ -137,7 +137,7 @@ if (! GETPOST("action") || preg_match('/upgrade/i',GETPOST('action'))) { if($db->database_selected == 1) { - print '<tr><td nowrap="nowrap">'; + print '<tr><td class="nowrap">'; print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n"; dolibarr_install_syslog("upgrade: Database connection successfull : $dolibarr_main_db_name"); $ok=1; diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php index c40a8dfb4b8..3448e3a196c 100644 --- a/htdocs/install/upgrade2.php +++ b/htdocs/install/upgrade2.php @@ -1159,7 +1159,7 @@ function migrate_paiementfourn_facturefourn($db,$langs,$conf) if ($nb == 0) { - print '<tr><td colspan="4" nowrap="nowrap"><b>'.$langs->trans('SuppliersInvoices').'</b></td></tr>'; + print '<tr><td colspan="4" class="nowrap"><b>'.$langs->trans('SuppliersInvoices').'</b></td></tr>'; print '<tr><td>fk_paiementfourn</td><td>fk_facturefourn</td><td>'.$langs->trans('Amount').'</td><td> </td></tr>'; } diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php index ce41a83e70a..8af6c133004 100644 --- a/htdocs/product/admin/product.php +++ b/htdocs/product/admin/product.php @@ -227,7 +227,7 @@ foreach ($dirproduct as $dirroot) print '<tr '.$bc[$var].'>'."\n"; print '<td width="140">'.$modCodeProduct->nom.'</td>'."\n"; print '<td>'.$modCodeProduct->info($langs).'</td>'."\n"; - print '<td nowrap="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n"; + print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n"; if (! empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) && $conf->global->PRODUCT_CODEPRODUCT_ADDON == $file) { @@ -333,7 +333,7 @@ print '<tr '.$bc[$var].'>'; print '<td>'.$langs->trans("UseSearchToSelectProduct").'</td>'; if (empty($conf->use_javascript_ajax)) { - print '<td nowrap="nowrap" align="right" colspan="2">'; + print '<td class="nowrap" align="right" colspan="2">'; print $langs->trans("NotAvailableWhenAjaxDisabled"); print '</td>'; } diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 143ed6e9551..d2b81d4ce04 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -1367,7 +1367,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="action" value="addinpropal">'; print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print "<a href=\"../comm/propal.php?id=".$objp->propalid."\">".img_object($langs->trans("ShowPropal"),"propal")." ".$objp->ref."</a></td>\n"; print "<td><a href=\"../comm/fiche.php?socid=".$objp->socid."\">".dol_trunc($objp->nom,18)."</a></td>\n"; print "<td nowrap=\"nowrap\">".dol_print_date($objp->dp,"%d %b")."</td>\n"; @@ -1412,7 +1412,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) print $langs->trans("OtherPropals").'</td><td>'; print $form->selectarray("propalid", $otherprop); print '</td></tr>'; - print '<tr '.$bc[$var].'><td nowrap="nowrap" colspan="2">'.$langs->trans("Qty"); + print '<tr '.$bc[$var].'><td class="nowrap" colspan="2">'.$langs->trans("Qty"); print '<input type="text" class="flat" name="qty" size="1" value="1"></td><td nowrap>'.$langs->trans("ReductionShort"); print '<input type="text" class="flat" name="remise_percent" size="1" value="0">%'; print '</td><td align="right">'; @@ -1484,7 +1484,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="action" value="addincommande">'; print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print "<a href=\"../commande/fiche.php?id=".$objc->commandeid."\">".img_object($langs->trans("ShowOrder"),"order")." ".$objc->ref."</a></td>\n"; print "<td><a href=\"../comm/fiche.php?socid=".$objc->socid."\">".dol_trunc($objc->nom,18)."</a></td>\n"; print "<td nowrap=\"nowrap\">".dol_print_date($db->jdate($objc->dc),"%d %b")."</td>\n"; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index e973516f5f9..247ddf7d5ff 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -220,7 +220,7 @@ if ($result) $var=!$var; print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $product_static->id=$objp->rowid; $product_static->ref=$objp->ref; $product_static->type=$objp->fk_product_type; @@ -238,10 +238,10 @@ if ($result) else print price($objp->price).' '.$langs->trans("HT"); print '</td>'; } - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; print $product_static->LibStatut($objp->tosell,5,0); print "</td>"; - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; print $product_static->LibStatut($objp->tobuy,5,1); print "</td>"; print "</tr>\n"; diff --git a/htdocs/product/liste.php b/htdocs/product/liste.php index 29188400653..0495a318d42 100644 --- a/htdocs/product/liste.php +++ b/htdocs/product/liste.php @@ -363,7 +363,7 @@ else print '<tr '.$bc[$var].'>'; // Ref - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $product_static->id = $objp->rowid; $product_static->ref = $objp->ref; $product_static->type = $objp->fk_product_type; @@ -439,10 +439,10 @@ else } // Status (to buy) - print '<td align="right" nowrap="nowrap">'.$product_static->LibStatut($objp->tosell,5,0).'</td>'; + print '<td align="right" class="nowrap">'.$product_static->LibStatut($objp->tosell,5,0).'</td>'; // Status (to sell) - print '<td align="right" nowrap="nowrap">'.$product_static->LibStatut($objp->tobuy,5,1).'</td>'; + print '<td align="right" class="nowrap">'.$product_static->LibStatut($objp->tobuy,5,1).'</td>'; print "</tr>\n"; $i++; diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php index 52462c35bbc..f39a06f36c2 100644 --- a/htdocs/product/reassort.php +++ b/htdocs/product/reassort.php @@ -299,7 +299,7 @@ if ($resql) } $var=!$var; - print '<tr '.$bc[$var].'><td nowrap="nowrap">'; + print '<tr '.$bc[$var].'><td class="nowrap">'; $product_static->ref=$objp->ref; $product_static->id=$objp->rowid; $product_static->type=$objp->fk_product_type; @@ -324,8 +324,8 @@ if ($resql) print $objp->stock_physique; print '</td>'; print '<td align="right"><a href="'.DOL_URL_ROOT.'/product/stock/mouvement.php?idproduct='.$product_static->id.'">'.$langs->trans("Movements").'</a></td>'; - print '<td align="right" nowrap="nowrap">'.$product_static->LibStatut($objp->statut,5,0).'</td>'; - print '<td align="right" nowrap="nowrap">'.$product_static->LibStatut($objp->tobuy,5,1).'</td>'; + print '<td align="right" class="nowrap">'.$product_static->LibStatut($objp->statut,5,0).'</td>'; + print '<td align="right" class="nowrap">'.$product_static->LibStatut($objp->tobuy,5,1).'</td>'; print "</tr>\n"; $i++; } diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php index 744c15d78dc..7d92e1546ad 100644 --- a/htdocs/projet/admin/project.php +++ b/htdocs/projet/admin/project.php @@ -232,7 +232,7 @@ foreach ($dirmodels as $reldir) print '</td>'; // Show example of numbering model - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $tmp=$module->getExample(); if (preg_match('/^Error/',$tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>'; elseif ($tmp=='NotConfigured') print $langs->trans($tmp); diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php index 4f6ba12b1f3..2f253112cdf 100644 --- a/htdocs/projet/contact.php +++ b/htdocs/projet/contact.php @@ -222,7 +222,7 @@ if ($id > 0 || ! empty($ref)) // Ligne ajout pour contact interne print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print img_object('','user').' '.$langs->trans("Users"); print '</td>'; @@ -261,7 +261,7 @@ if ($id > 0 || ! empty($ref)) $var=!$var; print "<tr ".$bc[$var].">"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); print '</td>'; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index d7eb62f927a..89aed92b99d 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -106,7 +106,7 @@ if ( $resql ) $obj = $db->fetch_object($resql); $var=!$var; print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; if ($obj->socid) { $socstatic->id=$obj->socid; diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php index 710990ac1c6..5f8fd84c6e4 100644 --- a/htdocs/projet/tasks/contact.php +++ b/htdocs/projet/tasks/contact.php @@ -288,7 +288,7 @@ if ($id > 0 || ! empty($ref)) // Ligne ajout pour contact interne print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print img_object('','user').' '.$langs->trans("Users"); print '</td>'; @@ -321,7 +321,7 @@ if ($id > 0 || ! empty($ref)) $var=!$var; print "<tr $bc[$var]>"; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print img_object('','contact').' '.$langs->trans("ThirdPartyContacts"); print '</td>'; diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index a97de4f9f4f..7f32feadccb 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -309,25 +309,25 @@ if ($id > 0 || ! empty($ref)) print '<tr '.$bc[false].'>'; // Date - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $newdate=dol_mktime(12,0,0,$_POST["timemonth"],$_POST["timeday"],$_POST["timeyear"]); print $form->select_date($newdate,'time','','','',"timespent_date"); print '</td>'; // Contributor - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $contactoftask=$object->getListContactId('internal'); print img_object('','user'); print $form->select_users($_POST["userid"]?$_POST["userid"]:$user->id,'userid',0,'',0,'',$contactoftask); print '</td>'; // Note - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; print '<textarea name="timespent_note" cols="80" rows="'.ROWS_3.'">'.($_POST['timespent_note']?$_POST['timespent_note']:'').'</textarea>'; print '</td>'; // Duration - print '<td nowrap="nowrap" align="right">'; + print '<td class="nowrap" align="right">'; print $form->select_duration('timespent_duration',($_POST['timespent_duration']?$_POST['timespent_duration']:'')); print '</td>'; @@ -470,7 +470,7 @@ if ($id > 0 || ! empty($ref)) $total += $task_time->task_duration; } print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>'; - print '<td align="right" nowrap="nowrap" class="liste_total">'.convertSecondToTime($total).'</td><td> </td>'; + print '<td align="right" class="nowrap liste_total">'.convertSecondToTime($total).'</td><td> </td>'; print '</tr>'; print "</table>"; diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index d6368514821..b8d763748f2 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -576,7 +576,7 @@ if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT) $amount=GETPOST('amount')?GETPOST('amount'):$conf->global->MEMBER_NEWFORM_AMOUNT; } // $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal' or 'paybox' - print '<tr><td>'.$langs->trans("Subscription").'</td><td nowrap="nowrap">'; + print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">'; if (! empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) { print '<input type="text" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">'; diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php index 1cd6fef8b4b..d4bc91b6b65 100644 --- a/htdocs/societe/admin/societe.php +++ b/htdocs/societe/admin/societe.php @@ -314,7 +314,7 @@ foreach ($dirsociete as $dirroot) print '<tr '.$bc[$var].'>'."\n"; print '<td width="140">'.$modCodeTiers->nom.'</td>'."\n"; print '<td>'.$modCodeTiers->info($langs).'</td>'."\n"; - print '<td nowrap="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n"; + print '<td class="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n"; if ($conf->global->SOCIETE_CODECLIENT_ADDON == "$file") { @@ -391,7 +391,7 @@ foreach ($dirsociete as $dirroot) print '<td>'.$modCodeCompta->nom."</td><td>\n"; print $modCodeCompta->info($langs); print '</td>'; - print '<td nowrap="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n"; + print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n"; if ($conf->global->SOCIETE_CODECOMPTA_ADDON == "$file") { @@ -538,7 +538,7 @@ foreach ($dirsociete as $dirroot) $htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1); - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; if ($module->type == 'pdf') { $linkspec='<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'">'.img_object($langs->trans("Preview"),'bill').'</a>'; @@ -675,7 +675,7 @@ print "<tr ".$bc[$var].">"; print '<td width="80%">'.$langs->trans("UseSearchToSelectCompany").'</td>'; if (! $conf->use_javascript_ajax) { - print '<td nowrap="nowrap" align="right" colspan="2">'; + print '<td class="nowrap" align="right" colspan="2">'; print $langs->trans("NotAvailableWhenAjaxDisabled"); print "</td>"; } @@ -704,7 +704,7 @@ print "<tr ".$bc[$var].">"; print '<td width="80%">'.$langs->trans("UseSearchToSelectContact").'</td>'; if (! $conf->use_javascript_ajax) { - print '<td nowrap="nowrap" align="right" colspan="2">'; + print '<td class="nowrap" align="right" colspan="2">'; print $langs->trans("NotAvailableWhenAjaxDisabled"); print "</td>"; } diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php index b16db4916cb..478d24a4e8f 100644 --- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php @@ -182,8 +182,8 @@ for ($i=1; $i<=4; $i++) { <tr> <td><?php echo $langs->trans('VATIsUsed'); ?></td> <td><?php echo $this->control->tpl['yn_assujtva']; ?></td> - <td nowrap="nowrap"><?php echo $langs->trans('VATIntra'); ?></td> - <td nowrap="nowrap"><?php echo $this->control->tpl['tva_intra']; ?></td> + <td class="nowrap"><?php echo $langs->trans('VATIntra'); ?></td> + <td class="nowrap"><?php echo $this->control->tpl['tva_intra']; ?></td> </tr> <?php if(!empty($this->control->tpl['localtax'])) echo $this->control->tpl['localtax']; ?> diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php index 7e1e8631bd3..0afcb99dc56 100644 --- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php @@ -173,8 +173,8 @@ for ($i=1; $i<=4; $i++) { <tr> <td><?php echo $langs->trans('VATIsUsed'); ?></td> <td><?php echo $this->control->tpl['yn_assujtva']; ?></td> - <td nowrap="nowrap"><?php echo $langs->trans('VATIntra'); ?></td> - <td nowrap="nowrap"><?php echo $this->control->tpl['tva_intra']; ?></td> + <td class="nowrap"><?php echo $langs->trans('VATIntra'); ?></td> + <td class="nowrap"><?php echo $this->control->tpl['tva_intra']; ?></td> </tr> <tr> diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php index 2beb21e3430..4ea5afcbdcb 100644 --- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php @@ -90,7 +90,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company'); <tr> <td><?php echo $langs->trans("Country"); ?></td> - <td colspan="3" nowrap="nowrap"><?php echo $this->control->tpl['country']; ?></td> + <td colspan="3" class="nowrap"><?php echo $this->control->tpl['country']; ?></td> </tr> <tr> @@ -136,7 +136,7 @@ for ($i=1; $i<=4; $i++) { <tr> <td><?php echo $langs->trans('VATIsUsed'); ?></td> <td><?php echo $this->control->tpl['tva_assuj']; ?></td> - <td nowrap="nowrap"><?php echo $langs->trans('VATIntra'); ?></td> + <td class="nowrap"><?php echo $langs->trans('VATIntra'); ?></td> <td><?php echo $this->control->tpl['tva_intra']; ?></td> </tr> diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php index 7c99adc360b..d2fc7e5551b 100644 --- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php @@ -89,7 +89,7 @@ dol_fiche_head($head, 'card', $langs->trans("ThirdParty"),0,'company'); <tr> <td><?php echo $langs->trans("Country"); ?></td> - <td colspan="3" nowrap="nowrap"><?php echo $this->control->tpl['country']; ?></td> + <td colspan="3" class="nowrap"><?php echo $this->control->tpl['country']; ?></td> </tr> <tr> diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php index aff1fded6d3..58f468298ad 100644 --- a/htdocs/societe/consumption.php +++ b/htdocs/societe/consumption.php @@ -265,7 +265,7 @@ if ($sql_select) { $var=!$var; print "<tr ".$bc[$var].">"; - print '<td class="nobordernopadding" nowrap="nowrap" width="100">'; + print '<td class="nobordernopadding nowrap" width="100">'; $documentstatic->id=$objp->doc_id; $documentstatic->ref=$objp->doc_number; $documentstatic->type=$objp->type; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 90513c239de..66cbb3e2523 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -197,7 +197,7 @@ if ($result) $var=!$var; print "<tr $bc[$var]>"; // Name - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'; $thirdparty_static->id=$objp->rowid; $thirdparty_static->name=$objp->name; $thirdparty_static->client=$objp->client; @@ -231,7 +231,7 @@ if ($result) print '<td align="right">'; print dol_print_date($thirdparty_static->datem,'day'); print "</td>"; - print '<td align="right" nowrap="nowrap">'; + print '<td align="right" class="nowrap">'; print $thirdparty_static->getLibStatut(3); print "</td>"; print "</tr>\n"; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index f67f39cac28..24db1206917 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -870,8 +870,8 @@ else print '<td>'; print $form->selectyesno('assujtva_value',1,1); // Assujeti par defaut en creation print '</td>'; - print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'.$langs->trans('VATIntra').'</td>'; + print '<td class="nowrap">'; $s = '<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$object->tva_intra.'">'; if (empty($conf->global->MAIN_DISABLEVATCHECK)) @@ -1296,8 +1296,8 @@ else print '</td>'; // VAT Code - print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td>'; - print '<td nowrap="nowrap">'; + print '<td class="nowrap">'.$langs->trans('VATIntra').'</td>'; + print '<td class="nowrap">'; $s ='<input type="text" class="flat" name="tva_intra" size="12" maxlength="20" value="'.$object->tva_intra.'">'; if (empty($conf->global->MAIN_DISABLEVATCHECK)) @@ -1549,7 +1549,7 @@ else print '</tr>'; // Country - print '<tr><td>'.$langs->trans("Country").'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'" nowrap="nowrap">'; + print '<tr><td>'.$langs->trans("Country").'</td><td colspan="'.(2+(($showlogo || $showbarcode)?0:1)).'" class="nowrap">'; $img=picto_from_langcode($object->country_code); if ($object->isInEEC()) print $form->textwithpicto(($img?$img.' ':'').$object->country,$langs->trans("CountryIsInEEC"),1,0); else print ($img?$img.' ':'').$object->country; @@ -1604,7 +1604,7 @@ else print '</td>'; // VAT Code - print '<td nowrap="nowrap">'.$langs->trans('VATIntra').'</td><td>'; + print '<td class="nowrap">'.$langs->trans('VATIntra').'</td><td>'; if ($object->tva_intra) { $s=''; diff --git a/htdocs/societe/societe.php b/htdocs/societe/societe.php index 93401eaebf0..ca4d35b5669 100644 --- a/htdocs/societe/societe.php +++ b/htdocs/societe/societe.php @@ -327,10 +327,10 @@ if ($resql) print '<tr class="liste_titre">'; print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom","",$params,"",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Town"),$_SERVER["PHP_SELF"],"s.town","",$params,'',$sortfield,$sortorder); - print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$params,'nowrap="nowrap"',$sortfield,$sortorder); - print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$params,'nowrap="nowrap"',$sortfield,$sortorder); - print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$params,'nowrap="nowrap"',$sortfield,$sortorder); - print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$params,'nowrap="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId1Short"),$textprofid[1],1,0),$_SERVER["PHP_SELF"],"s.siren","",$params,'class="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId2Short"),$textprofid[2],1,0),$_SERVER["PHP_SELF"],"s.siret","",$params,'class="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId3Short"),$textprofid[3],1,0),$_SERVER["PHP_SELF"],"s.ape","",$params,'class="nowrap"',$sortfield,$sortorder); + print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"),$textprofid[4],1,0),$_SERVER["PHP_SELF"],"s.idprof4","",$params,'class="nowrap"',$sortfield,$sortorder); print '<td></td>'; print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"s.status","",$params,'align="right"',$sortfield,$sortorder); print "</tr>\n"; diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php index b54ed11fc69..a3bbd990a12 100755 --- a/htdocs/theme/amarok/style.css.php +++ b/htdocs/theme/amarok/style.css.php @@ -310,6 +310,9 @@ th .button { .right { text-align: <?php print $right; ?>; } +.nowrap { + white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>; +} .blockvmenubookmarks .menu_contenu { @@ -991,7 +994,7 @@ div.ficheaddleft { div.divButAction { margin-bottom: 1.4em; } .button, .butAction {background: #999; border: solid 1px #888; font-weight: normal; } -.butActionRefused {background: #eaeaea; color:rgba(0,0,0,0.6); font-weight: normal; cursor: not-allowed; } +.butActionRefused {background: #eaeaea; color:rgba(0,0,0,0.6); font-weight: normal !important; cursor: not-allowed; } .butActionDelete {background: #b33c37; border:solid 1px #8d2f2b; font-weight: normal;} .button, .butAction, .butActionRefused, .butActionDelete { @@ -1195,20 +1198,18 @@ div.liste_titre, tr.liste_titre, tr.box_titre { color-stop(1, rgba(0,0,0,.3)) ); height: 22px; + text-align: <?php echo $left; ?>; } tr.box_titre td.boxclose { width: 36px; } -tr.liste_titre td { +tr.liste_titre td, tr.liste_titre th { padding:2px; padding-left:2px !important; white-space:nowrap; -} - -tr.liste_titre td input.flat { - width:70%; + text-shadow:1px 1px 1px #ffffff; } td.liste_titre_sel { diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index f6c6e177696..3af50441fc3 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -195,6 +195,9 @@ div.inline-block .right { text-align: <?php print $right; ?>; } +.nowrap { + white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>; +} /* ============================================================================== */ diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php index 15ad13654e3..e9b1521c026 100644 --- a/htdocs/theme/bureau2crea/style.css.php +++ b/htdocs/theme/bureau2crea/style.css.php @@ -224,6 +224,9 @@ div.inline-block .right { text-align: <?php print $right; ?>; } +.nowrap { + white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>; +} /* ============================================================================== */ diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php index e2427115470..4866ed0f0aa 100644 --- a/htdocs/theme/cameleo/style.css.php +++ b/htdocs/theme/cameleo/style.css.php @@ -199,6 +199,9 @@ div.inline-block .right { text-align: <?php print $right; ?>; } +.nowrap { + white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>; +} /* ============================================================================== */ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 739ce3b2602..17c11d4eb12 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -134,7 +134,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) $conf->global->THEME_ELDY_LINEPAIR2='255,255,255'; $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252'; $conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;'; - $conf->global->THEME_ELDY_TEXT='50,50,160'; + $conf->global->THEME_ELDY_TEXT='50,50,130'; if ($dol_use_jmobile) { $conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // topmenu @@ -177,7 +177,7 @@ $tmpval+=(! empty($tmppart[2]) ? $tmppart[2] : ''); $tmpval+=(! empty($tmppart[3]) ? $tmppart[3] : ''); //print $tmpval; if ($tmpval < 340) $colortextmain='FFFFFF'; -else $colortextmain='101010'; +else $colortextmain='444444'; $usecss3=true; if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false; @@ -353,7 +353,9 @@ th .button { .right { text-align: <?php print $right; ?>; } - +.nowrap { + white-space: <?php print ($dol_optimize_smallscreen?'normal':'nowrap'); ?>; +} /* ============================================================================== */ @@ -510,6 +512,7 @@ a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { white-space: nowrap; /* text-shadow: 1px 1px 1px #000000; */ color: #<?php echo $colortexttopmenu; ?>; + text-decoration: none; } a.tmenu:link, a.tmenu:visited { color: #<?php echo $colortexttopmenu; ?>; @@ -590,7 +593,6 @@ div.tmenucenter text-shadow: 1px 1px 1px #DDD; } - div.mainmenu { position : relative; background-repeat:no-repeat; @@ -1372,8 +1374,6 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktab1; ?>) 35%, rgb(<?php echo $colorbacktab2; ?>) 100%); - - background: white url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x; <?php } else { ?> background: #dee7ec; <?php } ?> @@ -1395,7 +1395,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active } a.tab:hover { - background: #EEEEEE url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x; + background: rgb(<?php echo $colorbacktabcard2; ?>) url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x; } a.tabimage { color: #434956; @@ -1675,6 +1675,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre /*font-weight: normal;*/ border-bottom: 1px solid #FDFFFF; white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>; + text-shadow:1px 0px 1px #ffffff; } tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre_sel { @@ -1683,6 +1684,7 @@ tr.liste_titre_sel th, th.liste_titre_sel, tr.liste_titre_sel td, td.liste_titre border-bottom: 1px solid #FDFFFF; white-space: <?php echo $dol_optimize_smallscreen?'normal':'nowrap'; ?>; text-decoration: underline; + text-shadow:1px 1px 1px #ffffff; } input.liste_titre { background: transparent; @@ -1794,6 +1796,9 @@ tr.box_titre { background-image: linear-gradient(bottom, rgb(<?php echo $colorbacktitle1; ?>) 15%, rgb(<?php echo $colorbacktitle2; ?>) 100%); <?php } ?> color: #<?php echo $colortextmain; ?>; + text-shadow:1px 1px 1px #FFFFFF; + /* color: #FFFFFF; + text-shadow:1px 1px 1px #444444; */ font-family: <?php print $fontlist ?>, sans-serif; font-weight: bold; border-bottom: 1px solid #FDFFFF; @@ -2574,6 +2579,9 @@ div.dolEventError h1, div.dolEventError h2 { li.ui-li-divider .ui-link { color: #FFF !important; } +a.ui-link, a.ui-link:hover { + text-decoration: none; +} .ui-btn-inner { padding-left: 10px; padding-right: 10px; @@ -2611,6 +2619,9 @@ a.tab span.ui-btn-inner color: rgb(<?php print $colortext; ?>) !important; } +a.ui-link { + word-wrap: break-word; +} /* Warning: setting this make screen not beeing refreshed after a combo selection */ /*.ui-body-c { diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 61220a41737..d100c9b3778 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -114,7 +114,7 @@ if ($resql) print '<td align="center">'.$mc->label.'</td>'; } print '<td align="center">'.$obj->nb.'</td>'; - print '<td align="right" nowrap="nowrap">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>'; + print '<td align="right" class="nowrap">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>'; print "</tr>\n"; $i++; } diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 0ff27f4cc38..1f291d6b160 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -277,9 +277,9 @@ if ($id) if ($caneditperms) { print '<tr '. $bc[$var].'>'; - print '<td nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName(); + print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName(); print '<a name="'.$objMod->getName().'"> </a></td>'; - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print '<a title='.$langs->trans("All").' alt='.$langs->trans("All").' href="perms.php?id='.$fgroup->id.'&action=addrights&module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>"; print '/'; print '<a title='.$langs->trans("None").' alt='.$langs->trans("None").' href="perms.php?id='.$fgroup->id.'&action=delrights&module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>"; @@ -292,7 +292,7 @@ if ($id) print '<tr '. $bc[$var].'>'; // Module - print '<td nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName().'</td>'; + print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName().'</td>'; if (in_array($obj->id, $permsgroup)) { diff --git a/htdocs/user/home.php b/htdocs/user/home.php index 537a4671b5a..33e80336e95 100644 --- a/htdocs/user/home.php +++ b/htdocs/user/home.php @@ -239,7 +239,7 @@ if ($canreadperms) print $mc->label; print '</td>'; } - print '<td nowrap="nowrap" align="right">'.dol_print_date($db->jdate($obj->datec),'dayhour').'</td>'; + print '<td class="nowrap" align="right">'.dol_print_date($db->jdate($obj->datec),'dayhour').'</td>'; print "</tr>"; $i++; } diff --git a/htdocs/user/index.php b/htdocs/user/index.php index 0713e3cb226..479f156e343 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -161,10 +161,10 @@ if ($result) print '</td>'; // Date creation - print '<td nowrap="nowrap" align="center">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>'; + print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datec),"dayhour").'</td>'; // Date last login - print '<td nowrap="nowrap" align="center">'.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").'</td>'; + print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($obj->datelastlogin),"dayhour").'</td>'; // Statut $userstatic->statut=$obj->statut; diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index 7d4f11a2fdd..568cebad27e 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -182,7 +182,7 @@ if ($action == 'edit') print $s?$s.' ':''; print ($conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)); print '</td>'; - print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":""); + print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_MAIN_LANG_DEFAULT" id="check_MAIN_LANG_DEFAULT" type="checkbox" '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":""); print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").'</td>'; print '<td>'; @@ -193,7 +193,7 @@ if ($action == 'edit') $var=!$var; print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>'; print '<td>'.$conf->global->MAIN_SIZE_LISTE_LIMIT.'</td>'; - print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); + print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_SIZE_LISTE_LIMIT" id="check_SIZE_LISTE_LIMIT" type="checkbox" '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":""); print ! empty($dolibarr_main_demo)?' disabled="disabled"':''; // Disabled for demo print '> '.$langs->trans("UsePersonalValue").'</td>'; print '<td><input class="flat" name="main_size_liste_limit" id="main_size_liste_limit" size="4" value="' . (! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?$fuser->conf->MAIN_SIZE_LISTE_LIMIT:'') . '"></td></tr>'; @@ -229,7 +229,7 @@ else print ($s?$s.' ':''); print (isset($conf->global->MAIN_LANG_DEFAULT) && $conf->global->MAIN_LANG_DEFAULT=='auto'?$langs->trans("AutoDetectLang"):$langs->trans("Language_".$conf->global->MAIN_LANG_DEFAULT)); print '</td>'; - print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>'; + print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($fuser->conf->MAIN_LANG_DEFAULT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>'; print '<td>'; $s=(isset($fuser->conf->MAIN_LANG_DEFAULT) ? picto_from_langcode($fuser->conf->MAIN_LANG_DEFAULT) : ''); print ($s?$s.' ':''); @@ -239,7 +239,7 @@ else $var=!$var; print '<tr '.$bc[$var].'><td>'.$langs->trans("MaxSizeList").'</td>'; print '<td>'.(! empty($conf->global->MAIN_SIZE_LISTE_LIMIT)?$conf->global->MAIN_SIZE_LISTE_LIMIT:' ').'</td>'; - print '<td align="left" nowrap="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>'; + print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' type="checkbox" disabled '.(! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>'; print '<td>' . (! empty($fuser->conf->MAIN_SIZE_LISTE_LIMIT)?$fuser->conf->MAIN_SIZE_LISTE_LIMIT:' ') . '</td></tr>'; print '</table><br>'; diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index bca0ba9ee6a..3554af45ffd 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -336,9 +336,9 @@ if ($result) { // On affiche ligne pour modifier droits print '<tr '. $bc[$var].'>'; - print '<td nowrap="nowrap">'.img_object('',$picto).' '.$objMod->getName(); + print '<td class="nowrap">'.img_object('',$picto).' '.$objMod->getName(); print '<a name="'.$objMod->getName().'"> </a></td>'; - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print '<a title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="perms.php?id='.$fuser->id.'&action=addrights&entity='.$entity.'&module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("All")."</a>"; print '/'; print '<a title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="perms.php?id='.$fuser->id.'&action=delrights&entity='.$entity.'&module='.$obj->module.'#'.$objMod->getName().'">'.$langs->trans("None")."</a>"; @@ -360,7 +360,7 @@ if ($result) { print '<td align="center">'.img_picto($langs->trans("Administrator"),'star').'</td>'; } - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print img_picto($langs->trans("Active"),'tick'); print '</td>'; } @@ -370,7 +370,7 @@ if ($result) { print '<td align="center"><a href="perms.php?id='.$fuser->id.'&action=delrights&rights='.$obj->id.'#'.$objMod->getName().'">'.img_edit_remove($langs->trans("Remove")).'</a></td>'; } - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print img_picto($langs->trans("Active"),'tick'); print '</td>'; } @@ -385,7 +385,7 @@ if ($result) print $form->textwithtooltip($langs->trans("Inherited"),$langs->trans("PermissionInheritedFromAGroup")); print '</td>'; } - print '<td align="center" nowrap="nowrap">'; + print '<td align="center" class="nowrap">'; print img_picto($langs->trans("Active"),'tick'); print '</td>'; } -- GitLab