diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 0d5bec0c33a..4837cbc9ba6 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -113,7 +113,7 @@ print '
'; print ''; print ''; print ''; -print ''; +print ''; print ''; print ''; print ''; @@ -182,6 +182,8 @@ foreach ($orders as $key => $value) $const_name = $objMod->const_name; $const_value = $objMod->const_config; + + if ($oldfamily && $family!=$oldfamily) { print ''; } print ""; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 1bb13a1cd69..c9fc1359a0a 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -161,6 +161,10 @@ if ($conf->commande->enabled) $sql = "SELECT s.idp, s.nom,b.rowid as bid"; $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."bookmark as b"; $sql .= " WHERE b.fk_soc = s.idp AND b.fk_user = ".$user->id; +if ($socidp) +{ + $sql .= " AND s.idp = $socidp"; +} $sql .= " ORDER BY lower(s.nom) ASC"; if ( $db->query($sql) ) @@ -187,15 +191,67 @@ if ( $db->query($sql) ) print '
FamilleNomModuleInfoActifAction
'; } + +print ''; + +/* + * Dernières actions commerciales effectuées + * + */ + +$sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.libelle, a.fk_user_author, s.nom as sname, s.idp"; +$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s"; +$sql .= " WHERE c.id=a.fk_action AND a.percent >= 100 AND s.idp = a.fk_soc"; +if ($socidp) +{ + $sql .= " AND s.idp = $socidp"; +} +$sql .= " ORDER BY a.datea DESC limit 5"; + +if ( $db->query($sql) ) +{ + $num = $db->num_rows(); + + print ''; + print ''; + $var = true; + $i = 0; + + while ($i < $num ) + { + $obj = $db->fetch_object($i); + $var=!$var; + + print ""; + print ""; + print ""; + print ''; + $i++; + } + // TODO Ajouter rappel pour "il y a des contrats à mettre en service" + // TODO Ajouter rappel pour "il y a des contrats qui arrivent à expiration" + print "
Dernières actions effectuées
id\">".img_file()." "; + print "id\">$obj->libelle $obj->label".strftime("%d %b %Y",$obj->da)."'.$obj->sname.'

"; + + $db->free(); +} +else +{ + print $db->error(); +} + /* * Actions commerciales a faire * */ -print ''; $sql = "SELECT a.id, ".$db->pdate("a.datea")." as da, c.libelle, a.fk_user_author, s.nom as sname, s.idp"; $sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a, ".MAIN_DB_PREFIX."c_actioncomm as c, ".MAIN_DB_PREFIX."societe as s"; -$sql .= " WHERE c.id=a.fk_action AND a.percent < 100 AND s.idp = a.fk_soc AND a.fk_user_action = $user->id"; +$sql .= " WHERE c.id=a.fk_action AND a.percent < 100 AND s.idp = a.fk_soc"; +if ($socidp) +{ + $sql .= " AND s.idp = $socidp"; +} $sql .= " ORDER BY a.datea DESC"; if ( $db->query($sql) ) @@ -338,7 +394,7 @@ if ($conf->propal->enabled) { $i = 0; print ''; - print ''; + print ''; $var=False; while ($i < $num) { diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 82b59a4973d..2c0a69588c7 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -247,7 +247,7 @@ if ( $db->query($sql) ) if ($num) { print '
Les 5 dernières propositions commerciales traitées
Les 5 dernières propositions commerciales fermées
'; - print ''; + print ''; $var = True; $total = $totalam = 0; while ($i < $num) @@ -314,7 +314,7 @@ if ($user->societe_id == 0) if ($num) { print '
Factures impayéesMontant TTCReçu
Factures clients impayéesMontant TTCReçu
'; - print ''; + print ''; print "\n"; $i = 0; $var = True; diff --git a/htdocs/includes/menus/barre_top/default.php b/htdocs/includes/menus/barre_top/default.php index e5681958fc1..47a3ec32f7f 100644 --- a/htdocs/includes/menus/barre_top/default.php +++ b/htdocs/includes/menus/barre_top/default.php @@ -21,107 +21,80 @@ * */ -if (defined('MAIN_MODULE_COMMERCIAL') && MAIN_MODULE_COMMERCIAL == 1) -{ - if (strstr($GLOBALS["SCRIPT_URL"],DOL_URL_ROOT.'/comm/')) +global $PHP_SELF; + +$nbofentries=0; +if ($conf->commercial->enabled) $nbofentries++; +if ($conf->adherent->enabled) $nbofentries++; +if ($conf->compta->enabled) $nbofentries++; +if ($conf->produit->enabled || $conf->service->enabled) $nbofentries++; +if ($conf->webcalendar->enabled) $nbofentries++; + + +print '
Factures à payerMontant TTC
Factures fournisseurs à payerMontant TTC
'; + +if (! $nbofentries) { + print ''; +} +else { + $widthtd=floor(100/$nbofentries); + + if ($conf->commercial->enabled) { - print ''; - } - else - { - print '-'; - } + $class=""; + if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "commercial") { $class="menusel"; } + elseif (ereg('^\/comm\/',$PHP_SELF)) { $class="menusel"; } + print ''; } - else + + if ($conf->adherent->enabled) { - print ''; - } - else - { - print '-'; - } + $class=""; + if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "adherent") { $class="menusel"; } + elseif (ereg('^\/adherents\/',$PHP_SELF)) { $class="menusel"; } + print ''; } -} -elseif (defined('MAIN_MODULE_ADHERENT') && MAIN_MODULE_ADHERENT == 1) -{ - print ''; -} -else -{ - print ''; -} - - -if (defined('MAIN_MODULE_COMPTABILITE') && MAIN_MODULE_COMPTABILITE == 1) -{ - if (strstr($GLOBALS["SCRIPT_URL"],DOL_URL_ROOT.'/compta/')) + + if ($conf->compta->enabled) { - print ''; - } - else - { - print '-'; - } + $class=""; + if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "compta") { $class="menusel"; } + elseif (ereg('^\/compta\/',$PHP_SELF)) { $class="menusel"; } + print ''; } - else + + if ($conf->produit->enabled || $conf->service->enabled) { - - print ''; - } - else - { - print '-'; - } + $class=""; + if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "product") { $class="menusel"; } + elseif (ereg('^\/product\/',$PHP_SELF)) { $class="menusel"; } + $chaine=""; + if ($conf->produit->enabled) { $chaine.="Produits"; } + if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; } + if ($conf->service->enabled) { $chaine.="Services"; } + print ''; } -} -else -{ - print ''; + + if ($conf->webcalendar->enabled) + { + $class=""; + if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "webcalendar") { $class="menusel"; } + elseif (ereg('^\/webcalendar\/',$PHP_SELF)) { $class="menusel"; } + print ''; + }; + } -if (strstr($GLOBALS["SCRIPT_URL"],DOL_URL_ROOT.'/product/')) -{ - $class = "menusel"; -} -else -{ - $class = "menu"; -} - -print ''; +print '
 '; - if ($user->comm > 0 && $conf->commercial ) - { - print 'Commercial'; + print 'Commercial'; + print ''; - if ($user->comm > 0 && $conf->commercial ) - { - print 'Commercial'; + print 'Adhérents'; + print ''; - print 'Adhérents-'; - if ($user->compta > 0) - { - print 'Compta'; + print 'Compta'; + print ''; - if ($user->compta > 0) - { - print 'Compta'; + print ''.$chaine.''; + print '-'; + print 'Calendrier'; + print ''; -if ($conf->produit->enabled || $conf->service->enabled) -{ - $chaine=""; - if ($conf->produit->enabled) { $chaine.="Produits"; } - if ($conf->produit->enabled && $conf->service->enabled) { $chaine.="/"; } - if ($conf->service->enabled) { $chaine.="Services"; } - print ''.$chaine.''; -} -else -{ - print '-'; -} - - -print ''; - -if(defined("MAIN_MODULE_WEBCALENDAR") && MAIN_MODULE_WEBCALENDAR) -{ - print 'Calendrier'; -}; -print ' 
'; ?> diff --git a/htdocs/includes/menus/barre_top/esprit.php b/htdocs/includes/menus/barre_top/esprit.php index 6493e067088..582b5581843 100644 --- a/htdocs/includes/menus/barre_top/esprit.php +++ b/htdocs/includes/menus/barre_top/esprit.php @@ -20,22 +20,24 @@ * */ -print ''; +print ''; -print 'Livres'; +print ''; -print 'Clients'; +print ''; -print 'Critiques'; +print ''; -print 'Catégories'; +print ''; +print 'catégories'; + +print '
'; -print ''; +print 'livres'; -print ''; +print 'clients'; -print ''; +print 'critiques'; -print '
'; ?> diff --git a/htdocs/index.php b/htdocs/index.php index e4678e02d6a..ab6648a388d 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -23,10 +23,9 @@ require("./pre.inc.php"); llxHeader(); -print_fiche_titre( "Dolibarr ".DOL_VERSION,'A propos'); +print_fiche_titre("Nous sommes le ".dolibarr_print_date(mktime()).', vous êtes connecté en tant que ' . $user->prenom . ' ' . $user->nom .' ['.$user->code.']', 'A propos'); +print "
\n"; -print '
Connecté en tant que : ' . $user->prenom . ' ' . $user->nom .' ['.$user->code.']
'; -print "
"; /* * Boites * diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index b100698f8c8..f0853d2b541 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -267,7 +267,11 @@ if (defined("BOUTIQUE_ALBUM")) } if (defined("MAIN_MODULE_POSTNUKE")) { - $conf->postnuke->enabled=MAIN_MODULE_POSTNUKE; + $conf->postnuke->enabled=MAIN_MODULE_POSTNUKE; +} +if (defined("MAIN_MODULE_WEBCALENDAR")) +{ + $conf->webcalendar->enabled=MAIN_MODULE_WEBCALENDAR; } if (defined("MAIN_MODULE_FACTURE")) { @@ -420,11 +424,7 @@ function top_menu($head, $title="") print "\n"; print $langs->lang_header(); - - // print ""; print $head; - // print ''; - // print ''; print ''; print ''; @@ -433,8 +433,8 @@ function top_menu($head, $title="") print ''."\n"; print ''."\n"; - print ''."\n"; + // TODO implementer les alternate css print ''."\n"; print ''."\n"; @@ -469,7 +469,7 @@ function top_menu($head, $title="") print ''; print "'; + print 'cliquez sur Mettre à jour !!'; print "
Votre système nécessite d'être mis à jour. "; print "Pour cela "; - print 'cliquez sur Mise à jour !!
"; } @@ -479,22 +479,27 @@ function top_menu($head, $title="") */ print ''; - print ""; - print ''; + // Sommet menu de gauche + global $PHP_SELF; + $class=""; + if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "accueil") { $class="menusel"; } + elseif (ereg('^\/[^\\\/]+$',$PHP_SELF) || ereg('^\/user\/',$PHP_SELF) || ereg('^\/admin\/',$PHP_SELF)) { $class="menusel"; } + print ''; + + // Sommet géré par gestionnaire de menu du haut + print ''; - print ''; - - print ''; + print ''; + + print "\n"; - // print '
Accueil
Accueil
'; if (!defined(MAIN_MENU_BARRETOP)) { define("MAIN_MENU_BARRETOP","default.php"); } - require(DOL_DOCUMENT_ROOT ."/includes/menus/barre_top/".MAIN_MENU_BARRETOP); + print ''.strftime(" %d %B - %H:%M",time()).'' ; - - if (empty ($_SERVER["REMOTE_USER"])) // Propose ou non de se deloguer si authentication Apache ou non + // Logout + print '' ; + if (! $_SERVER["REMOTE_USER"]) // Propose ou non de se deloguer si authentication Apache ou non { print ''.$user->login.'' ; } @@ -502,16 +507,15 @@ function top_menu($head, $title="") { print $user->login ; } - print '
'; /* * Table principale * */ - // print ''; - - print ''; } */ + print "\n"; print ""; - print "\n"; - print "
'; + print '
'; } @@ -530,10 +534,11 @@ Function left_menu($menu, $help_url='', $form_search='', $author='') * Colonne de gauche * */ + print "\n\n"; for ($i = 0 ; $i < sizeof($menu) ; $i++) { - print "\n".'
'."\n"; + print '
'."\n"; print ''.$menu[$i][1].''; for ($j = 2 ; $j < sizeof($menu[$i]) - 1 ; $j = $j +2) @@ -620,9 +625,9 @@ Function left_menu($menu, $help_url='', $form_search='', $author='') print $author->fullname .'
\n"; + print "\n"; } /* diff --git a/htdocs/theme/eldy/eldy.css b/htdocs/theme/eldy/eldy.css index 6094f5535aa..ddaf1984deb 100644 --- a/htdocs/theme/eldy/eldy.css +++ b/htdocs/theme/eldy/eldy.css @@ -28,6 +28,11 @@ body { margin-right: 0; margin-left: 0; } +.body { + background-color: #F1F1F1; + color: #101010; + font: 13px helvetica, verdana, arial, sans-serif; +} /***** Styles par défaut *****/ a:link { font: helvetica, verdana, arial, sans-serif; font-weight: bold; color: #000000; text-decoration: none; } @@ -57,7 +62,6 @@ td.menu { border-right: 1px solid #000000; border-bottom: 1px solid #000000; } - td.menusel { border-left: 1px solid #FFFFFF; border-right: 1px solid #FFFFFF; @@ -71,6 +75,13 @@ border-bottom: 1px solid #FFFFFF; color: #000000; text-decoration: none; } +.menusel +{ + background: #96B9C9; + font-size: 12px; font-weight: bold; + color: #000000; + text-decoration: none; +} /* @@ -241,14 +252,6 @@ background: #c0d5dd; font: helvetica, verdana, arial, sans-serif; } -.menusel -{ - background: #96B9C9; - font-size: 12px; font-weight: bold; - color: #000000; - text-decoration: none; -} - /* * Boxes