From 825369230f525c750022605c54daece62a16f8c9 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 20 Jun 2015 23:33:13 +0200
Subject: [PATCH] Finishment of look
---
htdocs/comm/card.php | 6 +++---
htdocs/compta/recap-compta.php | 2 +-
htdocs/societe/agenda.php | 4 ++--
htdocs/societe/consumption.php | 6 +++---
htdocs/societe/document.php | 2 +-
htdocs/societe/note.php | 2 +-
htdocs/societe/price.php | 18 ++++++++++--------
7 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 8058eaff9f8..6bf5c5a5dca 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -228,7 +228,7 @@ if ($id > 0)
print '</td></tr>';
// Alias names (commercial, trademark or alias names)
- print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">';
+ print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $object->name_alias;
print "</td></tr>";
@@ -265,7 +265,7 @@ if ($id > 0)
}
// Address
- print '<tr><td valign="top">'.$langs->trans('Address').'</td><td colspan="3">';
+ print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3">';
dol_print_address($object->address,'gmap','thirdparty',$object->id);
print "</td></tr>";
@@ -500,7 +500,7 @@ if ($id > 0)
{
$langs->load("members");
$langs->load("users");
- print '<tr><td width="25%" valign="top">'.$langs->trans("LinkedToDolibarrMember").'</td>';
+ print '<tr><td width="25%">'.$langs->trans("LinkedToDolibarrMember").'</td>';
print '<td colspan="3">';
$adh=new Adherent($db);
$result=$adh->fetch('','',$object->id);
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 0375297316b..19ac5705ef1 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -115,7 +115,7 @@ if ($socid > 0)
if (! $num > 0)
{
- print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
+ print '<tr '.$bc[false].'><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
}
$solde = 0;
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 31ddda84933..4648992506b 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -87,7 +87,7 @@ if ($socid)
print '</td></tr>';
// Alias names (commercial, trademark or alias names)
- print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">';
+ print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $object->name_alias;
print "</td></tr>";
@@ -119,7 +119,7 @@ if ($socid)
print '<tr><td>'.$langs->trans('Gencod').'</td><td colspan="3">'.$object->barcode.'</td></tr>';
}
- print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">";
+ print "<tr><td>".$langs->trans('Address')."</td><td colspan=\"3\">";
dol_print_address($object->address, 'gmap', 'thirdparty', $object->id);
print "</td></tr>";
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 18cc214246d..a883a2568d9 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2012-2013 Philippe Berthet <berthet@systune.be>
- * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2013-2015 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2015 Marcos García <marcosgdf@gmail.com>
*
@@ -121,8 +121,8 @@ print $form->showrefnav($object,'socid','',($user->societe_id?0:1),'rowid','nom'
print '</td></tr>';
// Alias names (commercial, trademark or alias names)
-print '<tr id="name_alias"><td valign="top"><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
-print '<td colspan="3"><input type="text" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'" size="32"></td></tr>';
+print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
+print '<td colspan="3">'.$object->name_alias.'</td></tr>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{
diff --git a/htdocs/societe/document.php b/htdocs/societe/document.php
index a4ca499ab5a..f1961e02b2d 100644
--- a/htdocs/societe/document.php
+++ b/htdocs/societe/document.php
@@ -119,7 +119,7 @@ if ($object->id)
print '</td></tr>';
// Alias names (commercial, trademark or alias names)
- print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">';
+ print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $object->name_alias;
print "</td></tr>";
diff --git a/htdocs/societe/note.php b/htdocs/societe/note.php
index 271c69872ce..c7db3b66645 100644
--- a/htdocs/societe/note.php
+++ b/htdocs/societe/note.php
@@ -83,7 +83,7 @@ if ($id > 0)
print '</td></tr>';
// Alias names (commercial, trademark or alias names)
- print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">';
+ print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $object->name_alias;
print "</td></tr>";
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 6f1f4e1a42c..6246b203c83 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
@@ -138,7 +138,7 @@ print $form->showrefnav($soc, 'socid', '', ($user->societe_id ? 0 : 1), 'rowid',
print '</td></tr>';
// Alias names (commercial, trademark or alias names)
-print '<tr><td valign="top">'.$langs->trans('AliasNames').'</td><td colspan="3">';
+print '<tr><td>'.$langs->trans('AliasNames').'</td><td colspan="3">';
print $soc->name_alias;
print "</td></tr>";
@@ -169,7 +169,7 @@ if (! empty($conf->barcode->enabled)) {
print '<tr><td>' . $langs->trans('Gencod') . '</td><td colspan="3">' . $soc->barcode . '</td></tr>';
}
-print "<tr><td valign=\"top\">" . $langs->trans('Address') . "</td><td colspan=\"3\">";
+print "<tr><td>" . $langs->trans('Address') . "</td><td colspan=\"3\">";
dol_print_address($soc->address, 'gmap', 'thirdparty', $soc->id);
print "</td></tr>";
@@ -536,14 +536,16 @@ if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
// Action
if ($user->rights->produit->creer || $user->rights->service->creer) {
print '<td align="right">';
- print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete_customer_price&socid=' . $soc->id . '&lineid=' . $line->id . '">';
- print img_delete();
+ print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_customer_price&socid=' . $soc->id . '&prodid=' . $line->fk_product . '">';
+ print img_info();
print '</a>';
+ print ' ';
print '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit_customer_price&socid=' . $soc->id . '&lineid=' . $line->id . '">';
- print img_edit();
+ print img_edit('default', 0, 'style="vertical-align: middle;"');
print '</a>';
- print '<a href="' . $_SERVER["PHP_SELF"] . '?action=showlog_customer_price&socid=' . $soc->id . '&prodid=' . $line->fk_product . '">';
- print img_info();
+ print ' ';
+ print '<a href="' . $_SERVER["PHP_SELF"] . '?action=delete_customer_price&socid=' . $soc->id . '&lineid=' . $line->id . '">';
+ print img_delete('default', 'style="vertical-align: middle;"');
print '</a>';
print '</td>';
}
--
GitLab