lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uniformisation code.

Browse Source
This commit is contained in:
Laurent Destailleur 2008-03-02 21:30:39 +00:00
parent 2af8626ba6
commit 77e356d3d0
9 changed files with 146 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/comm/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2008 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -297,11 +297,11 @@ show_array_last_actions_done($max);
*/ */
if ($user->rights->societe->lire) if ($user->rights->societe->lire)
{ {
$sql = "SELECT s.rowid,s.nom,".$db->pdate("datec")." as datec"; $sql = "SELECT s.rowid,s.nom,s.client,".$db->pdate("datec")." as datec";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s"; $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.client = 1"; $sql.= " WHERE s.client in (1,2)";
if ($socid) if ($socid)
{ {
$sql .= " AND s.rowid = $socid"; $sql .= " AND s.rowid = $socid";
@ -323,7 +323,7 @@ if ($user->rights->societe->lire)
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("BoxTitleLastCustomers",$max).'</td></tr>'; print '<td colspan="3">'.$langs->trans("BoxTitleLastCustomersOrProspects",$max).'</td></tr>';
$i = 0; $i = 0;
$var=false; $var=false;
@ -331,7 +331,13 @@ if ($user->rights->societe->lire)
{ {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print "<td nowrap><a href=\"".DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->rowid."\">".img_object($langs->trans("ShowCustomer"),"company")." ".$objp->nom."</a></td>"; print "<td nowrap>";
if ($objp->client == 1) print "<a href=\"".DOL_URL_ROOT."/comm/fiche.php?socid=".$objp->rowid."\">".img_object($langs->trans("ShowCustomer"),"company")." ".$objp->nom."</a></td>";
if ($objp->client == 2) print "<a href=\"".DOL_URL_ROOT."/comm/prospect/fiche.php?socid=".$objp->rowid."\">".img_object($langs->trans("ShowCustomer"),"company")." ".$objp->nom."</a></td>";
print '<td align="right" nowrap>';
if ($objp->client == 1) print $langs->trans("Customer");
if ($objp->client == 2) print $langs->trans("Prospect");
print "</td>";
print '<td align="right" nowrap>'.dolibarr_print_date($objp->datec,'day')."</td>"; print '<td align="right" nowrap>'.dolibarr_print_date($objp->datec,'day')."</td>";
print '</tr>'; print '</tr>';
$i++; $i++;

68
htdocs/includes/menus/barre_left/auguria_backoffice.php
View File

@ -145,7 +145,7 @@ class MenuLeft {
if (! sizeof($this->menu_array)) if (! sizeof($this->menu_array))
{ {
print '<div class="blockvmenuimpair">'."\n"; print '<div class="blockvmenuimpair">'."\n";
print $langs->trans("NoPermission"); print $langs->trans("NoMenu");
print '</div>'; print '</div>';
} }
else else
@ -158,53 +158,55 @@ class MenuLeft {
{ {
if (($alt%2==0)) if (($alt%2==0))
{ {
print '<div class="menu">'."\n"; print '<div class="blockvmenuimpair">'."\n";
} }
else else
{ {
print '<div class="menu">'."\n"; print '<div class="blockvmenupair">'."\n";
} }
} }
if ($this->menu_array[$i]['level']==0) // Place tabulation
$tabstring='';
$tabul=($this->menu_array[$i]['level'] - 1);
if ($tabul > 0)
{
for ($j=0; $j < $tabul; $j++)
{
$tabstring.='&nbsp; &nbsp; ';
}
}
// Menu niveau 0
if ($this->menu_array[$i]['level']==0)
{ {
if ($contenu == 1) print '<div class="menu_fin"></div>'; if ($contenu == 1) print '<div class="menu_fin"></div>';
if ($this->menu_array[$i]['enabled']) if ($this->menu_array[$i]['enabled'])
{ {
print '<div class="menu_titre"><a class="menu_titre" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>'; print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
} }
else else
{ {
print '<div class="menu_titre"><font class="menu_titre_disabled">'.$this->menu_array[$i]['titre'].'</font></div>'; print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>';
} }
$contenu = 0; $contenu = 0;
} }
// Menu niveau > 0
if ($this->menu_array[$i]['level'] > 0)
if ($this->menu_array[$i]['level']==1) { {
if ($this->menu_array[$i]['enabled']) if ($this->menu_array[$i]['level']==1) $contenu = 1;
print '<div class="menu_contenu"><a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
else if ($this->menu_array[$i]['enabled'])
print '<div class="menu_contenu"><font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>'; {
$contenu = 1; print '<div class="menu_contenu">'.$tabstring.'<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
} }
else
{
if ($this->menu_array[$i]['level']==2) { print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>';
if ($this->menu_array[$i]['enabled']) }
print '<div class="menu_contenu">&nbsp; &nbsp;<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
else
print '<div class="menu_contenu">&nbsp; &nbsp;<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>';
} }
if ($this->menu_array[$i]['level']==3) {
if ($this->menu_array[$i]['enabled'])
print '<div class="menu_contenu">&nbsp; &nbsp; &nbsp; &nbsp; <a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
else
print '<div class="menu_contenu">&nbsp; &nbsp; &nbsp; &nbsp; <font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>';
}
if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) { if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) {
print "</div>\n"; print "</div>\n";
} }
@ -215,10 +217,6 @@ class MenuLeft {
} }
} }
} }

63
htdocs/includes/menus/barre_left/auguria_frontoffice.php
View File

@ -139,7 +139,7 @@ class MenuLeft {
if (! sizeof($this->menu_array)) if (! sizeof($this->menu_array))
{ {
print '<div class="blockvmenuimpair">'."\n"; print '<div class="blockvmenuimpair">'."\n";
print $langs->trans("NoPermission"); print $langs->trans("NoMenu");
print '</div>'; print '</div>';
} }
else else
@ -148,56 +148,59 @@ class MenuLeft {
for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++)
{ {
$alt++; $alt++;
if ($this->menu_array[$i]['level']==0) { if ($this->menu_array[$i]['level']==0)
{
if (($alt%2==0)) if (($alt%2==0))
{ {
print '<div class="menu">'."\n"; print '<div class="blockvmenuimpair">'."\n";
} }
else else
{ {
print '<div class="menu">'."\n"; print '<div class="blockvmenupair">'."\n";
} }
} }
if ($this->menu_array[$i]['level']==0) // Place tabulation
$tabstring='';
$tabul=($this->menu_array[$i]['level'] - 1);
if ($tabul > 0)
{
for ($j=0; $j < $tabul; $j++)
{
$tabstring.='&nbsp; &nbsp; ';
}
}
// Menu niveau 0
if ($this->menu_array[$i]['level']==0)
{ {
if ($contenu == 1) print '<div class="menu_fin"></div>'; if ($contenu == 1) print '<div class="menu_fin"></div>';
if ($this->menu_array[$i]['enabled']) if ($this->menu_array[$i]['enabled'])
{ {
print '<div class="menu_titre"><a class="menu_titre" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>'; print '<div class="menu_titre">'.$tabstring.'<a class="menu_titre" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
} }
else else
{ {
print '<div class="menu_titre"><font class="menu_titre_disabled">'.$this->menu_array[$i]['titre'].'</font></div>'; print '<div class="menu_titre">'.$tabstring.'<font class="menu_titre_disabled">'.$this->menu_array[$i]['titre'].'</font></div>';
} }
$contenu = 0; $contenu = 0;
} }
// Menu niveau > 0
if ($this->menu_array[$i]['level'] > 0)
if ($this->menu_array[$i]['level']==1) { {
if ($this->menu_array[$i]['enabled']) if ($this->menu_array[$i]['level']==1) $contenu = 1;
print '<div class="menu_contenu"><a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
else
print '<div class="menu_contenu"><font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>';
$contenu = 1;
}
if ($this->menu_array[$i]['level']==2) { if ($this->menu_array[$i]['enabled'])
if ($this->menu_array[$i]['enabled']) {
print '<div class="menu_contenu">&nbsp; &nbsp;<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>'; print '<div class="menu_contenu">'.$tabstring.'<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
else }
print '<div class="menu_contenu">&nbsp; &nbsp;<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>'; else
{
print '<div class="menu_contenu">'.$tabstring.'<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>';
}
} }
if ($this->menu_array[$i]['level']==3) {
if ($this->menu_array[$i]['enabled'])
print '<div class="menu_contenu">&nbsp; &nbsp; &nbsp; &nbsp; <a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
else
print '<div class="menu_contenu">&nbsp; &nbsp; &nbsp; &nbsp; <font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>';
}
if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) { if ($i == (sizeof($this->menu_array)-1) || $this->menu_array[$i+1]['level']==0) {
print "</div>\n"; print "</div>\n";
} }

41
htdocs/includes/menus/barre_left/eldy_backoffice.php
View File

@ -262,25 +262,6 @@ class MenuLeft {
{ {
$langs->load("companies"); $langs->load("companies");
// Actions
if ($conf->agenda->enabled)
{
$langs->load("agenda");
// Actions
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?leftmenu=agenda&amp;action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&amp;status=todo&amp;filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&amp;status=done&amp;filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read);
if ($user->rights->agenda->allactions->read)
{
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&amp;status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&amp;status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read);
}
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->allactions->read);
}
// Prospects // Prospects
$newmenu->add(DOL_URL_ROOT."/comm/prospect/index.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire); $newmenu->add(DOL_URL_ROOT."/comm/prospect/index.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire);
@ -894,6 +875,7 @@ class MenuLeft {
} }
else else
{ {
$contenu = 0;
for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++)
{ {
$alt++; $alt++;
@ -910,41 +892,48 @@ class MenuLeft {
} }
// Place tabulation // Place tabulation
$tabstring='';
$tabul=($this->menu_array[$i]['level'] - 1); $tabul=($this->menu_array[$i]['level'] - 1);
if ($tabul > 0) if ($tabul > 0)
{ {
for ($j=0; $j < $tabul; $j++) for ($j=0; $j < $tabul; $j++)
{ {
print '&nbsp; &nbsp; '; $tabstring.='&nbsp; &nbsp; ';
} }
} }
// Menu niveau 0 // Menu niveau 0
if ($this->menu_array[$i]['level'] == 0) if ($this->menu_array[$i]['level'] == 0)
{ {
if ($contenu == 1) print '<div class="menu_fin"></div>';
if ($this->menu_array[$i]['enabled']) if ($this->menu_array[$i]['enabled'])
{ {
print '<a class="vmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a><br>'; print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
} }
else else
{ {
print '<font class="vmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>'; print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>';
} }
} }
// Menu niveau > 0 // Menu niveau > 0
if ($this->menu_array[$i]['level'] > 0) if ($this->menu_array[$i]['level'] > 0)
{ {
if ($this->menu_array[$i]['level']==1) $contenu = 1;
if ($this->menu_array[$i]['enabled']) if ($this->menu_array[$i]['enabled'])
{ {
print '<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'; print '<div class="menu_contenu">';
print $tabstring.'<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>';
print $this->menu_array[$i]['titre']; print $this->menu_array[$i]['titre'];
print '</a>'; print '</a>';
// If title is not pure text and contains a table, no carriage return added // If title is not pure text and contains a table, no carriage return added
if (! strstr($this->menu_array[$i]['titre'],'<table')) print '<br>'; if (! strstr($this->menu_array[$i]['titre'],'<table')) print '<br>';
print '</div>';
} }
else else
{ {
print '<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>'; print '<div class="menu_contenu">';
print $tabstring.'<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
print '</div>';
} }
} }
@ -954,6 +943,8 @@ class MenuLeft {
print "</div>\n"; print "</div>\n";
} }
} }
if ($contenu == 1) print '<div class="menu_fin"></div>';
} }
} }

39
htdocs/includes/menus/barre_left/eldy_frontoffice.php
View File

@ -243,25 +243,6 @@ class MenuLeft {
{ {
$langs->load("companies"); $langs->load("companies");
// Actions
if ($conf->agenda->enabled)
{
$langs->load("agenda");
// Actions
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/indexactions.php?leftmenu=agenda", $langs->trans("Actions"), 0, $user->rights->agenda->myactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/fiche.php?leftmenu=agenda&amp;action=create", $langs->trans("NewAction"), 1, $user->rights->agenda->myactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda", $langs->trans("List"), 1, $user->rights->agenda->myactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&amp;status=todo&amp;filter=mine", $langs->trans("MenuToDoMyActions"),2, $user->rights->agenda->myactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&amp;status=done&amp;filter=mine", $langs->trans("MenuDoneMyActions"),2, $user->rights->agenda->myactions->read);
if ($user->rights->agenda->myactions->read)
{
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&amp;status=todo", $langs->trans("MenuToDoActions"),2, $user->rights->agenda->allactions->read);
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/listactions.php?leftmenu=agenda&amp;status=done", $langs->trans("MenuDoneActions"),2, $user->rights->agenda->allactions->read);
}
$newmenu->add_submenu(DOL_URL_ROOT."/comm/action/rapport/index.php?leftmenu=agenda", $langs->trans("Reportings"), 1, $user->rights->agenda->allactions->read);
}
// Prospects // Prospects
/* /*
$newmenu->add(DOL_URL_ROOT."/comm/prospect/index.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire); $newmenu->add(DOL_URL_ROOT."/comm/prospect/index.php?leftmenu=prospects", $langs->trans("Prospects"), 0, $user->rights->societe->lire);
@ -858,6 +839,7 @@ class MenuLeft {
} }
else else
{ {
$contenu = 0;
for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++) for ($i = 0 ; $i < sizeof($this->menu_array) ; $i++)
{ {
$alt++; $alt++;
@ -874,41 +856,48 @@ class MenuLeft {
} }
// Place tabulation // Place tabulation
$tabstring='';
$tabul=($this->menu_array[$i]['level'] - 1); $tabul=($this->menu_array[$i]['level'] - 1);
if ($tabul > 0) if ($tabul > 0)
{ {
for ($j=0; $j < $tabul; $j++) for ($j=0; $j < $tabul; $j++)
{ {
print '&nbsp; &nbsp; '; $tabstring.='&nbsp; &nbsp; ';
} }
} }
// Menu niveau 0 // Menu niveau 0
if ($this->menu_array[$i]['level'] == 0) if ($this->menu_array[$i]['level'] == 0)
{ {
if ($contenu == 1) print '<div class="menu_fin"></div>';
if ($this->menu_array[$i]['enabled']) if ($this->menu_array[$i]['enabled'])
{ {
print '<a class="vmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a><br>'; print '<div class="menu_titre">'.$tabstring.'<a class="vmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'.$this->menu_array[$i]['titre'].'</a></div>';
} }
else else
{ {
print '<font class="vmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>'; print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$this->menu_array[$i]['titre'].'</font></div>';
} }
} }
// Menu niveau > 0 // Menu niveau > 0
if ($this->menu_array[$i]['level'] > 0) if ($this->menu_array[$i]['level'] > 0)
{ {
if ($this->menu_array[$i]['level']==1) $contenu = 1;
if ($this->menu_array[$i]['enabled']) if ($this->menu_array[$i]['enabled'])
{ {
print '<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>'; print '<div class="menu_contenu">';
print $tabstring.'<a class="vsmenu" href="'.$this->menu_array[$i]['url'].'"'.($this->menu_array[$i]['target']?' target="'.$this->menu_array[$i]['target'].'"':'').'>';
print $this->menu_array[$i]['titre']; print $this->menu_array[$i]['titre'];
print '</a>'; print '</a>';
// If title is not pure text and contains a table, no carriage return added // If title is not pure text and contains a table, no carriage return added
if (! strstr($this->menu_array[$i]['titre'],'<table')) print '<br>'; if (! strstr($this->menu_array[$i]['titre'],'<table')) print '<br>';
print '</div>';
} }
else else
{ {
print '<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>'; print '<div class="menu_contenu">';
print $tabstring.'<font class="vsmenudisabled">'.$this->menu_array[$i]['titre'].'</font><br>';
print '</div>';
} }
} }
@ -918,6 +907,8 @@ class MenuLeft {
print "</div>\n"; print "</div>\n";
} }
} }
if ($contenu == 1) print '<div class="menu_fin"></div>';
} }
$conf->global->MAIN_SEARCHFORM_SOCIETE=0; $conf->global->MAIN_SEARCHFORM_SOCIETE=0;

2
htdocs/langs/en_US/boxes.lang
View File

@ -23,7 +23,7 @@ BoxTitleLastRssInfos=Last %s news from %s
BoxTitleLastProducts=Last %s modified products/services BoxTitleLastProducts=Last %s modified products/services
BoxTitleLastCustomerOrders=Last %s modified customer orders BoxTitleLastCustomerOrders=Last %s modified customer orders
BoxTitleLastSuppliers=Last %s recorded suppliers BoxTitleLastSuppliers=Last %s recorded suppliers
BoxTitleLastCustomers=Last %s recorded customers BoxTitleLastCustomersOrProspects=Last %s recorded customers or prospects
BoxTitleLastPropals=Last %s recorded proposals BoxTitleLastPropals=Last %s recorded proposals
BoxTitleLastCustomerBills=Last %s customer's invoices BoxTitleLastCustomerBills=Last %s customer's invoices
BoxTitleLastSupplierBills=Last %s supplier's invoices BoxTitleLastSupplierBills=Last %s supplier's invoices

2
htdocs/langs/fr_FR/boxes.lang
View File

@ -23,7 +23,7 @@ BoxTitleLastRssInfos=Les %s derni
BoxTitleLastProducts=Les %s derniers produits/services enregistrés BoxTitleLastProducts=Les %s derniers produits/services enregistrés
BoxTitleLastCustomerOrders=Les %s dernières commandes clients modifiées BoxTitleLastCustomerOrders=Les %s dernières commandes clients modifiées
BoxTitleLastSuppliers=Les %s derniers fournisseurs enregistrés BoxTitleLastSuppliers=Les %s derniers fournisseurs enregistrés
BoxTitleLastCustomers=Les %s derniers clients enregistrés BoxTitleLastCustomersOrProspects=Les %s derniers clients ou prospects enregistrés
BoxTitleLastPropals=Les %s dernières propositions enregistrés BoxTitleLastPropals=Les %s dernières propositions enregistrés
BoxTitleLastCustomerBills=Les %s dernières factures clients enregistrées BoxTitleLastCustomerBills=Les %s dernières factures clients enregistrées
BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs enregistrées BoxTitleLastSupplierBills=Les %s dernières factures fournisseurs enregistrées

97
htdocs/theme/auguria/auguria.css.php
View File

@ -14,14 +14,12 @@
* 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/theme/auguria/auguria.css.php \file htdocs/theme/auguria/auguria.css.php
\brief Fichier de style CSS du theme Auguria \brief Fichier de style CSS du theme Auguria
\version $Revision$ \version $Id$
*/ */
require("../../conf/conf.php"); require("../../conf/conf.php");
@ -356,11 +354,11 @@ img.login
/* Barre de gauche */ /* Barre de gauche */
/* ============================================================================== */ /* ============================================================================== */
a.vmenu:link { font-size:11px; text-align:left; font-weight: bold; color:#000000} a.vmenu:link { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; }
a.vmenu:visited { font-size:11px; text-align:left; font-weight: bold; color:#000000} a.vmenu:visited { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; }
a.vmenu:active { font-size:11px; text-align:left; font-weight: bold; color:#000000} a.vmenu:active { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; }
a.vmenu:hover { font-size:11px; text-align:left; font-weight: bold; color:#000000} a.vmenu:hover { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; }
font.vmenudisabled { font-size:11px; text-align:left; font-weight: bold; color: #757575; } font.vmenudisabled { font-size:11px; text-align:left; font-weight: bold; color: #757575; margin: 1em 1em 1em 1em; }
a.vsmenu:link { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; } a.vsmenu:link { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; }
a.vsmenu:visited { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; } a.vsmenu:visited { font-size:11px; text-align:left; font-weight: normal; color: #202020; margin: 1em 1em 1em 1em; }
@ -374,17 +372,15 @@ a.help:active { font-size: 10px; font-weight: bold; background: #FFFFFF; b
a.help:hover { font-size: 10px; font-weight: bold; background: #FFFFFF; border: 1px solid #8CACBB; color: #6198BA; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; } a.help:hover { font-size: 10px; font-weight: bold; background: #FFFFFF; border: 1px solid #8CACBB; color: #6198BA; padding: 0em 0.7em; margin: 0em 0.5em; text-decoration: none; white-space: nowrap; }
/* Pour menu gauche Auguria */ div.blockvmenuimpair
{
.menu_titre a {font-size:11px; text-align:left; font-weight: bold; color:#FFFFFF} margin: 0px;
font.menu_titre_disabled { font-size:11px; text-align:left; font-weight: bold; color: #757575; margin: 1em 1em 1em 1em; } border-spacing: 0px;
padding: 0px;
a.menu_titre:link { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } width: 166px;
a.menu_titre:visited { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } border : 0px solid #68ACCF;
a.menu_titre:active { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } }
a.menu_titre:hover { font-size:11px; text-align:left; font-weight: bold; color: #FFFFFF; margin: 1em 1em 1em 1em; } div.blockvmenupair
div.menu
{ {
margin: 0px; margin: 0px;
border-spacing: 0px; border-spacing: 0px;
@ -393,6 +389,27 @@ div.menu
border : 0px solid #68ACCF; border : 0px solid #68ACCF;
} }
div.blockvmenuimpair form a.vmenu, div.blockvmenupair form a.vmenu
{
display: block;
color: #000000;
text-align:left;
text-decoration: none;
padding: 4px;
margin: 0px;
background: #FFFFFF;
margin-bottom: -12px;
}
div.help
{
margin-left:5px;
margin-top:15px;
text-align: center;
}
/* Pour menu gauche Auguria */
div.menu_titre { div.menu_titre {
background: url(<?php echo $dolibarr_main_url_root.'/theme/auguria/img/bg-titre-rubrique.png' ?>); background: url(<?php echo $dolibarr_main_url_root.'/theme/auguria/img/bg-titre-rubrique.png' ?>);
@ -430,48 +447,6 @@ div.menu_fin {
} }
div.blockvmenuimpair a.vmenu, div.blockvmenupair a.vmenu
{
display: block;
color: #FFFFFF;
text-align:left;
text-decoration: none;
padding: 4px;
margin: 0px;
margin-bottom: -10px;
background: #FFFFFF;
background-image: url(<?php echo $dolibarr_main_url_root.'/theme/auguria/img/tmenu.jpg' ?>);
background-position:top;
background-repeat:repeat-x;
}
div.blockvmenuimpair form a.vmenu, div.blockvmenupair form a.vmenu
{
display: block;
color: #000000;
text-align:left;
text-decoration: none;
padding: 4px;
margin: 0px;
background: #FFFFFF;
margin-bottom: -12px;
}
div.blockvmenuimpair form .button, div.blockvmenupair form .button
{
margin: 0px;
background: #6aabd1;
color: #FFFFFF;
}
div.help
{
margin-left:5px;
margin-top:15px;
text-align: center;
}
td.barre { td.barre {
border-right: 1px solid #000000; border-right: 1px solid #000000;
border-bottom: 1px solid #000000; border-bottom: 1px solid #000000;

57
htdocs/theme/eldy/eldy.css.php
View File

@ -405,63 +405,6 @@ a.help:active { font-size:11px; font-family: helvetica, verdana, arial, sa
a.help:hover { font-size:11px; font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; } a.help:hover { font-size:11px; font-family: helvetica, verdana, arial, sans-serif; text-align:left; font-weight: normal; }
/* Pour menu gauche auguria */
font.menu_titre_disabled { font-size:11px; text-align:left; font-weight: bold; color: #757575; margin: 1em 1em 1em 1em; }
a.menu_titre:link { font-size:11px; text-align:left; font-weight: bold; color: #000000; margin: 1em 1em 1em 1em; }
a.menu_titre:visited { font-size:11px; text-align:left; font-weight: bold; color: #000000; margin: 1em 1em 1em 1em; }
a.menu_titre:active { font-size:11px; text-align:left; font-weight: bold; color: #000000; margin: 1em 1em 1em 1em; }
a.menu_titre:hover { font-size:11px; text-align:left; font-weight: bold; color: #000000; margin: 1em 1em 1em 1em; }
div.menu
{
margin: 0px;
border-spacing: 0px;
padding: 0px;
width: 165px;
border: 0px solid #68ACCF;
}
div.menu_titre {
background: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/bg-titre-rubrique.png' ?>);
padding: 0px;
padding-top:7px;
padding-left:0px;
margin-top: 8px;
margin: 0px;
height: 21px;
text-align: left;
font-size : 12px;
color : #FFFFFF;
font-weight: bold;
}
div.menu_contenu {
background: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/bg-rubrique.png' ?>);
margin: 0px;
padding: 1px;
padding-right: 6px;
font-size : 11px;
font-weight:normal;
color : #000000;
text-align: left;
}
div.menu_fin {
background: url(<?php echo $dolibarr_main_url_root.'/theme/eldy/img/bg-bas-rubrique.png' ?>);
margin: 0px;
padding: 0px;
height:6px;
width:165px;
background-repeat:no-repeat;
}
div.blockvmenupair div.blockvmenupair
{ {
width:160px; width:160px;