Beautify instal pg.

Fix: Debian package

build/debian/patches/install.dpatch

@@ -11,7 +11,7 @@
 
 --- old/htdocs/filefunc.inc.php 2011-09-03 02:32:48.666952000 +0200
 +++ new/htdocs/filefunc.inc.php	2011-09-03 02:33:00.510952001 +0200
-@@ -64,8 +64,8 @@
+@@ -63,8 +63,8 @@
  $conffile = "conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems
@@ -24,7 +24,7 @@
  // Include configuration
 --- old/htdocs/install/inc.php	2011-09-03 02:33:26.450952000 +0200
 +++ new/htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -84,8 +84,8 @@
+@@ -71,8 +71,8 @@
  $conffile = "../conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems
@@ -37,7 +37,7 @@
  if (! defined('DONOTLOADCONF') && file_exists($conffile))
 --- old/htdocs/support/inc.php	2011-09-03 02:34:39.606952000 +0200
 +++ new/htdocs/support/inc.php	2011-09-03 02:33:59.814952000 +0200
-@@ -79,8 +79,8 @@
+@@ -69,8 +69,8 @@
  $conffile = "../conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems
@@ -46,5 +46,5 @@
 +$conffile = "/etc/dolibarr/conf.php";
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
- $charset="UTF-8";	// If not output format found in any conf file
+ 
  if (! defined('DONOTLOADCONF') && file_exists($conffile))

build/rpm/dolibarr-forrpm.patch

@@ -15,7 +15,7 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
 diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
 --- htdocs/install/inc.php.patch	2011-09-03 02:33:26.450952000 +0200
 +++ htdocs/install/inc.php	2011-09-03 02:33:36.286952001 +0200
-@@ -70,8 +70,8 @@
+@@ -71,8 +71,8 @@
  $conffile = "../conf/conf.php";
  $conffiletoshow = "htdocs/conf/conf.php";
  // For debian/redhat like systems
@@ -38,5 +38,5 @@ diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
 +$conffile = "/etc/dolibarr/conf.php";
 +$conffiletoshow = "/etc/dolibarr/conf.php";
  
+ 
  if (! defined('DONOTLOADCONF') && file_exists($conffile))
- {

htdocs/filefunc.inc.php

@@ -122,8 +122,8 @@ if (! defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && ! empty($_SERVER
 }
 if (empty($dolibarr_main_db_host))
 {
-	print 'Dolibarr setup is not yet complete.<br><br>'."\n";
+	print '<div align="center">Dolibarr setup is not yet complete.<br><br>'."\n";
-	print '<a href="install/index.php">Click here to finish Dolibarr install process</a> ...'."\n";
+	print '<a href="install/index.php">Click here to finish Dolibarr install process</a> ...</div>'."\n";
 	die;
 }
 if (empty($dolibarr_main_url_root))

htdocs/install/check.php

@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2004-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2004-2009	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2012	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
  * Copyright (C) 2005-2012	Regis Houssin			<regis@dolibarr.fr>
  *
@@ -52,12 +52,6 @@ dolibarr_install_syslog("Dolibarr install/upgrade process started");
 pHeader('','');     // No next step for navigation buttons. Next step is defined by clik on links.
 
 
-
-print '<center>';
-print '<img src="../theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
-print DOL_VERSION.'<br><br>';
-print '</center>';
-
 //print "<br>\n";
 //print $langs->trans("InstallEasy")."<br><br>\n";
 
@@ -372,7 +366,7 @@ else
 		print '<td class="listofchoices" align="center">';
 		if ($allowinstall)
 		{
-			print '<a href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
+			print '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
 		}
 		else
 		{
@@ -391,9 +385,9 @@ else
 		if (defined("MAIN_NOT_INSTALLED")) $allowupgrade=false;
 		$migrationscript=array( //array('from'=>'2.0.0', 'to'=>'2.1.0'),
 								//array('from'=>'2.1.0', 'to'=>'2.2.0'),
-								array('from'=>'2.2.0', 'to'=>'2.4.0'),
+								//array('from'=>'2.2.0', 'to'=>'2.4.0'),
-								array('from'=>'2.4.0', 'to'=>'2.5.0'),
+								//array('from'=>'2.4.0', 'to'=>'2.5.0'),
-								array('from'=>'2.5.0', 'to'=>'2.6.0'),
+								//array('from'=>'2.5.0', 'to'=>'2.6.0'),
 								array('from'=>'2.6.0', 'to'=>'2.7.0'),
 								array('from'=>'2.7.0', 'to'=>'2.8.0'),
 								array('from'=>'2.8.0', 'to'=>'2.9.0'),
@@ -448,7 +442,7 @@ else
 			if ($allowupgrade)
 			{
 				// If it's not last updagre script, action = upgrade_tmp, if last action = upgrade
-				print '<a href="upgrade.php?action=upgrade'.($count<count($migrationscript)?'_'.$versionto:'').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
+				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>';
 			}
 			else
 			{

htdocs/install/default.css

@@ -21,9 +21,9 @@ font-size:13px;
 font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
 /* background-color: #F4F4F4; */
-margin-left: 20px;
+margin-left: 30px;
-margin-right: 20px;
+margin-right: 30px;
-margin-top: 20px;
+margin-top: 15px;
 margin-bottom: 10px;
 }
 
@@ -61,6 +61,14 @@ padding: 0px 0px 0px 0px;
 margin: 0px 0px 0px 0px;
 }
 
+input[type=text] {
+    border: 1px solid #ACBCBB;
+}
+input[type=text]:focus, textarea:focus, select:focus {
+    border: 1px solid #ACBCBB;
+	box-shadow: 0 0 5px #C091AF;
+}
+
 table.main {
 background: #F0F0F0 url(background.png) repeat-x; 
 text-align: left;
@@ -86,6 +94,10 @@ color: #000000;
 border: 1px solid #888888 !important;
 }
 
+tr.listofchoices {
+    height: 42px;	
+}
+
 .blinkwait {
 	font-weight: bold;
 	text-decoration:blink !important;	
@@ -165,8 +177,8 @@ font-size: 13px;
 
 h3 {
 margin-top: 10px;
-font-size:18px;
+font-size:16px;
-font-weight: bold;
+font-weight: normal;
 color: #4965B3;
 }
 
@@ -183,7 +195,7 @@ td.label {
 color: #5945A3;
 padding: 5px 5px 5px 5px;
 margin: 0em 0em 0em 0em;
-border-bottom: 1px solid #8CACBB;
+border-bottom: 1px solid #CCCCDB;
 }
 
 /* Class for parameters example */
@@ -193,7 +205,7 @@ padding: 5px 5px 5px 5px;
 margin: 0em 0em 0em 0em;
 text-decoration:none;
 font-size: 11px;
-border-bottom: 1px solid #8CACBB;
+border-bottom: 1px solid #CCCCDB;
 }
 
 table {
@@ -219,3 +231,21 @@ ul {
 	padding-top: 0;
 	padding-bottom: 0;
 }
+
+
+.button {
+	background-color: #FFFFFF;
+    background-position: bottom;
+    border: 1px solid #C0C0C0;
+    padding: 0.3em 0.7em;
+    margin: 0em 0.5em;
+    -moz-border-radius:0px 5px 0px 5px;
+    -webkit-border-radius:0px 5px 0px 5px;
+    border-radius:0px 5px 0px 5px;
+    -moz-box-shadow: 2px 2px 3px #CCC;
+    -webkit-box-shadow: 2px 2px 3px #CCC;
+    box-shadow: 2px 2px 3px #CCC;
+}
+a.button:hover {
+    text-decoration:none;
+}

htdocs/install/etape1.php

@@ -706,7 +706,7 @@ function jsinfo()
 
 dolibarr_install_syslog("--- install/etape1.php end", LOG_INFO);
 
-pFooter($error,$setuplang,'jsinfo');
+pFooter($error,$setuplang,'jsinfo',1);
 
 
 /**

htdocs/install/fileconf.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2004      Sebastien DiCintio   <sdicintio@ressource-toi.org>
  * Copyright (C) 2005-2011 Regis Houssin        <regis@dolibarr.fr>
@@ -25,8 +25,8 @@
  *       \ingroup    install
  *       \brief      Ask all informations required to build Dolibarr htdocs/conf/conf.php file (will be wrote on disk on next page)
  */
-include_once 'inc.php';
 
+include_once 'inc.php';
 
 $err=0;
 
@@ -36,11 +36,13 @@ $langs->setDefaultLang($setuplang);
 $langs->load("install");
 $langs->load("errors");
 
+dolibarr_install_syslog("Fileconf: Entering fileconf.php page");
+
 // You can force preselected values of the config step of Dolibarr by adding a file
 // install.forced.php into directory htdocs/install (This is the case with some wizard
 // installer like DoliWamp, DoliMamp or DoliBuntu).
 // We first init "forced values" to nothing.
-if (! isset($force_install_noedit))				$force_install_noedit='';
+if (! isset($force_install_noedit))			$force_install_noedit='';	// 1=To block var specific to distrib, 2 to block all technical parameters
 if (! isset($force_install_type))				$force_install_type='';
 if (! isset($force_install_dbserver))			$force_install_dbserver='';
 if (! isset($force_install_port))				$force_install_port='';
@@ -54,18 +56,20 @@ if (! isset($force_install_databaserootpass))	$force_install_databaserootpass=''
 // Now we load forced value from install.forced.php file.
 $useforcedwizard=false;
 $forcedfile="./install.forced.php";
-if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";
+if ($conffile == "/etc/dolibarr/conf.php") $forcedfile="/etc/dolibarr/install.forced.php";	// Must be after inc.php
-if (@file_exists($forcedfile)) { $useforcedwizard=true; include_once $forcedfile; }
+if (@file_exists($forcedfile)) {
-
+	$useforcedwizard=true; include_once $forcedfile;
-dolibarr_install_syslog("Fileconf: Entering fileconf.php page");
+}
 
+//$force_install_message='This is the message';
+//$force_install_noedit=1;
 
 
 /*
  *	View
  */
 
-pHeader($langs->trans("ConfigurationFile"),"etape1");
+pHeader($langs->trans("ConfigurationFile"),"etape1","set","",($force_dolibarr_js_JQUERY?$force_dolibarr_js_JQUERY.'/':''));
 
 // Test if we can run a first install process
 if (! is_writable($conffile))
@@ -77,11 +81,27 @@ if (! is_writable($conffile))
 
 if (! empty($force_install_message))
 {
-    print '<b>'.$langs->trans($force_install_message).'</b><br>';
+    print '<div><table><tr><td valign="middle"><img src="../theme/common/information.png" style="height:40px;"></td><td valign="middle">'.$langs->trans($force_install_message).'</td></tr></table>';
+
+    /*print '<script type="text/javascript">';
+    print '	jQuery(document).ready(function() {
+				jQuery("#linktoshowtechnicalparam").click(function() {
+					jQuery(".hidewhenedit").hide();
+					jQuery(".hidewhennoedit").show();
+				});';
+    			if ($force_install_noedit) print 'jQuery(".hidewhennoedit").hide();';
+	print '});';
+    print '</script>';
+
+    print '<br><a href="#" id="linktoshowtechnicalparam" class="hidewhenedit">'.$langs->trans("ShowEditTechnicalParameters").'</a><br>';
+    */
 }
 
 ?>
-<table class="nobordernopadding">
+<div>
+
+
+<table class="nobordernopadding<?php if ($force_install_noedit) print ' hidewhennoedit'; ?>">
 
 	<tr>
 		<td colspan="3" class="label" align="center">
@@ -449,6 +469,7 @@ if (! empty($force_install_message))
 	</tr>
 
 </table>
+</div>
 
 <script type="text/javascript">
 jQuery(document).ready(function() {

htdocs/install/inc.php

@@ -28,6 +28,7 @@
 if (! defined('DOL_INC_FOR_VERSION_ERROR')) define('DOL_INC_FOR_VERSION_ERROR','1');
 require_once '../filefunc.inc.php';
 
+
 // Define DOL_DOCUMENT_ROOT and ADODB_PATH used for install/upgrade process
 if (! defined('DOL_DOCUMENT_ROOT'))	    define('DOL_DOCUMENT_ROOT', '..');
 if (! defined('ADODB_PATH'))
@@ -304,15 +305,18 @@ function conf($dolibarr_main_document_root)
  * @param 	string		$next				Next
  * @param 	string		$action    			Action code ('set' or 'upgrade')
  * @param 	string		$param				Param
+ * @param	string		$forcejqueryurl		Set jquery relative URL (must end with / if defined)
  * @return	void
  */
-function pHeader($soutitre,$next,$action='set',$param='')
+function pHeader($soutitre,$next,$action='set',$param='',$forcejqueryurl='')
 {
     global $conf;
     global $langs;
     $langs->load("main");
     $langs->load("admin");
 
+    $jquerytheme='smoothness';
+
     // On force contenu dans format sortie
     header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
@@ -321,12 +325,30 @@ function pHeader($soutitre,$next,$action='set',$param='')
     print '<head>'."\n";
     print '<meta http-equiv="content-type" content="text/html; charset='.$conf->file->character_set_client.'">'."\n";
     print '<link rel="stylesheet" type="text/css" href="default.css">'."\n";
-    print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/smoothness/jquery-ui-latest.custom.css" type="text/css">'."\n";
+
-    print '<script type="text/javascript" src="../includes/jquery/js/jquery-latest.min.js"></script>'."\n";
+    print '<!-- Includes CSS for JQuery -->'."\n";
-    print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui-latest.custom.min.js"></script>'."\n";
+    if ($forcejqueryurl) print '<link rel="stylesheet" type="text/css" href="'.$forcejquerydir.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
+    else if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css" />'."\n";  // JQuery
+    else print '<link rel="stylesheet" type="text/css" href="../includes/jquery/css/'.$jquerytheme.'/jquery-ui-latest.custom.css" />'."\n";    // JQuery
+
+    print '<!-- Includes JS for JQuery -->'."\n";
+    if ($forcejqueryurl) print '<script type="text/javascript" src="'.$forcejqueryurl.'jquery.min.js"></script>'."\n";
+    else if (constant('JS_JQUERY')) print '<script type="text/javascript" src="'.JS_JQUERY.'jquery.min.js"></script>'."\n";
+    else print '<script type="text/javascript" src="../includes/jquery/js/jquery-latest.min'.$ext.'"></script>'."\n";
+    if ($forcejqueryurl) print '<script type="text/javascript" src="'.$forcejqueryurl.'jquery-ui.min.js"></script>'."\n";
+    else if (constant('JS_JQUERY_UI')) print '<script type="text/javascript" src="'.JS_JQUERY_UI.'jquery-ui.min.js"></script>'."\n";
+    else print '<script type="text/javascript" src="../includes/jquery/js/jquery-ui-latest.custom.min'.$ext.'"></script>'."\n";
+
     print '<title>'.$langs->trans("DolibarrSetup").'</title>'."\n";
     print '</head>'."\n";
+
     print '<body>'."\n";
+
+    print '<center>';
+    print '<img src="../theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
+    print DOL_VERSION.'<br><br>';
+    print '</center>';
+
     print '<span class="titre">'.$langs->trans("DolibarrSetup");
     if ($soutitre) {
         print ' - '.$soutitre;
@@ -348,9 +370,10 @@ function pHeader($soutitre,$next,$action='set',$param='')
  * @param 	string	$nonext				No button "Next step"
  * @param	string	$setuplang			Language code
  * @param	string	$jscheckfunction	Add a javascript check function
+ * @param	string	$withpleasewait		Add also please wait tags
  * @return	void
  */
-function pFooter($nonext=0,$setuplang='',$jscheckfunction='')
+function pFooter($nonext=0,$setuplang='',$jscheckfunction='', $withpleasewait=0)
 {
     global $conf,$langs;
 
@@ -365,7 +388,7 @@ function pFooter($nonext=0,$setuplang='',$jscheckfunction='')
         print '<div class="nextbutton" id="nextbutton"><input type="submit" value="'.$langs->trans("NextStep").' ->"';
         if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
         print '></div>';
-        print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>'.$langs->trans("NextStepMightLastALongTime").'<br><br><div class="blinkwait">'.$langs->trans("PleaseBePatient").'</div></div>';
+        if ($withpleasewait) print '<div style="visibility: hidden;" class="pleasewait" id="pleasewait"><br>'.$langs->trans("NextStepMightLastALongTime").'<br><br><div class="blinkwait">'.$langs->trans("PleaseBePatient").'</div></div>';
     }
     if ($setuplang)
     {

htdocs/install/index.php

@@ -48,11 +48,6 @@ $formadmin=new FormAdmin('');	// Note: $db does not exist yet but we don't need
 pHeader("", "check");   // Etape suivante = check
 
 
-print '<center>';
-print '<img src="../theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
-print DOL_VERSION.'<br><br>';
-print '</center>';
-
 // Ask installation language
 print '<br><br><center>';
 print '<table>';

htdocs/langs/en_US/install.lang

@@ -155,6 +155,7 @@ MigrationShippingDelivery2=Upgrade storage of shipping 2
 MigrationFinished=Migration finished
 LastStepDesc=<strong>Last step</strong>: Define here login and password you plan to use to connect to software. Do not loose this as it is the account to administer all others.
 ActivateModule=Activate module %s
+ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 
 #########
 # upgrade

htdocs/langs/fr_FR/install.lang

@@ -160,6 +160,7 @@ LinkedElementsInvalidDeleted=<b>%s</b> liaisons invalides ont été supprimées
 NothingToDelete=Aucune liaison invalide trouvée
 SourceType=Source
 TargetType=Cible
+ShowEditTechnicalParameters=Cliquer ici pour afficher/éditer les paramètres techniques (mode expert)
 
 #########
 # upgrade

htdocs/support/inc.php

@@ -72,6 +72,7 @@ $conffiletoshow = "htdocs/conf/conf.php";
 //$conffile = "/etc/dolibarr/conf.php";
 //$conffiletoshow = "/etc/dolibarr/conf.php";
 
+
 if (! defined('DONOTLOADCONF') && file_exists($conffile))
 {
 	$result=include_once $conffile;	// Load conf file