diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php index 0571ec3056f..8a886c78e11 100644 --- a/htdocs/blockedlog/admin/blockedlog_list.php +++ b/htdocs/blockedlog/admin/blockedlog_list.php @@ -333,7 +333,7 @@ if (GETPOST('withtab', 'alpha')) { print dol_get_fiche_head($head, 'fingerprints', '', -1); } -print ''.$langs->trans("FingerprintsDesc")."
\n"; +print '
'.$langs->trans("FingerprintsDesc")."
\n"; print '
'; diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php index aaad9fa40d8..7054b13febe 100644 --- a/htdocs/comm/action/class/cactioncomm.class.php +++ b/htdocs/comm/action/class/cactioncomm.class.php @@ -162,6 +162,8 @@ class CActionComm global $langs, $conf, $user; $langs->load("commercial"); + $actionstatic = new ActionComm($this->db); + $rep_id = array(); $rep_code = array(); $rep_all = array(); @@ -294,17 +296,25 @@ class CActionComm } $label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label)); + /* + $actionstatic->type_color = $obj->type_color; + $actionstatic->type_picto = $obj->type_picto; + $actionstatic->type = $obj->type; + $picto = $actionstatic->getTypePicto(); + $label = $picto.$label; + */ + if (($onlyautoornot == -1 || $onlyautoornot == -2) && getDolGlobalString('AGENDA_USE_EVENT_TYPE')) { // Add a group of elements if ($typecalendar == 'system' || $typecalendar == 'user') { $label = '   '.$label; $TSystem['id'][-99] = $langs->trans("ActionAC_MANUAL"); - $TSystem['code']['AC_NON_AUTO'] = '-- '.$langs->trans("ActionAC_MANUAL"); + $TSystem['code']['AC_NON_AUTO'] = '-- '.$langs->trans("ActionAC_MANUAL").''; } if ($typecalendar == 'systemauto') { $label = '   '.$label; $TSystemAuto['id'][-98] = $langs->trans("ActionAC_AUTO"); - $TSystemAuto['code']['AC_ALL_AUTO'] = '-- '.$langs->trans("ActionAC_AUTO"); + $TSystemAuto['code']['AC_ALL_AUTO'] = '-- '.$langs->trans("ActionAC_AUTO").''; } if ($typecalendar == 'module') { @@ -314,7 +324,7 @@ class CActionComm $idforallfornewmodule--; } $TModule['id'][-1 * $idforallfornewmodule] = $langs->trans("ActionAC_ALL_".strtoupper($module)); - $TModule['code']['AC_ALL_'.strtoupper($module)] = '-- '.$langs->trans("Module").' '.ucfirst($module); + $TModule['code']['AC_ALL_'.strtoupper($module)] = '-- '.$langs->trans("Module").' '.ucfirst($module).''; } } // Add element diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index bff470b4ba1..78b71241705 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1726,11 +1726,11 @@ if (empty($mode) || $mode == 'show_month') { // View by month print ''; print '
'; - echo ''; + echo '
'; echo ' '; echo ' \n"; - echo " \n"; + echo " \n"; /* echo '
'; @@ -1741,13 +1741,12 @@ if (empty($mode) || $mode == 'show_month') { // View by month echo "
\n"; */ - echo '
'.$langs->trans("Day".$arraytimestamp['wday'])."
'; - print '
'; + print ''; /* WIP View per hour */ $useviewhour = 0; if ($useviewhour) { - print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table + print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table $maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file @@ -1787,13 +1786,19 @@ if (empty($mode) || $mode == 'show_month') { // View by month print '
'; } else { - print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table + print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table // @phan-suppress-next-line PhanPluginSuspiciousParamPosition show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, 0, $bookcalcalendars); print '
'; } + + + print ''; + + echo ''; + print '
'; } print "\n".''; diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index 07a9095d0a6..456adbdcb78 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -761,6 +761,8 @@ print '
'; print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, '', $filtert, '', $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid, $search_categ_cus); print '
'; +$moreforfilter = 1; + print '
'; print ''."\n"; diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php index 96f4a3b7780..9a213d994a6 100644 --- a/htdocs/core/class/html.formactions.class.php +++ b/htdocs/core/class/html.formactions.class.php @@ -383,13 +383,6 @@ class FormActions // Suggest a list with manual events or all auto events $arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot, '', 0); // If we use param 'all' instead of 'code', there is no group by include in answer but the key 'type' of answer array contains the key for the group by. - /* Removed. The empty line must now be managed with param showempty - if (empty($multiselect)) { - // Add empty line at start only if no multiselect - array_unshift($arraylist, ' '); - } - */ - //asort($arraylist); if ($selected == 'manual') { $selected = 'AC_OTH'; @@ -411,6 +404,7 @@ class FormActions if (strpos($key, 'AC_ALL_') !== false && strpos($key, 'AC_ALL_AUTO') === false) { $disabled = 'disabled'; } + $newarraylist[$key] = array('id' => $key, 'label' => $value, 'disabled' => $disabled); } diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 68b0cdbf8c0..59001843f2d 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -176,7 +176,9 @@ class FormFile $out .= ' '; if ($sectionid) { // Show overwrite if exists for ECM module only $langs->load('link'); - $out .= ''; + $out .= ''; + $out .= ''; + $out .= ''; } $out .= 'transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Security"); $langs->load('other'); $out .= ' '; - $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetupAt", $menudolibarrsetupmax, $max, $maxphptoshowparam, $maxphptoshow), 1); + $out .= info_admin($langs->trans("ThisLimitIsDefinedInSetupAt", $menudolibarrsetupmax, $max, $maxphptoshowparam, $maxphptoshow), 1, 0, '1', 'classfortooltip'); } } else { $out .= ' ('.$langs->trans("UploadDisabled").')'; diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index cbcdf3b0019..b63a6806d99 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -97,7 +97,7 @@ function print_actions_filter( $multiselect = (getDolGlobalString('AGENDA_USE_EVENT_TYPE')); } print img_picto($langs->trans("ActionType"), 'square', 'class="pictofixedwidth inline-block" style="color: #ddd;"'); - print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? -1 : 1), 0, $multiselect, 0, 'minwidth200 maxwidth250 widthcentpercentminusx', 1); + print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (getDolGlobalString('AGENDA_USE_EVENT_TYPE') ? -1 : 1), 0, $multiselect, 0, 'minwidth150 maxwidth200 widthcentpercentminusx', 1); print ''; if ($canedit) { diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php index 6eb801f3595..d1b47859496 100644 --- a/htdocs/hrm/index.php +++ b/htdocs/hrm/index.php @@ -166,7 +166,7 @@ if (isModEnabled('holiday')) { print '
'; print '
'; print ''; - print ''; + print ''; print '
'.$langs->trans("Holidays").'
'; $out = ''; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index aeaffc982d3..f32232dfebe 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4257,10 +4257,14 @@ table.nointerlines tr:not(:last-child) td { /* Experimental code to manage rounding */ - + table.noborder:not(.cal_month) { border-radius: px; } +table.noborder.cal_month { + border-bottom-left-radius: px; + border-bottom-right-radius: px; +} table.liste:not(.listwithfilterbefore) { border-top-left-radius: px; border-top-right-radius: px; @@ -5959,14 +5963,14 @@ table.cal_month td { padding-left: 1px !important; padding-right: 1px !important .cal_other_month_right { border-right: solid 1px #C0C0C0; } .cal_other_month { /* opacity: 0.6; */ background: #FAFAFA; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_past_month { /* opacity: 0.6; */ background: #EEEEEE; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } -.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px !important; } +.cal_current_month { background: #FFFFFF; border-left: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_current_month_peruserleft { background: #FFFFFF; border-left: solid 2px #6C7C7B; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today { background: #FDFDF0; border-left: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today_peruser { background: #FDFDF0; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_today_peruser_peruserleft { background: #FDFDF0; border-left: solid 2px #6C7C7B; border-right: solid 1px #E0E0E0; border-bottom: solid 1px #E0E0E0; padding-: 2px; padding-: 1px; padding-top: 0px; padding-bottom: 0px; } .cal_past { } .cal_peruser { padding-top: 0 !important; padding-bottom: 0 !important; padding-: 1px !important; padding-: 1px !important; } -.cal_impair { ackground: linear-gradient(bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%); } +.cal_impair { background: linear-gradient(bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%); } .cal_today_peruser_impair { background: #F8F8F0; } .peruser_busy { } .peruser_notbusy { opacity: 0.5; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 7fed5a4dcce..bc4c8c00040 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -166,7 +166,7 @@ $dol_no_mouse_hover = $conf->dol_no_mouse_hover; //$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0; //var_dump($user->conf->THEME_ELDY_RGB); -$useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->THEME_ELDY_USEBOLDTITLE : 0); +$useboldtitle = getDolGlobalInt('THEME_ELDY_USEBOLDTITLE'); $borderwidth = 2; $userborderontable = getDolGlobalInt('THEME_ELDY_USEBORDERONTABLE');