This commit is contained in:
Laurent Destailleur 2012-01-04 11:44:15 +01:00
parent 90b7cd1aae
commit 7c99cfc06c
2 changed files with 17 additions and 7 deletions

View File

@ -331,12 +331,12 @@ else
// Array of install choices // Array of install choices
print '<table width="100%" border="1" cellpadding="2">'; print '<table width="100%" class="listofchoices">';
// Show first install line // Show first install line
print '<tr><td nowrap="nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>'; print '<tr class="listofchoices"><td class="listofchoices" nowrap="nowrap" align="center"><b>'.$langs->trans("FreshInstall").'</b>';
print '</td>'; print '</td>';
print '<td>'; print '<td class="listofchoices">';
print $langs->trans("FreshInstallDesc"); print $langs->trans("FreshInstallDesc");
if (empty($dolibarr_main_db_host)) // This means install process was not run if (empty($dolibarr_main_db_host)) // This means install process was not run
{ {
@ -347,7 +347,7 @@ else
$foundrecommandedchoice=1; // To show only once $foundrecommandedchoice=1; // To show only once
} }
print '</td>'; print '</td>';
print '<td align="center">'; print '<td class="listofchoices" align="center">';
if ($allowinstall) if ($allowinstall)
{ {
print '<a href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>'; print '<a href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
@ -393,8 +393,8 @@ else
$version=preg_split('/[\.-]/',DOL_VERSION); $version=preg_split('/[\.-]/',DOL_VERSION);
$newversionfrombis=''; $newversionfrombis='';
if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto; if (versioncompare($dolibarrversiontoarray,$version) < -2) $newversionfrombis='/'.$versionto;
print '<tr><td nowrap="nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.' -> '.$newversionto.'</b></td>'; print '<tr class="listofchoices"><td class="listofchoices" nowrap="nowrap" align="center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.' -> '.$newversionto.'</b></td>';
print '<td>'; print '<td class="listofchoices">';
print $langs->trans("UpgradeDesc"); print $langs->trans("UpgradeDesc");
if ($ok) if ($ok)
{ {
@ -421,7 +421,7 @@ else
} }
} }
print '</td>'; print '</td>';
print '<td align="center">'; print '<td class="listofchoices" align="center">';
if ($allowupgrade) if ($allowupgrade)
{ {
// If it's not last updagre script, action = upgrade_tmp, if last action = upgrade // If it's not last updagre script, action = upgrade_tmp, if last action = upgrade

View File

@ -76,6 +76,16 @@ margin-top: 10px;
color: #000000; color: #000000;
} }
table.listofchoices, tr.listofchoices, td.listofchoices {
border-collapse: collapse;
padding-top: 4px;
padding-bottom: 4px;
padding-left: 4px;
padding-right: 4px;
color: #000000;
border: 1px solid #888888 !important;
}
.installchoices table tr td { .installchoices table tr td {
margin-left: 2px; margin-left: 2px;
margin-right: 2px; margin-right: 2px;