diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index f58894c212c..13a77fdcb0a 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1548,7 +1548,7 @@ if (empty($mode) || $mode == 'show_month') { // View by month print ''; print '
'; - print ''; + print '
'; print ' '; // Column title of weeks numbers echo ' '; @@ -1659,7 +1659,7 @@ if (empty($mode) || $mode == 'show_month') { // View by month print ''; print '
'; - print '
#
'; + print '
'; print ' '; $i = 0; while ($i < 7) { @@ -1727,7 +1727,7 @@ if (empty($mode) || $mode == 'show_month') { // View by month print ''; print '
'; - echo '
'; + echo '
'; echo ' '; echo ' \n"; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 1274346b70f..014c728e5c4 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -836,7 +836,7 @@ echo '
'; $colorsbytype = array(); while ($currentdaytoshow < $lastdaytoshow) { - echo '
'.$langs->trans("Day".$arraytimestamp['wday'])."
'; + echo '
'; echo ''; echo ''; + $out .= ''; $documenturl = DOL_URL_ROOT.'/document.php'; if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) { diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php index 2bbea639c7b..51bfec7cab0 100644 --- a/htdocs/core/tpl/filemanager.tpl.php +++ b/htdocs/core/tpl/filemanager.tpl.php @@ -278,7 +278,7 @@ if ($action == 'convertimgwebp' && $permtoadd) { if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete') { $langs->load("ecm"); - print '
'; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 471c571a680..87cc659819f 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -886,7 +886,10 @@ class FormFile } } + $i = 0; foreach ($file_list as $file) { + $i++; + // Define relative path for download link (depends on module) $relativepath = (string) $file["name"]; // Cas general if ($modulesubdir) { @@ -896,7 +899,7 @@ class FormFile $relativepath = (string) $file["name"]; // Other case } - $out .= '
'."\n"; + print '
'."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php index 98f10bdaab2..e43612b658c 100644 --- a/htdocs/ecm/index_auto.php +++ b/htdocs/ecm/index_auto.php @@ -453,7 +453,7 @@ if ($action == 'delete_section') { if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'deletefile') { - print '
'."\n"; + print '
'."\n"; print ''."\n"; print ''."\n"; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 755869ceb23..fa209693316 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4255,22 +4255,24 @@ table.noborder.cal_month { border-bottom-left-radius: px; border-bottom-right-radius: px; } -table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child td:first-child, -table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:first-child, -table.tagtable.liste:not(.paymenttable, .margintable) tr.liste_titre:first-child td:first-child { +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child td:first-child, +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child th:first-child, +table.tagtable.liste:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child td:first-child, +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.trfirstline td:first-child { border-top-left-radius: px; } -table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child td:last-child, -table.noborder:not(.paymenttable, .margintable) tr.liste_titre:first-child th:last-child, -table.tagtable.liste:not(.paymenttable, .margintable) tr.liste_titre:first-child th:last-child { +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child td:last-child, +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child th:last-child, +table.tagtable.liste:not(.listwithfilterbefore, .paymenttable, .margintable) tr.liste_titre:first-child th:last-child, +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr.trfirstline td:last-child { border-top-right-radius: px; } -table.noborder:not(.paymenttable, .margintable) tr:last-child td:first-child, -table.noborder:not(.paymenttable, .margintable) tr:last-child th:first-child { +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr:last-child td:first-child, +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr:last-child th:first-child { border-bottom-left-radius: px; } -table.noborder:not(.paymenttable, .margintable) tr:last-child td:last-child, -table.noborder:not(.paymenttable, .margintable) tr:last-child th:last-child { +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr:last-child td:last-child, +table.noborder:not(.listwithfilterbefore, .paymenttable, .margintable) tr:last-child th:last-child { border-bottom-right-radius: px; } table.noborder thead tr:last-child td:first-child,