diff --git a/htdocs/index.php b/htdocs/index.php
index 3e33570a379..59233f5f110 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -606,6 +606,14 @@ $dashboardgroup = array (
),
);
+$object=new stdClass();
+$parameters=array(
+ 'dashboardgroup' => $dashboardgroup
+);
+$reshook=$hookmanager->executeHooks('addOpenElementsDashboardGroup', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook == 0) {
+ $dashboardgroup = array_merge($dashboardgroup, $hookmanager->resArray);
+}
// Calculate total nb of late
@@ -677,7 +685,7 @@ if (!empty($valid_dashboardlines))
foreach($dashboardgroup as $groupKey => $groupElement) {
$boards = array();
- if(!empty($conf->global->MAIN_DISPLAY_NEW_OPENED_DASH_BOARD))
+ if(!empty($conf->global->MAIN_DISPLAY_NEW_OPENED_DASH_BOARD) || !empty($conf->global->MAIN_FEATURES_LEVEL))
{
foreach ($groupElement['stats'] as $infoKey)
{
@@ -756,11 +764,16 @@ if (!empty($valid_dashboardlines))
$weatherDashBoard.= ' '."\n";
$weatherDashBoard.= '
'."\n";
$weatherDashBoard.= '
'.$langs->trans('GlobalOpenedElemView').'' . "\n";
- $weatherDashBoard.= '
'.$langs->transnoentitiesnoconv("NActionsLate", $totalLateNumber).'' . "\n";
if($totallatePercentage>0 && !empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE)){
- $weatherDashBoard.= '
';
- $weatherDashBoard.= '
'.$langs->trans('NActionsLate', price($totallatePercentage).'%').'' . "\n";
+ $weatherDashBoard.= '
'.$langs->transnoentitiesnoconv("NActionsLate", price($totallatePercentage).'%').'' . "\n";
+ $weatherDashBoard.= '
'.$langs->trans('NActionsLate', $totalLateNumber).'' . "\n";
+ }
+ else{
+ $weatherDashBoard.= '
'.$langs->transnoentitiesnoconv("NActionsLate", $totalLateNumber).'' . "\n";
+ if($totallatePercentage>0){
+ $weatherDashBoard.= '
'.$langs->trans('NActionsLate', price($totallatePercentage).'%').'' . "\n";
+ }
}
$weatherDashBoard.= '
'."\n";
diff --git a/htdocs/theme/md/badges.inc.php b/htdocs/theme/md/badges.inc.php
new file mode 100644
index 00000000000..390348e2919
--- /dev/null
+++ b/htdocs/theme/md/badges.inc.php
@@ -0,0 +1,204 @@
+
+/*