diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 2f77077610c..a3bfefe9531 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -474,7 +474,7 @@ function top_menu($head, $title="", $target="") print "\n"; print ''; - + print '
'; /* * Mise à jour entre 2 versions * @@ -489,52 +489,33 @@ function top_menu($head, $title="", $target="") } /* - * Barre superieure + * Barre de menu supérieure * */ + print '
'."\n"; - print ''; - print ""; + print ''.$langs->trans("Home").''; - // Sommet menu de gauche, lien accueil - $class=""; - if ($_SESSION["topmenu"] && $_SESSION["topmenu"] == "accueil") { $class="menusel"; } - elseif (ereg("^".DOL_URL_ROOT."\/[^\\\/]+$",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/user\/",$_SERVER["PHP_SELF"]) || ereg("^".DOL_URL_ROOT."\/admin\/",$_SERVER["PHP_SELF"])) { $class="menusel"; } - print ''; - - // Sommet géré par gestionnaire de menu du haut - print ''; + // Logout - print ''; - - print "\n"; - - /* - * Table principale - * - */ - print '"; - print "\n"; - /* - * - */ - print "
'.$langs->trans("Home").'
'; if (!defined(MAIN_MENU_BARRETOP)) { define("MAIN_MENU_BARRETOP","default.php"); } require(DOL_DOCUMENT_ROOT ."/includes/menus/barre_top/".MAIN_MENU_BARRETOP); - print '' ; + if (! $_SERVER["REMOTE_USER"]) // Propose ou non de se deloguer si authentication Apache ou non { - print ''.$user->login.'' ; - + print '' ; print ''; - print ''.$langs->trans('; - + print ''; } else { print $user->login ; } - print '
'; - + print "\n"; } /* @@ -551,17 +532,25 @@ function left_menu($menu, $help_url='', $form_search='', $author='') * */ print "\n\n"; - + print '
'."\n"; + for ($i = 0 ; $i < sizeof($menu) ; $i++) { - print '
'."\n"; - print ''.$menu[$i][1].''; + if (($i%2==0)) + { + print '
'."\n"; + } + else + { + print '
'."\n"; + } + print ''.$menu[$i][1].'
'; for ($j = 2 ; $j < sizeof($menu[$i]) - 1 ; $j = $j +2) { - print '
'.$menu[$i][$j+1].''; - } - print "
\n"; + print ''.$menu[$i][$j+1].'
'; + } + print '
'; } /* @@ -572,69 +561,62 @@ function left_menu($menu, $help_url='', $form_search='', $author='') if ($conf->societe->enabled && defined("MAIN_SEARCHFORM_CONTACT") && MAIN_SEARCHFORM_CONTACT > 0) $addzonerecherche=1; if (($conf->produit->enabled || $conf->service->enabled) && defined("MAIN_SEARCHFORM_PRODUITSERVICE") && MAIN_SEARCHFORM_PRODUITSERVICE > 0) $addzonerecherche=1; - if ($addzonerecherche) { - - print '
'."\n"; - - if ($conf->societe->enabled && defined("MAIN_SEARCHFORM_SOCIETE") && MAIN_SEARCHFORM_SOCIETE > 0) - { - $langs->load("companies"); - - if (strstr($_SERVER["SCRIPT_URL"], "/comm/prospect/")) - { - $url=DOL_URL_ROOT.'/comm/prospect/prospects.php'; - } - else - { - $url=DOL_URL_ROOT.'/societe.php'; - } - - printSearchForm($url,DOL_URL_ROOT.'/comm/clients.php',$langs->trans("Companies"),'soc','socname'); + if ($addzonerecherche) + { + if ($conf->societe->enabled && defined("MAIN_SEARCHFORM_SOCIETE") && MAIN_SEARCHFORM_SOCIETE > 0) + { + $langs->load("companies"); + + if (strstr($_SERVER["SCRIPT_URL"], "/comm/prospect/")) + { + $url=DOL_URL_ROOT.'/comm/prospect/prospects.php'; + } + else + { + $url=DOL_URL_ROOT.'/societe.php'; + } + + printSearchForm($url,DOL_URL_ROOT.'/comm/clients.php',$langs->trans("Companies"),'soc','socname'); + } + + if ($conf->societe->enabled && defined("MAIN_SEARCHFORM_CONTACT") && MAIN_SEARCHFORM_CONTACT > 0) + { + $langs->load("companies"); + printSearchForm(DOL_URL_ROOT.'/contact/index.php',DOL_URL_ROOT.'/contact/index.php',$langs->trans("Contacts"),'contact','contactname'); + } + + if (($conf->produit->enabled || $conf->service->enabled) && defined("MAIN_SEARCHFORM_PRODUITSERVICE") && MAIN_SEARCHFORM_PRODUITSERVICE > 0) + { + $langs->load("products"); + printSearchForm(DOL_URL_ROOT.'/product/liste.php',DOL_URL_ROOT.'/product/',$langs->trans("Products")."/".$langs->trans("Services"),'products','sall'); + } } - - if ($conf->societe->enabled && defined("MAIN_SEARCHFORM_CONTACT") && MAIN_SEARCHFORM_CONTACT > 0) - { - $langs->load("companies"); - printSearchForm(DOL_URL_ROOT.'/contact/index.php',DOL_URL_ROOT.'/contact/index.php',$langs->trans("Contacts"),'contact','contactname'); - } - - if (($conf->produit->enabled || $conf->service->enabled) && defined("MAIN_SEARCHFORM_PRODUITSERVICE") && MAIN_SEARCHFORM_PRODUITSERVICE > 0) - { - $langs->load("products"); - printSearchForm(DOL_URL_ROOT.'/product/liste.php',DOL_URL_ROOT.'/product/',$langs->trans("Products")."/".$langs->trans("Services"),'products','sall'); - } - - print "
"; - - } - + /* * Zone de recherche supplémentaire */ - + if (strlen($form_search) > 0) { - print '
'; print $form_search; - print '
'; } - + /* * Lien vers l'aide en ligne */ if (strlen($help_url) > 0) { - print '
'; + define('MAIN_AIDE_URL','http://www.dolibarr.com/wikidev/index.php'); - print ''.$langs->trans("Help").'
'; + print ''.$langs->trans("Help").''; } - - + print "
\n"; print "\n"; - print "
\n"; + + + print '
'."\n"; } @@ -649,13 +631,15 @@ function left_menu($menu, $help_url='', $form_search='', $author='') */ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$htmlinputname) { - print '
'; - print ''.$title.'
'; - print ''; - print ''; - print ' '; - print ''; - print "
\n"; + print '
'; + print '
'; + print ''.$title.'
'; + print ''; + print ''; + print ' '; + print ''; + print "
\n"; + print "
\n"; } @@ -666,29 +650,8 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$ function llxFooter($foot='') { global $dolibarr_auto_user; - print "\n
\n"; - - /* Suppression temporaire, mauvais affichage sur petit ecran - - print '

'; - print 'Bug report '; - // print 'Source Code '.$foot.'

'; - // Suppression temporaire du footer - print 'Source Code

'; - if (!empty ($dolibarr_auto_user)) - { - print '

- Valid HTML 4.0! -

'; - } - */ - - print ""; + print "\n".'
'."\n"; + print '
'."\n"; + print "\n\n"; } ?> diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index 3b0e03faef6..c6767871adc 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -301,16 +301,16 @@ else */ // Zone recherche - print ''; - print ''; - print '
'; + + print '
'; + print ''; + print ''; print $langs->trans("Ref").':  '; - print '
'; + print 'Libellé :  '; - print '
'; - print '
'; - + print ''; + $head[0][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id; $head[0][1] = 'Fiche'; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index 146d0116b42..bed1ef9049c 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -44,6 +44,13 @@ if ($action == 'update') llxHeader("","",$langs->trans("ProductsAndServices")); +print '
'; +print ''; +print $langs->trans("Ref").':  '; + +print 'Libellé :  '; +print '
'; + print_titre($langs->trans("ProductsAndServices")); print ''; @@ -69,8 +76,8 @@ if ($db->query($sql)) $db->free(); } -print '
'; -print ''; +print '
'.$langs->trans("Number").'
'; +print ''; if ($conf->produit->enabled) { print ""; @@ -113,9 +120,9 @@ if ($result) if ($num > 0) { - print '
'.$langs->trans("Number").'
'; + print '
'; - print ''; + print ''; $var=True; while ($i < $num) diff --git a/htdocs/theme/dev/dev.css b/htdocs/theme/dev/dev.css index ec218cec7aa..1090d30b1cb 100644 --- a/htdocs/theme/dev/dev.css +++ b/htdocs/theme/dev/dev.css @@ -18,11 +18,14 @@ * $Source$ * */ + +@import url("new.css"); + body { - background: #dcdad5; - margin: 0px; - font-family: sans-serif; font-size: 0.7em; + background: white; + font-family: sans-serif; + font-size: 0.7em; } /* @@ -31,13 +34,22 @@ body div.tabs { float: none; - margin: 0em; - padding: 0em 0em; + margin: 0px; + padding: 0px; text-align: left; - font-family: sans-serif; font-size: 0.7em; - + font-family: sans-serif; font-size: 12px; } +div.tabBar +{ + float: none; + background: #dcdcd3; + padding: 0em 0.5em 0.5em; + margin: 0em 0em 0.5em 0em; + border: 1px solid #8CACBB; + } + + a.tabTitle { background: #436976; border: 1px solid #8CACBB; @@ -71,12 +83,6 @@ a.tabimage { white-space: nowrap; } -div.tabBar { - background: #dcdcd3; - padding: 0em 0.5em 0.5em; - margin: 0em 0em 0.5em 0em; - border: 1px solid #8CACBB; -} div.tabsAction { margin: 0em 0em 0.5em 0em ; @@ -165,7 +171,7 @@ a { color: #000000; } -a:hover { text-decoration: underline; } + td.menu { border-bottom: 1px solid #000000;
'.$langs->trans("LastRecorded").'
'.$langs->trans("LastRecorded").'