diff --git a/htdocs/install/default.css b/htdocs/install/default.css index 07e57668a1f..dfde26cdedb 100644 --- a/htdocs/install/default.css +++ b/htdocs/install/default.css @@ -27,9 +27,13 @@ body { table.main-inside { padding-left: 10px; padding-right: 10px; + padding-bottom: 10px; margin-bottom: 10px; margin-top: 10px; color: #000000; + border-top: 1px solid #ccc; + border-bottom: 1px solid #ccc; + line-height: 22px; } table.main { @@ -119,7 +123,8 @@ div.soustitre { table.main-inside { padding-left: 1px; - padding-right: 1px; + padding-right: 1px; + line-height: 20px; } span.titre { @@ -250,7 +255,7 @@ font.error { /* Next button */ div.nextbutton { - text-align: right; + text-align: center; margin-top: 10px; padding-top: 5px; padding-bottom: 5px; diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 73357faa5db..32dff5f10ef 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -72,7 +72,7 @@ if (@file_exists($forcedfile)) { session_start(); // To be able to keep info into session (used for not loosing pass during navigation. pass must not transit throug parmaeters) -pHeader($langs->trans("ConfigurationFile"),"step1","set","",(empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/')); +pHeader($langs->trans("ConfigurationFile"), "step1", "set", "", (empty($force_dolibarr_js_JQUERY)?'':$force_dolibarr_js_JQUERY.'/'), 'main-inside-bis'); // Test if we can run a first install process if (! is_writable($conffile)) diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index 2558c72feca..0a6c76fa786 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -359,9 +359,10 @@ function conf($dolibarr_main_document_root) * @param string $action Action code ('set' or 'upgrade') * @param string $param Param * @param string $forcejqueryurl Set jquery relative URL (must end with / if defined) + * @param string $csstable Css for table * @return void */ -function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='') +function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='',$csstable='main-inside') { global $conf; global $langs; @@ -406,10 +407,10 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='') print ''."\n"; - print '
'; - print 'Dolibarr logo
'; + print '
'; + print 'Dolibarr logo
'; print DOL_VERSION; - print '


'; + print '

'; print ''.$langs->trans("DolibarrSetup"); if ($subtitle) { @@ -423,7 +424,7 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='') print '
'."\n"; - print '
'."\n"; + print '
'."\n"; } /**