From d0e5d9fd1bccbf1d9620af0033c3b38da1f0edd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 5 May 2014 12:08:19 +0200
Subject: [PATCH 1/2] Improved usability of install wizard

---
 htdocs/install/check.php        | 166 ++++++++++++++++++++++----------
 htdocs/langs/en_US/install.lang |   3 +
 2 files changed, 117 insertions(+), 52 deletions(-)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index a2d64df5019..769331efa97 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -331,39 +331,45 @@ else
 		print $langs->trans("InstallEasy")." ";
 		print $langs->trans("ChooseYourSetupMode");
 
+        print '<br /><br />';
 
 		$foundrecommandedchoice=0;
 
-
-		// Array of install choices
-		print '<table width="100%" class="listofchoices">';
+        $available_choices = array();
+        $notavailable_choices = array();
 
 		// Show first install line
-		print '<tr class="listofchoices"><td class="listofchoices nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>';
-		print '</td>';
-		print '<td class="listofchoices">';
-		print $langs->trans("FreshInstallDesc");
+		$choice = '<tr class="listofchoices"><td class="listofchoices nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>';
+		$choice .= '</td>';
+		$choice .= '<td class="listofchoices">';
+		$choice .= $langs->trans("FreshInstallDesc");
 		if (empty($dolibarr_main_db_host))	// This means install process was not run
 		{
-			print '<br>';
+            $choice .= '<br>';
 			//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
-			print '<center><div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div></center>';
+			$choice .= '<center><div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div></center>';
 			// <img src="../theme/eldy/img/tick.png" alt="Ok"> ';
 			$foundrecommandedchoice=1;	// To show only once
 		}
-		print '</td>';
-		print '<td class="listofchoices" align="center">';
+
+        $choice .= '</td>';
+        $choice .= '<td class="listofchoices" align="center">';
 		if ($allowinstall)
 		{
-			print '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
+            $choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
 		}
 		else
 		{
-			print $langs->trans("InstallNotAllowed");
+            $choice .= $langs->trans("InstallNotAllowed");
 		}
-		print '</td>';
-		print '</tr>'."\n";
+        $choice .= '</td>';
+        $choice .= '</tr>'."\n";
 
+        if ($allowinstall) {
+            $available_choices[] = $choice;
+        } else {
+            $notavailable_choices[] = $choice;
+        }
 
 		// Show upgrade lines
 		$allowupgrade=true;
@@ -392,7 +398,11 @@ else
 		$count=0;
 		foreach ($migrationscript as $migarray)
 		{
+
+            $choice = '';
+
 			$count++;
+            $recommended_choice = false;
             $version=DOL_VERSION;
 			$versionfrom=$migarray['from'];
             $versionto=$migarray['to'];
@@ -407,58 +417,110 @@ else
             {
             	$newversionfrombis=' '.$langs->trans("or").' '.$versionto;
             }
-			print '<tr class="listofchoices"><td class="listofchoices nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
-			print '<td class="listofchoices">';
-			print $langs->trans("UpgradeDesc");
 
-			if ($ok)
-			{
-				if (count($dolibarrlastupgradeversionarray) >= 2)	// If a database access is available and last upgrade version is known
-				{
-					// Now we check if this is the first qualified choice
-					if ($allowupgrade && empty($foundrecommandedchoice) &&
-						(versioncompare($dolibarrversiontoarray,$dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray,$versionarray) < -2)
-						)
-					{
-						print '<br>';
-						//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
-						print '<center><div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div>';
-						if ($count < count($migarray))	// There is other choices after
-						{
-							print $langs->trans("MigrateIsDoneStepByStep",DOL_VERSION);
-						}
-						print '</center>';
-						// <img src="../theme/eldy/img/tick.png" alt="Ok"> ';
-						$foundrecommandedchoice=1;	// To show only once
-					}
-				}
-				else {
-					// We can not recommand a choice.
-					// A version of install may be known, but we need last upgrade.
-				}
-			}
-			print '</td>';
-			print '<td class="listofchoices" align="center">';
+            if ($ok)
+            {
+                if (count($dolibarrlastupgradeversionarray) >= 2)	// If a database access is available and last upgrade version is known
+                {
+                    // Now we check if this is the first qualified choice
+                    if ($allowupgrade && empty($foundrecommandedchoice) &&
+                        (versioncompare($dolibarrversiontoarray,$dolibarrlastupgradeversionarray) > 0 || versioncompare($dolibarrversiontoarray,$versionarray) < -2)
+                    )
+                    {
+                        $foundrecommandedchoice=1;	// To show only once
+                        $recommended_choice = true;
+                    }
+                }
+                else {
+                    // We can not recommand a choice.
+                    // A version of install may be known, but we need last upgrade.
+                }
+            }
+
+            $choice .= '<tr class="listofchoices" '.($recommended_choice ? 'style="background-color:lightyellow"' : '').'>';
+            $choice .= '<td class="listofchoices nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
+            $choice .= '<td class="listofchoices">';
+            $choice .= $langs->trans("UpgradeDesc");
+
+            if ($recommended_choice) {
+                $choice .= '<br>';
+                //print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
+                $choice .= '<center><div class="ok">'.$langs->trans("InstallChoiceSuggested").'</div>';
+                if ($count < count($migarray))	// There is other choices after
+                {
+                    print $langs->trans("MigrateIsDoneStepByStep",DOL_VERSION);
+                }
+                $choice .= '</center>';
+            }
+
+            $choice .= '</td>';
+            $choice .= '<td class="listofchoices" align="center">';
 			if ($allowupgrade)
 			{
 				// If it's not last updagre script, action = upgrade_tmp, if last action = upgrade
-				print '<a class="button" href="upgrade.php?action=upgrade'.($count<count($migrationscript)?'_'.$versionto:'').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
+                $choice .= '<a class="button" href="upgrade.php?action=upgrade'.($count<count($migrationscript)?'_'.$versionto:'').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
 			}
 			else
 			{
-				print $langs->trans("NotAvailable");
+                $choice .= $langs->trans("NotAvailable");
 			}
-			print '</td>';
-			print '</tr>'."\n";
+            $choice .= '</td>';
+            $choice .= '</tr>'."\n";
+
+            if ($allowupgrade) {
+                $available_choices[] = $choice;
+            } else {
+                $notavailable_choices[] = $choice;
+            }
 		}
 
-		print '</table>';
-		print "\n";
+        // Array of install choices
+        print '<table width="100%" class="listofchoices">';
+        foreach ($available_choices as $choice) {
+            print $choice;
+        }
+
+        print '</table>';
+
+        if (count($notavailable_choices)) {
+
+            print '<br />';
+            print '<div id="AShowChoices">';
+            print '<img src="../theme/eldy/img/1downarrow.png"> <a href="#">'.$langs->trans('ShowNotAvailableOptions').'</a>';
+            print '</div>';
+
+            print '<div id="navail_choices" style="display:none">';
+            print '<br />';
+            print '<table width="100%" class="listofchoices">';
+            foreach ($notavailable_choices as $choice) {
+                print $choice;
+            }
+
+            print '</table>';
+            print '</div>';
+        }
+
 	}
 
 }
 
+print '<script type="text/javascript">
 
+$("div#AShowChoices a").click(function() {
+
+    $("div#navail_choices").toggle();
+
+    if ($("div#navail_choices").css("display") == "none") {
+        $(this).text("'.$langs->trans('ShowNotAvailableOptions').'");
+        $(this).parent().children("img").attr("src", "../theme/eldy/img/1downarrow.png");
+    } else {
+        $(this).text("'.$langs->trans('HideNotAvailableOptions').'");
+        $(this).parent().children("img").attr("src", "../theme/eldy/img/1uparrow.png");
+    }
+
+});
+
+</script>';
 
 pFooter(1);	// 1 car ne doit jamais afficher bouton Suivant
 
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index d4da279f8cb..20abe7b9c70 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -206,3 +206,6 @@ MigrationProjectTaskTime=Update time spent in seconds
 MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
+
+ShowNotAvailableOptions=Show not available options
+HideNotAvailableOptions=Hide not available options
\ No newline at end of file

From 8532f967af0b6c9662ff560cf6a60245a5143408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcos=20Garci=CC=81a=20de=20La=20Fuente?=
 <marcosgdf@gmail.com>
Date: Mon, 5 May 2014 12:24:39 +0200
Subject: [PATCH 2/2] Missing Copyright info

---
 htdocs/install/check.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index 769331efa97..7e2f57cfb02 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@capnetworks.com>
  * Copyright (C) 2013		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2014       Marcos García           <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by