This commit is contained in:
Laurent Destailleur 2026-01-11 17:40:21 +01:00
parent 6e9225ce8b
commit a96bba2199
5 changed files with 38 additions and 25 deletions

View file

@ -243,15 +243,22 @@ input:focus, textarea:focus, button:focus, select:focus {
input[type=text], input[type=password] {
border: 1px solid #ACBCBB;
padding: 4px;
border-radius: 4px;
padding: 5px;
}
select {
padding: 4px;
background-color: #fff;
border-radius: 4px;
padding: 5px;
}
input[type=text]:focus, input[type=password]:focus, textarea:focus, select:focus {
border: 1px solid #ACBCBB;
box-shadow: 0 0 5px #C091AF;
}
input[type=checkbox] {
transform: scale(1.25);
}
input:-webkit-autofill {
background: #FBFFEA none !important;
-webkit-box-shadow: 0 0 0 50px #FBFFEA inset;
@ -464,7 +471,12 @@ a.button:hover {
.text-security {
-webkit-text-security: disc;
}
.width75 {
width: 75px;
}
.width100 {
width: 100px;
}
.pictofixedwidth {
text-align: start;

View file

@ -471,7 +471,7 @@ if (!empty($force_install_noedit)) {
<tr class="hidesqlite">
<td class="label"><label for="db_port"><?php echo $langs->trans("Port"); ?></label></td>
<td class="label">
<input type="text"
<input type="text" class="width75"
name="db_port"
id="db_port"
value="<?php print (!empty($force_install_port)) ? $force_install_port : $dolibarr_main_db_port; ?>"

View file

@ -583,7 +583,7 @@ if (!$error && $db->connected && $action == "set") { // Test on permission not r
print '<tr><td>';
print $langs->trans("ConfFileReload");
print '</td>';
print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
print '<td>'.img_picto('OK', 'tick').'</td></tr>';
// Create database user if requested
if (isset($db_create_user) && ($db_create_user == "1" || $db_create_user == "on")) {
@ -641,7 +641,7 @@ if (!$error && $db->connected && $action == "set") { // Test on permission not r
print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user;
print '</td>';
print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
print '<td>'.img_picto('OK', 'tick').'</td></tr>';
} else {
if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS'
|| $db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS'
@ -669,7 +669,7 @@ if (!$error && $db->connected && $action == "set") { // Test on permission not r
print $langs->trans("UserCreation").' : ';
print $dolibarr_main_db_user;
print '</td>';
print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
print '<td>'.img_picto('Error', 'warning', 'class="error"').'</td>';
print '</tr>';
// warning message due to connection failure
@ -700,7 +700,7 @@ if (!$error && $db->connected && $action == "set") { // Test on permission not r
print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
print $dolibarr_main_db_name;
print '</td>';
print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
print '<td>'.img_picto('OK', 'tick').'</td></tr>';
$newdb->select_db($dolibarr_main_db_name);
$check1 = $newdb->getDefaultCharacterSetDatabase();
@ -728,7 +728,7 @@ if (!$error && $db->connected && $action == "set") { // Test on permission not r
print $langs->trans("DatabaseCreation")." (".$langs->trans("User")." ".$userroot.") : ";
print $dolibarr_main_db_name;
print '</td>';
print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td>';
print '<td>'.img_picto('Error', 'warning', 'class="error"').'</td>';
print '</tr>';
// warning message
@ -757,7 +757,7 @@ if (!$error && $db->connected && $action == "set") { // Test on permission not r
print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
print "</td><td>";
print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
print img_picto('OK', 'tick');
print "</td></tr>";
// server access ok, basic access ok
@ -767,7 +767,7 @@ if (!$error && $db->connected && $action == "set") { // Test on permission not r
print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name;
print "</td><td>";
print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
print img_picto('OK', 'tick');
print "</td></tr>";
$error = 0;
@ -777,7 +777,7 @@ if (!$error && $db->connected && $action == "set") { // Test on permission not r
print $langs->trans("DatabaseConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_name;
print '</td><td>';
print '<img src="../theme/eldy/img/error.png" alt="Error">';
print img_picto('Error', 'warning', 'class="error"');
print "</td></tr>";
// warning message
@ -795,7 +795,7 @@ if (!$error && $db->connected && $action == "set") { // Test on permission not r
print $langs->trans("ServerConnection")." (".$langs->trans("User")." ".$conf->db->user.") : ";
print $dolibarr_main_db_host;
print '</td><td>';
print '<img src="../theme/eldy/img/error.png" alt="Error">';
print img_picto('Error', 'warning', 'class="error"');
print "</td></tr>";
// warning message
@ -1097,7 +1097,7 @@ function write_conf_file($conffile)
print $langs->trans("SaveConfigurationFile");
print ' <strong>'.$conffile.'</strong>';
print "</td><td>";
print '<img src="../theme/eldy/img/tick.png" alt="Ok">';
print img_picto('OK', 'tick');
print "</td></tr>";
} else {
$error++;

View file

@ -134,10 +134,10 @@ if ($action == "set") { // Test on permission not required. Already managed by
if ($db->connected) {
print "<tr><td>";
print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
print $langs->trans("ServerConnection")." : ".$conf->db->host.'</td><td>'.img_picto('OK', 'tick').'</td></tr>';
$ok = 1;
} else {
print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
print "<tr><td>Failed to connect to server : ".$conf->db->host.'</td><td>'.img_picto('Error', 'warning', 'class="error"').'</td></tr>';
}
if ($ok) {
@ -145,7 +145,7 @@ if ($action == "set") { // Test on permission not required. Already managed by
dolibarr_install_syslog("step2: successful connection to database: ".$conf->db->name);
} else {
dolibarr_install_syslog("step2: failed connection to database :".$conf->db->name, LOG_ERR);
print "<tr><td>Failed to select database ".$conf->db->name.'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
print "<tr><td>Failed to select database ".$conf->db->name.'</td><td>'.img_picto('Error', 'warning', 'class="error"').'</td></tr>';
$ok = 0;
}
}
@ -268,11 +268,11 @@ if ($action == "set") { // Test on permission not required. Already managed by
if ($tablefound) {
if ($error == 0) {
print '<tr><td>';
print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
print $langs->trans("TablesAndPrimaryKeysCreation").'</td><td>'.img_picto('OK', 'tick').'</td></tr>';
$ok = 1;
}
} else {
print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
print '<tr><td>'.$langs->trans("ErrorFailedToFindSomeFiles", $dir).'</td><td>'.img_picto('Error', 'warning', 'class="error"').'</td></tr>';
dolibarr_install_syslog("step2: failed to find files to create database in directory ".$dir, LOG_ERR);
}
}
@ -394,7 +394,7 @@ if ($action == "set") { // Test on permission not required. Already managed by
if ($tablefound && $error == 0) {
print '<tr><td>';
print $langs->trans("OtherKeysCreation").'</td><td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
print $langs->trans("OtherKeysCreation").'</td><td>'.img_picto('OK', 'tick').'</td></tr>';
$okkeys = 1;
}
}
@ -469,9 +469,9 @@ if ($action == "set") { // Test on permission not required. Already managed by
print "<tr><td>".$langs->trans("FunctionsCreation")."</td>";
if ($ok) {
print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
print '<td>'.img_picto('OK', 'tick').'</td></tr>';
} else {
print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
print '<td>'.img_picto('Error', 'warning', 'class="error"').'</td></tr>';
$ok = 1;
}
}
@ -584,9 +584,9 @@ if ($action == "set") { // Test on permission not required. Already managed by
print "<tr><td>".$langs->trans("ReferenceDataLoading")."</td>";
if ($ok) {
print '<td><img src="../theme/eldy/img/tick.png" alt="Ok"></td></tr>';
print '<td>'.img_picto('OK', 'tick').'</td></tr>';
} else {
print '<td><img src="../theme/eldy/img/error.png" alt="Error"></td></tr>';
print '<td>'.img_picto('Error', 'warning', 'class="error"').'</td></tr>';
$ok = 1; // Data loading are not blocking errors
}
}

View file

@ -526,11 +526,11 @@ if ($action == "set") {
print "<br>";
print $langs->trans("YouNeedToPersonalizeSetup")."<br><br><br>";
print '<span class="opacitymedium">'.$langs->trans("YouNeedToPersonalizeSetup")."</span><br><br><br>";
print '<div class="center divlinktogotosetup"><a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($login) ? '&username='.urlencode($login) : '').'">';
print '<span class="fas fa-external-link-alt"></span> '.$langs->trans("GoToSetupArea");
print '</a></div><br>';
print '</a></div><br><br>';
} else {
// If here MAIN_VERSION_LAST_UPGRADE is not empty
print $langs->trans("VersionLastUpgrade").': <b><span class="ok">' . getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').'</span></b><br>';
@ -540,7 +540,8 @@ if ($action == "set") {
print '<div class="center"><a href="'.$dolibarr_main_url_root.'/install/index.php">';
print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToUpgradePage");
print '</a></div>';
print '</a>';
print '</div>';
}
}
} elseif (empty($action) || preg_match('/upgrade/i', $action)) {