Clean setup page

This commit is contained in:
Laurent Destailleur 2022-02-23 13:20:14 +01:00
parent 88f1ae9c13
commit 64ce13e273
3 changed files with 18 additions and 9 deletions

View File

@ -335,7 +335,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
// Add log of request // Add log of request
if (!$silent) { if (!$silent) {
print '<tr class="trforrunsql"><td class="tdtop opacitymedium"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n"; print '<tr class="trforrunsql'.md5($sqlfile).'"><td class="tdtop opacitymedium"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
} }
dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG); dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
$sqlmodified = 0; $sqlmodified = 0;
@ -454,18 +454,18 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
//if (!empty($conf->use_javascript_ajax)) { // use_javascript_ajax is not defined //if (!empty($conf->use_javascript_ajax)) { // use_javascript_ajax is not defined
print '<script type="text/javascript"> print '<script type="text/javascript">
jQuery(document).ready(function() { jQuery(document).ready(function() {
function init_trrunsql() function init_trrunsql'.md5($sqlfile).'()
{ {
console.log("toggle .trforrunsql"); console.log("toggle .trforrunsql'.md5($sqlfile).'");
jQuery(".trforrunsql").toggle(); jQuery(".trforrunsql'.md5($sqlfile).'").toggle();
} }
init_trrunsql(); init_trrunsql'.md5($sqlfile).'();
jQuery(".trforrunsqlshowhide").click(function() { jQuery(".trforrunsqlshowhide'.md5($sqlfile).'").click(function() {
init_trrunsql(); init_trrunsql'.md5($sqlfile).'();
}); });
}); });
</script>'; </script>';
print ' - <a class="trforrunsqlshowhide" href="#">'.$langs->trans("ShowHideDetails").'</a>'; print ' - <a class="trforrunsqlshowhide'.md5($sqlfile).'" href="#">'.$langs->trans("ShowHideDetails").'</a>';
//} //}
print '</td></tr>'."\n"; print '</td></tr>'."\n";

View File

@ -32,6 +32,10 @@
vertical-align: middle; vertical-align: middle;
} }
.right {
text-align: right;
}
.opacitymedium { .opacitymedium {
opacity: 0.5; opacity: 0.5;
} }

View File

@ -235,8 +235,12 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
// Force l'affichage de la progression // Force l'affichage de la progression
if ($ok) { if ($ok) {
print '<tr><td colspan="2">'.$langs->trans("PleaseBePatient").'</td></tr>'; print '<tr><td colspan="2"><span class="opacitymedium messagebepatient">'.$langs->trans("PleaseBePatient").'</span></td></tr>';
print '</table>';
flush(); flush();
print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
} }
@ -401,6 +405,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
} }
} }
if (empty($actiondone)) { if (empty($actiondone)) {
print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>'; print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>';
} }