From c1e747fa39d25490d6c1992684ebc7316fb70a0b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 4 Jul 2017 13:05:02 +0200
Subject: [PATCH] Look and feel v6
---
htdocs/adherents/stats/byproperties.php | 2 +-
htdocs/adherents/stats/geo.php | 2 +-
htdocs/opensurvey/list.php | 14 +++++++++++---
htdocs/resource/list.php | 4 +++-
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/htdocs/adherents/stats/byproperties.php b/htdocs/adherents/stats/byproperties.php
index f067b27b3d4..ded3dec120e 100644
--- a/htdocs/adherents/stats/byproperties.php
+++ b/htdocs/adherents/stats/byproperties.php
@@ -101,7 +101,7 @@ else
$head = member_stats_prepare_head($adh);
-dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), 0, 'user');
+dol_fiche_head($head, 'statsbyproperties', $langs->trans("Statistics"), -1, 'user');
// Print title
diff --git a/htdocs/adherents/stats/geo.php b/htdocs/adherents/stats/geo.php
index 1f9ff189068..1c6944c2a0a 100644
--- a/htdocs/adherents/stats/geo.php
+++ b/htdocs/adherents/stats/geo.php
@@ -198,7 +198,7 @@ if ($mode)
$head = member_stats_prepare_head($adh);
-dol_fiche_head($head, $tab, $langs->trans("Statistics"), 0, 'user');
+dol_fiche_head($head, $tab, $langs->trans("Statistics"), -1, 'user');
// Print title
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 0593f9ccd05..d5a17f02239 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -172,7 +172,7 @@ while ($i < min($num,$limit))
$opensurvey_static->id=$obj->id_sondage;
$opensurvey_static->status=$obj->status;
-
+
print '<tr>';
print '<td>';
print '<a href="'.dol_buildpath('/opensurvey/card.php',1).'?id='.$obj->id_sondage.'">'.img_picto('','object_opensurvey').' '.$obj->id_sondage.'</a>';
@@ -198,19 +198,27 @@ while ($i < min($num,$limit))
print '</td>';
print'<td align="right">'.$nbuser.'</td>'."\n";
-
+
print '<td align="center">'.dol_print_date($db->jdate($obj->date_fin),'day');
if ($db->jdate($obj->date_fin) < time()) { print ' ('.$langs->trans("Expired").')'; }
print '</td>';
print'<td align="center">'.$opensurvey_static->getLibStatut(5).'</td>'."\n";
-
+
print'<td align="center"></td>'."\n";
print '</tr>'."\n";
$i++;
}
+// If no record found
+if ($num == 0)
+{
+ $colspan=8;
+ //foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+ print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+}
+
print '</table>'."\n";
print '</div>';
print '</form>';
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 11405d15acc..53658c588c6 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -311,7 +311,9 @@ if ($ret)
}
else
{
- print '<tr><td class="opacitymedium">'.$langs->trans('NoResourceInDatabase').'</td></tr>';
+ $colspan=1;
+ foreach($arrayfields as $key => $val) { if (! empty($val['checked'])) $colspan++; }
+ print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
}
print '</table>';
--
GitLab