This commit is contained in:
Laurent Destailleur 2016-12-23 00:28:16 +01:00
parent 1e1028605d
commit 2bfbf0f6a7
3 changed files with 14 additions and 8 deletions

View File

@ -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;

View File

@ -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))

View File

@ -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 '<body>'."\n";
print '<div style="text-align:center">';
print '<img src="../theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
print '<div class="divlogoinstall" style="text-align:center">';
print '<img class="imglogoinstall" src="../theme/dolibarr_logo.png" alt="Dolibarr logo"><br>';
print DOL_VERSION;
print '</div><br><br>';
print '</div><br>';
print '<span class="titre">'.$langs->trans("DolibarrSetup");
if ($subtitle) {
@ -423,7 +424,7 @@ function pHeader($subtitle,$next,$action='set',$param='',$forcejqueryurl='')
print '<table class="main" width="100%"><tr><td>'."\n";
print '<table class="main-inside" width="100%"><tr><td>'."\n";
print '<table class="'.$csstable.'" width="100%"><tr><td>'."\n";
}
/**