Look: Uniformize look

This commit is contained in:
Laurent Destailleur 2009-07-26 11:19:11 +00:00
parent 9084de9388
commit e93964a718
18 changed files with 66 additions and 74 deletions

View File

@ -30,13 +30,16 @@ require("./pre.inc.php");
$langs->load("admin"); $langs->load("admin");
/*
* View
*/
llxHeader(); llxHeader();
print_fiche_titre("Dolibarr",'','setup'); print_fiche_titre("Dolibarr",'','setup');
print "<br>\n";
print $langs->trans("Version").':'; print $langs->trans("Version").':';
print '<ul>'; print '<ul>';
print '<li>'.DOL_VERSION.'</li>'; print '<li>'.DOL_VERSION.'</li>';

View File

@ -21,10 +21,10 @@
*/ */
/** /**
\file htdocs/admin/system/constall.php * \file htdocs/admin/system/constall.php
\brief Page d'info de toutes les constantes * \brief Page d'info de toutes les constantes
\version $Revision$ * \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -35,11 +35,14 @@ if (!$user->admin)
accessforbidden(); accessforbidden();
/*
* View
*/
llxHeader(); llxHeader();
print_fiche_titre($langs->trans("SummaryConst"),'','setup'); print_fiche_titre($langs->trans("SummaryConst"),'','setup');
print '<br>';
print '<table class="noborder">'; print '<table class="noborder">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameter").'</td>'; print '<td>'.$langs->trans("Parameter").'</td>';
@ -48,7 +51,7 @@ print "</tr>\n";
$sql = "SELECT rowid, name, value, type, note FROM ".MAIN_DB_PREFIX."const ORDER BY name ASC"; $sql = "SELECT rowid, name, value, type, note FROM ".MAIN_DB_PREFIX."const ORDER BY name ASC";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $i = 0;

View File

@ -68,10 +68,9 @@ if (! $base)
} }
else else
{ {
print '<br>';
print '<table class="noborder">'; print '<table class="noborder">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
if ($base==1) if ($base==1)
{ {
print '<td>'.$langs->trans("Tables").'</td>'; print '<td>'.$langs->trans("Tables").'</td>';
@ -83,10 +82,10 @@ else
print '<td>'.$langs->trans("Constraints").'</td>'; print '<td>'.$langs->trans("Constraints").'</td>';
print '<td>'.$langs->trans("ConstraintsType").'</td>'; print '<td>'.$langs->trans("ConstraintsType").'</td>';
} }
print "</tr>\n"; print "</tr>\n";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {
@ -98,7 +97,7 @@ else
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
if ($base==1) if ($base==1)
{ {
print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>'; print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
@ -110,7 +109,7 @@ else
print '<td>'.$obj->conname.'</td>'; print '<td>'.$obj->conname.'</td>';
print '<td>'.$obj->contype.'</td>'; print '<td>'.$obj->contype.'</td>';
} }
print '</tr>'; print '</tr>';
$i++; $i++;
} }

View File

@ -63,7 +63,7 @@ else if ($conf->db->type == 'pgsql')
} }
else if ($conf->db->type == 'mssql') else if ($conf->db->type == 'mssql')
{ {
//TODO: récupérer les infos du serveur //TODO: r<EFBFBD>cup<EFBFBD>rer les infos du serveur
//$sqls[0] = ""; //$sqls[0] = "";
//$base=3; //$base=3;
} }
@ -77,7 +77,6 @@ else
{ {
if ($base == 1) if ($base == 1)
{ {
print '<br>';
print '<table class="noborder">'; print '<table class="noborder">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("TableName").'</td>'; print '<td>'.$langs->trans("TableName").'</td>';
@ -92,9 +91,9 @@ else
print '<td>Last check</td>'; print '<td>Last check</td>';
print '<td>Collation</td>'; print '<td>Collation</td>';
print "</tr>\n"; print "</tr>\n";
$sql = "SHOW TABLE STATUS"; $sql = "SHOW TABLE STATUS";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
@ -106,7 +105,7 @@ else
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
$var=!$var; $var=!$var;
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>'; print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a></td>';
print '<td>'.$obj->Engine.'</td>'; print '<td>'.$obj->Engine.'</td>';
if ($row[1] == "MyISAM") if ($row[1] == "MyISAM")
@ -146,7 +145,7 @@ else
print '<td>Nbre de tuple supprimer</td>'; print '<td>Nbre de tuple supprimer</td>';
print "</tr>\n"; print "</tr>\n";
$sql = "select relname,seq_tup_read,idx_tup_fetch,n_tup_ins,n_tup_upd,n_tup_del from pg_stat_user_tables;"; $sql = "select relname,seq_tup_read,idx_tup_fetch,n_tup_ins,n_tup_upd,n_tup_del from pg_stat_user_tables;";
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {

View File

@ -44,7 +44,6 @@ $html=new Form($db);
llxHeader(); llxHeader();
print_fiche_titre($langs->trans("DatabaseConfiguration"),'','setup'); print_fiche_titre($langs->trans("DatabaseConfiguration"),'','setup');
print '<br>';
// Database // Database
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';

View File

@ -65,8 +65,6 @@ if (! $base)
} }
else else
{ {
print '<br>';
$result = $db->query($sql); $result = $db->query($sql);
if ($result) if ($result)
{ {

View File

@ -43,8 +43,6 @@ llxHeader();
print_fiche_titre("Dolibarr",'','setup'); print_fiche_titre("Dolibarr",'','setup');
print "<br>\n";
// Version // Version
$var=true; $var=true;
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';

View File

@ -41,7 +41,6 @@ llxHeader();
print_fiche_titre($langs->trans("AvailableModules"),'','setup'); print_fiche_titre($langs->trans("AvailableModules"),'','setup');
print "<br>\n";
print $langs->trans("ToActivateModule").'<br>'; print $langs->trans("ToActivateModule").'<br>';
print "<br>\n"; print "<br>\n";

View File

@ -14,15 +14,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
*/ */
/** /**
\file htdocs/admin/system/os.php * \file htdocs/admin/system/os.php
\brief Page des infos système de l'OS * \brief Page des infos syst<EFBFBD>me de l'OS
\version $Revision$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -32,25 +30,26 @@ $langs->load("admin");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
/*
* View
*/
llxHeader(); llxHeader();
print_fiche_titre("OS",'','setup'); print_fiche_titre("OS",'','setup');
print "<br>\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>'; print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
print "\n"; print "\n";
// Récupère l'OS au sens PHP // R<EFBFBD>cup<EFBFBD>re l'OS au sens PHP
print "<tr $bc[0]><td width=\"240\">".$langs->trans("PHP_OS")."</td><td>".PHP_OS."</td></tr>\n"; print "<tr $bc[0]><td width=\"240\">".$langs->trans("PHP_OS")."</td><td>".PHP_OS."</td></tr>\n";
// Récupère la version de l'OS // R<EFBFBD>cup<EFBFBD>re la version de l'OS
ob_start(); ob_start();
phpinfo(); phpinfo();
$chaine = ob_get_contents(); $chaine = ob_get_contents();
ob_end_clean(); ob_end_clean();
eregi('System </td><td class="v">([^\/]*)</td>',$chaine,$reg); eregi('System </td><td class="v">([^\/]*)</td>',$chaine,$reg);
print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>".$reg[1]."</td></tr>\n"; print "<tr $bc[1]><td width=\"240\">".$langs->trans("Version")."</td><td>".$reg[1]."</td></tr>\n";
print '</table>'; print '</table>';

View File

@ -14,16 +14,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/ */
/** /**
\file htdocs/admin/system/web.php * \file htdocs/admin/system/web.php
\brief Page des infos système du serveur Web * \brief Page des infos syst<EFBFBD>me du serveur Web
\version $Revision$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -32,13 +29,14 @@ $langs->load("admin");
if (!$user->admin) if (!$user->admin)
accessforbidden(); accessforbidden();
/*
* View
*/
llxHeader(); llxHeader();
print_fiche_titre($langs->trans("WebServer"),'','setup'); print_fiche_titre($langs->trans("WebServer"),'','setup');
print "<br>\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print "<tr class=\"liste_titre\"><td>".$langs->trans("Parameter")."</td><td>".$langs->trans("Value")."</td></tr>\n"; print "<tr class=\"liste_titre\"><td>".$langs->trans("Parameter")."</td><td>".$langs->trans("Value")."</td></tr>\n";
print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n"; print "<tr $bc[0]><td width=\"240\">".$langs->trans("Version")."</td><td>".$_SERVER["SERVER_SOFTWARE"]."</td></tr>\n";

View File

@ -38,13 +38,12 @@ $formfile = new FormFile($db);
/* /*
* Affichage page * View
*/ */
llxHeader('','','EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad'); llxHeader('','','EN:Backups|FR:Sauvegardes|ES:Copias_de_seguridad');
print_fiche_titre($langs->trans("Backup"),'','setup'); print_fiche_titre($langs->trans("Backup"),'','setup');
print '<br>';
print $langs->trans("BackupDesc",DOL_DATA_ROOT).'<br><br>'; print $langs->trans("BackupDesc",DOL_DATA_ROOT).'<br><br>';
print $langs->trans("BackupDesc2",DOL_DATA_ROOT).'<br>'; print $langs->trans("BackupDesc2",DOL_DATA_ROOT).'<br>';

View File

@ -39,7 +39,6 @@ if (! $user->admin)
llxHeader('','','EN:Restores|FR:Restaurations|ES:Restauraciones'); llxHeader('','','EN:Restores|FR:Restaurations|ES:Restauraciones');
print_fiche_titre($langs->trans("Restore"),'','setup'); print_fiche_titre($langs->trans("Restore"),'','setup');
print '<br>';
print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'<br><br>'; print $langs->trans("RestoreDesc",DOL_DATA_ROOT).'<br><br>';
print $langs->trans("RestoreDesc2",DOL_DATA_ROOT).'<br><br>'; print $langs->trans("RestoreDesc2",DOL_DATA_ROOT).'<br><br>';

View File

@ -60,7 +60,6 @@ $html=new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);
print_fiche_titre($langs->trans("Backup"),'','setup'); print_fiche_titre($langs->trans("Backup"),'','setup');
print '<br>';
/** /**
* Increase time limit for script execution and initializes some variables * Increase time limit for script execution and initializes some variables

View File

@ -15,16 +15,13 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*/ */
/** /**
\file htdocs/admin/tools/index.php * \file htdocs/admin/tools/index.php
\brief Page d'accueil de l'espace outils admin * \brief Page d'accueil de l'espace outils admin
\version $Revision$ * \version $Id$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -37,7 +34,7 @@ if (!$user->admin)
/* /*
* Affichage page * View
*/ */
llxHeader(); llxHeader();
@ -47,7 +44,6 @@ $form = new Form($db);
print_fiche_titre($langs->trans("SystemToolsArea"),'','setup'); print_fiche_titre($langs->trans("SystemToolsArea"),'','setup');
print "<br>";
print $langs->trans("SystemToolsAreaDesc").'<br>'; print $langs->trans("SystemToolsAreaDesc").'<br>';
print "<br>"; print "<br>";

View File

@ -117,7 +117,6 @@ llxHeader();
$html=new Form($db); $html=new Form($db);
print_fiche_titre($langs->trans("Purge"),'','setup'); print_fiche_titre($langs->trans("Purge"),'','setup');
print '<br>';
print $langs->trans("PurgeAreaDesc",$dolibarr_main_data_root).'<br>'; print $langs->trans("PurgeAreaDesc",$dolibarr_main_data_root).'<br>';
print '<br>'; print '<br>';

View File

@ -60,7 +60,6 @@ $wikihelp='EN:Installation_/_Upgrade|FR:Installation_/_Mise_a_jour|ES:Instalaci
llxHeader($langs->trans("Upgrade"),'',$wikihelp); llxHeader($langs->trans("Upgrade"),'',$wikihelp);
print_fiche_titre($langs->trans("Upgrade"),'','setup'); print_fiche_titre($langs->trans("Upgrade"),'','setup');
print '<br>';
print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>'; print $langs->trans("CurrentVersion").' : <b>'.DOL_VERSION.'</b><br>';
print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("FeatureNotYetAvailable").'</b><br>'; print $langs->trans("LastStableVersion").' : <b>'.$langs->trans("FeatureNotYetAvailable").'</b><br>';

View File

@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
* \file htdocs/admin/triggers.php * \file htdocs/admin/triggers.php
* \brief Page de configuration et activation des triggers * \brief Page de configuration et activation des triggers
@ -65,7 +65,7 @@ function Activate($value)
$objMod->init(); $objMod->init();
} }
// Activation des modules dont le module dépend // Activation des modules dont le module d<EFBFBD>pend
for ($i = 0; $i < sizeof($objMod->depends); $i++) for ($i = 0; $i < sizeof($objMod->depends); $i++)
{ {
Activate($objMod->depends[$i]); Activate($objMod->depends[$i]);
@ -74,8 +74,8 @@ function Activate($value)
} }
/** \brief Désactive un module /** \brief D<EFBFBD>sactive un module
\param value Nom du module a désactiver \param value Nom du module a d<EFBFBD>sactiver
*/ */
function UnActivate($value) function UnActivate($value)
{ {
@ -103,6 +103,9 @@ function UnActivate($value)
} }
/*
* View
*/
llxHeader("",""); llxHeader("","");
@ -110,7 +113,6 @@ $html = new Form($db);
print_fiche_titre($langs->trans("TriggersAvailable"),'','setup'); print_fiche_titre($langs->trans("TriggersAvailable"),'','setup');
print "<br>\n";
print $langs->trans("TriggersDesc")."<br>"; print $langs->trans("TriggersDesc")."<br>";
print "<br>\n"; print "<br>\n";
@ -192,10 +194,10 @@ foreach ($orders as $key => $value)
if (strtolower($reg[1]) == 'all') $disabledbymodule=0; if (strtolower($reg[1]) == 'all') $disabledbymodule=0;
else if (empty($conf->global->$constparam)) $disabledbymodule=2; else if (empty($conf->global->$constparam)) $disabledbymodule=2;
} }
// Show line for trigger file // Show line for trigger file
print "<tr $bc[$var]>\n"; print "<tr $bc[$var]>\n";
print '<td valign="top" width="14" align="center">'; print '<td valign="top" width="14" align="center">';
print $objMod->picto?img_object('',$objMod->picto):img_object('','generic'); print $objMod->picto?img_object('',$objMod->picto):img_object('','generic');
print '</td>'; print '</td>';
@ -214,12 +216,12 @@ foreach ($orders as $key => $value)
print img_tick(); print img_tick();
} }
print "</td>\n"; print "</td>\n";
print '<td valign="top">'; print '<td valign="top">';
$text ='<b>'.$langs->trans("Description").':</b><br>'; $text ='<b>'.$langs->trans("Description").':</b><br>';
$text.=$objMod->getDesc().'<br>'; $text.=$objMod->getDesc().'<br>';
$text.='<br><b>'.$langs->trans("Status").':</b><br>'; $text.='<br><b>'.$langs->trans("Status").':</b><br>';
if ($disabledbyname == 1) if ($disabledbyname == 1)
{ {
$text.=$langs->trans("TriggerDisabledByName").'<br>'; $text.=$langs->trans("TriggerDisabledByName").'<br>';
if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>'; if ($disabledbymodule == 2) $text.=$langs->trans("TriggerDisabledAsModuleDisabled",$module).'<br>';
@ -234,7 +236,7 @@ foreach ($orders as $key => $value)
print "</td>\n"; print "</td>\n";
print "</tr>\n"; print "</tr>\n";
} }
print "</table>\n"; print "</table>\n";

View File

@ -1881,6 +1881,8 @@ function print_titre($titre)
function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath=0) function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpath=0)
{ {
global $conf; global $conf;
if ($picto == 'setup') $picto='title.png';
if (empty($conf->browser->firefox) && $picto=='title.png') $picto='title.gif'; if (empty($conf->browser->firefox) && $picto=='title.png') $picto='title.gif';
print "\n"; print "\n";
@ -1913,6 +1915,8 @@ function print_fiche_titre($titre, $mesg='', $picto='title.png', $pictoisfullpat
function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title.png', $pictoisfullpath=0) function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $sortorder='', $center='', $num=-1, $totalnboflines=0, $picto='title.png', $pictoisfullpath=0)
{ {
global $conf,$langs; global $conf,$langs;
if ($picto == 'setup') $picto='title.png';
if (empty($conf->browser->firefox) && $picto=='title.png') $picto='title.gif'; if (empty($conf->browser->firefox) && $picto=='title.png') $picto='title.gif';
if ($num > $conf->liste_limit or $num == -1) if ($num > $conf->liste_limit or $num == -1)