git push origin developMerge branch 'vold-lu-fixes/formconfirm-pass-action' into develop

This commit is contained in:
Laurent Destailleur 2022-05-10 11:07:40 +02:00
commit 6ca331d382
3 changed files with 8 additions and 2 deletions

View File

@ -5055,8 +5055,8 @@ class Form
$autoOpen = false;
$dialogconfirm .= '-'.$button;
}
$pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.$action.'&confirm=yes';
$pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'confirm=no' : '');
$pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.urlencode($action).'&confirm=yes';
$pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.urlencode($action).'&confirm=no' : '');
// Add input fields into list of fields to read during submit (inputok and inputko)
if (is_array($formquestion)) {

View File

@ -4720,6 +4720,9 @@ div.titre {
padding-bottom: 5px;
font-weight: 400;
}
div.titre.small {
font-size: 1em;
}
div.fiche > table.table-fiche-title:first-of-type div {
color: var(--colortexttitlenotab);
font-size: 1.1em;

View File

@ -4591,6 +4591,9 @@ div.titre {
text-transform: uppercase;
/* text-shadow: 1px 1px 2px #FFFFFF; */
}
div.titre.small {
font-size: 1em;
}
div.titre {
color: var(--colortexttitlenotab);
}