From 0a9c7fc577e9b7ed8c30f0b694c10b7fec6f3ce4 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 31 Oct 2020 04:19:22 +0100
Subject: [PATCH] Look and feel v13

---
 htdocs/core/lib/admin.lib.php | 34 ++++++++++++++++++++++++++++------
 htdocs/install/upgrade.php    | 10 +++++-----
 htdocs/langs/en_US/admin.lang |  1 +
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 49ababf4a25..ac95b6062a8 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -296,8 +296,8 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
             $newsql = preg_replace('/__ENTITY__/i', (!empty($entity) ? $entity : $conf->entity), $sql);
 
-            // Ajout trace sur requete (eventuellement a commenter si beaucoup de requetes)
-            if (!$silent) print '<tr><td class="tdtop">'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
+            // Add log of request
+            if (!$silent) print '<tr class="trforrunsql"><td class="tdtop opacitymedium">'.$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);
 			$sqlmodified = 0;
 
@@ -404,12 +404,34 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
     if ($error == 0)
     {
-        if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
-        if (!$silent) print '<td class="right">'.$langs->trans("OK").'</td></tr>'."\n";
+    	if (!$silent) {
+    		print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
+        	print '<td class="right">'.$langs->trans("OK");
+        	//if (! empty($conf->use_javascript_ajax)) {
+	        	print '<script type="text/javascript" language="javascript">
+				jQuery(document).ready(function() {
+					function init_trrunsql()
+					{
+						console.log("toggle .trforrunsql");
+						jQuery(".trforrunsql").toggle();
+					}
+					init_trrunsql();
+					jQuery(".trforrunsqlshowhide").click(function() {
+						init_trrunsql();
+					});
+				});
+				</script>';
+	        	print ' - <a class="trforrunsqlshowhide" href="#">'.$langs->trans("ShowHideDetails").'</a>';
+        	//}
+        	print '</td></tr>'."\n";
+    	}
         $ok = 1;
     } else {
-        if (!$silent) print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
-        if (!$silent) print '<td class="right"><font class="error">'.$langs->trans("KO").'</font></td></tr>'."\n";
+    	if (!$silent) {
+    		print '<tr><td>'.$langs->trans("ProcessMigrateScript").'</td>';
+        	print '<td class="right"><font class="error">'.$langs->trans("KO").'</font>';
+        	print '</td></tr>'."\n";
+    	}
         $ok = 0;
     }
 
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index af05fb374d2..5545c4a3bcf 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -146,11 +146,11 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
     if ($db->connected)
     {
         print '<tr><td class="nowrap">';
-        print $langs->trans("ServerConnection")." : $dolibarr_main_db_host</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
+        print $langs->trans("ServerConnection")." : ".$dolibarr_main_db_host.'</td><td class="right">'.$langs->trans("OK").'</td></tr>'."\n";
         dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ServerConnection").": $dolibarr_main_db_host ".$langs->transnoentities("OK"));
         $ok = 1;
     } else {
-        print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->transnoentities("Error")."</td></tr>\n";
+        print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name).'</td><td class="right">'.$langs->transnoentities("Error")."</td></tr>\n";
         dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
         $ok = 0;
     }
@@ -160,11 +160,11 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
         if ($db->database_selected)
         {
             print '<tr><td class="nowrap">';
-            print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name."</td><td align=\"right\">".$langs->trans("OK")."</td></tr>\n";
+            print $langs->trans("DatabaseConnection")." : ".$dolibarr_main_db_name.'</td><td class="right">'.$langs->trans("OK")."</td></tr>\n";
             dolibarr_install_syslog("upgrade: Database connection successful: ".$dolibarr_main_db_name);
             $ok = 1;
         } else {
-            print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name)."</td><td align=\"right\">".$langs->trans("Error")."</td></tr>\n";
+            print "<tr><td>".$langs->trans("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name).'</td><td class="right">'.$langs->trans("Error")."</td></tr>\n";
             dolibarr_install_syslog("upgrade: ".$langs->transnoentities("ErrorFailedToConnectToDatabase", $dolibarr_main_db_name));
             $ok = 0;
         }
@@ -354,7 +354,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 	        {
 	        	if (in_array($dir.$file, $listoffileprocessed)) continue;
 
-	        	print '<tr><td colspan="2"><hr></td></tr>';
+	        	print '<tr><td colspan="2"><hr style="border-color: #ccc; border-top-style: none;"></td></tr>';
 	            print '<tr><td class="nowrap">'.$langs->trans("ChoosedMigrateScript").'</td><td class="right">'.$file.'</td></tr>'."\n";
 
 	            // Run sql script
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index e47390b9ce0..7c583329ef0 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -80,6 +80,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
+ShowHideDetails=Show-Hide details
 PreviewNotAvailable=Preview not available
 ThemeCurrentlyActive=Theme currently active
 CurrentTimeZone=TimeZone PHP (server)