diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 60a290944e7..ac231453188 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -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;
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 5607bbad5b0..bd460a57046 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -471,7 +471,7 @@ if (!empty($force_install_noedit)) {
trans("Port"); ?>
- connected && $action == "set") { // Test on permission not r
print ' ';
print $langs->trans("ConfFileReload");
print ' ';
- print ' ';
+ print ''.img_picto('OK', 'tick').' ';
// 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 '';
- print ' ';
+ print ''.img_picto('OK', 'tick').' ';
} 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 '';
- print ' ';
+ print ''.img_picto('Error', 'warning', 'class="error"').' ';
print '';
// 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 '';
- print ' ';
+ print ''.img_picto('OK', 'tick').' ';
$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 '';
- print ' ';
+ print ''.img_picto('Error', 'warning', 'class="error"').' ';
print '';
// 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 "";
- print ' ';
+ print img_picto('OK', 'tick');
print " ";
// 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 "";
- print ' ';
+ print img_picto('OK', 'tick');
print " ";
$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 '';
- print ' ';
+ print img_picto('Error', 'warning', 'class="error"');
print " ";
// 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 '';
- print ' ';
+ print img_picto('Error', 'warning', 'class="error"');
print " ";
// warning message
@@ -1097,7 +1097,7 @@ function write_conf_file($conffile)
print $langs->trans("SaveConfigurationFile");
print ' '.$conffile.' ';
print "";
- print ' ';
+ print img_picto('OK', 'tick');
print " ";
} else {
$error++;
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index c74f318be27..6f2be263240 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -134,10 +134,10 @@ if ($action == "set") { // Test on permission not required. Already managed by
if ($db->connected) {
print "";
- print $langs->trans("ServerConnection")." : ".$conf->db->host.' ';
+ print $langs->trans("ServerConnection")." : ".$conf->db->host.''.img_picto('OK', 'tick').' ';
$ok = 1;
} else {
- print "Failed to connect to server : ".$conf->db->host.' ';
+ print "Failed to connect to server : ".$conf->db->host.' '.img_picto('Error', 'warning', 'class="error"').' ';
}
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 "Failed to select database ".$conf->db->name.' ';
+ print "Failed to select database ".$conf->db->name.' '.img_picto('Error', 'warning', 'class="error"').' ';
$ok = 0;
}
}
@@ -268,11 +268,11 @@ if ($action == "set") { // Test on permission not required. Already managed by
if ($tablefound) {
if ($error == 0) {
print '';
- print $langs->trans("TablesAndPrimaryKeysCreation").' ';
+ print $langs->trans("TablesAndPrimaryKeysCreation").''.img_picto('OK', 'tick').' ';
$ok = 1;
}
} else {
- print ''.$langs->trans("ErrorFailedToFindSomeFiles", $dir).' ';
+ print ''.$langs->trans("ErrorFailedToFindSomeFiles", $dir).' '.img_picto('Error', 'warning', 'class="error"').' ';
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 '';
- print $langs->trans("OtherKeysCreation").' ';
+ print $langs->trans("OtherKeysCreation").''.img_picto('OK', 'tick').' ';
$okkeys = 1;
}
}
@@ -469,9 +469,9 @@ if ($action == "set") { // Test on permission not required. Already managed by
print "".$langs->trans("FunctionsCreation")." ";
if ($ok) {
- print ' ';
+ print ''.img_picto('OK', 'tick').' ';
} else {
- print ' ';
+ print ''.img_picto('Error', 'warning', 'class="error"').' ';
$ok = 1;
}
}
@@ -584,9 +584,9 @@ if ($action == "set") { // Test on permission not required. Already managed by
print "".$langs->trans("ReferenceDataLoading")." ";
if ($ok) {
- print ' ';
+ print ''.img_picto('OK', 'tick').' ';
} else {
- print ' ';
+ print ''.img_picto('Error', 'warning', 'class="error"').' ';
$ok = 1; // Data loading are not blocking errors
}
}
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index d2dd1521432..e9ebbe3d7cf 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -526,11 +526,11 @@ if ($action == "set") {
print " ";
- print $langs->trans("YouNeedToPersonalizeSetup")." ";
+ print ''.$langs->trans("YouNeedToPersonalizeSetup")." ";
print ' ';
+ print ' ';
} else {
// If here MAIN_VERSION_LAST_UPGRADE is not empty
print $langs->trans("VersionLastUpgrade").': ' . getDolGlobalString('MAIN_VERSION_LAST_UPGRADE').' ';
@@ -540,7 +540,8 @@ if ($action == "set") {
print '';
+ print '';
+ print '';
}
}
} elseif (empty($action) || preg_match('/upgrade/i', $action)) {