From b3d27521cb238fe20c4261f3b66b4aa2009c3e12 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Mar 2017 10:55:35 +0100
Subject: [PATCH] Fix Must use tdoverflowmax100 instead of tdoverflow
---
htdocs/core/boxes/box_services_expired.php | 14 ++++++++------
htdocs/core/boxes/modules_boxes.php | 2 +-
htdocs/theme/eldy/style.css.php | 4 ++--
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index f2bc86cdac5..90f36ef6d30 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -83,6 +83,8 @@ class box_services_expired extends ModeleBoxes
$i = 0;
+ $thirdpartytmp = new Societe($this->db);
+
while ($i < $num)
{
$late='';
@@ -100,13 +102,13 @@ class box_services_expired extends ModeleBoxes
'text' => ($objp->ref?$objp->ref:$objp->rowid), // Some contracts have no ref
'url' => DOL_URL_ROOT."/contrat/card.php?id=".$objp->rowid);
- $this->info_box_contents[$i][2] = array('td' => 'align="left" width="16"',
- 'logo' => 'company',
- 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
+ $thirdpartytmp->id = $objp->socid;
+ $thirdpartytmp->name = $objp->name;
- $this->info_box_contents[$i][3] = array('td' => 'class="tdoverflow maxwidth100onsmartphone" align="left"',
- 'text' => $objp->name,
- 'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
+ $this->info_box_contents[$i][2] = array('td' => 'class="tdoverflowmax100 maxwidth100onsmartphone" align="left"',
+ 'text' => $thirdpartytmp->getNomUrl(1, 'customer'),
+ 'asis' => 1
+ );
$this->info_box_contents[$i][4] = array('td' => 'align="center"',
'text' => dol_print_date($dateline,'day'),
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 9a093cff927..3ebac7e7ab0 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -240,7 +240,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty"
$out.= '>';
if ($conf->use_javascript_ajax)
{
- $out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflow maxwidth300onsmartphone">';
+ $out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax100 maxwidth100onsmartphone">';
}
if (! empty($head['text']))
{
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 090bb3f887c..ffb3e7b83f8 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -583,13 +583,13 @@ div.myavailability {
text-overflow: ellipsis;
white-space: nowrap;
}
-.tdoverflowmax100 {
+.tdoverflowmax100 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 100px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
-.tdoverflowmax300 {
+.tdoverflowmax300 { /* For tdoverflow, the max-midth become a minimum ! */
max-width: 300px;
overflow: hidden;
text-overflow: ellipsis;
--
GitLab