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

Modif style

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2004-08-20 09:04:51 +00:00
parent 2d8e3bfebf
commit 0e3396f5ad
4 changed files with 111 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

183
htdocs/main.inc.php
View File

@ -474,7 +474,7 @@ function top_menu($head, $title="", $target="")
print "</head>\n"; print "</head>\n";
print '<body>'; print '<body>';
print '<div class="body">';
/* /*
* Mise à jour entre 2 versions * Mise à jour entre 2 versions
* *
@ -489,52 +489,33 @@ function top_menu($head, $title="", $target="")
} }
/* /*
* Barre superieure * Barre de menu supérieure
* *
*/ */
print '<div class="tmenu">'."\n";
print '<table class="topbarre" width="100%">'; print '<a class="tmenu" href="'.DOL_URL_ROOT.'/index.php"'.($target?" target=$target":"").'>'.$langs->trans("Home").'</a>';
print "<tr>";
// 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 '<td width="200" class="menu"><table cellpadding=0 cellspacing=0 width="100%"><tr><td class="'.$class.'" align=center><a class="'.$class.'" href="'.DOL_URL_ROOT.'/index.php"'.($target?" target=$target":"").'>'.$langs->trans("Home").'</a></td></tr></table></td>';
// Sommet géré par gestionnaire de menu du haut
print '<td class="menu">';
if (!defined(MAIN_MENU_BARRETOP)) if (!defined(MAIN_MENU_BARRETOP))
{ {
define("MAIN_MENU_BARRETOP","default.php"); define("MAIN_MENU_BARRETOP","default.php");
} }
require(DOL_DOCUMENT_ROOT ."/includes/menus/barre_top/".MAIN_MENU_BARRETOP); require(DOL_DOCUMENT_ROOT ."/includes/menus/barre_top/".MAIN_MENU_BARRETOP);
print '</td>';
// Logout // Logout
print '<td width="120" class="menu" align="center" valign="center">' ;
if (! $_SERVER["REMOTE_USER"]) // Propose ou non de se deloguer si authentication Apache ou non if (! $_SERVER["REMOTE_USER"]) // Propose ou non de se deloguer si authentication Apache ou non
{ {
print '<a href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'">'.$user->login.'</a>' ; print '<a class="login" href="'.DOL_URL_ROOT.'/user/fiche.php?id='.$user->id.'">'.$user->login.'</a>' ;
print '<a href="'.DOL_URL_ROOT.'/user/logout.php">'; print '<a href="'.DOL_URL_ROOT.'/user/logout.php">';
print '<img border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png" alt="'.$langs->trans("Logout").'" title="'.$langs->trans("Logout").'"></a>'; print '<img class="login" border="0" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/logout.png" alt="'.$langs->trans("Logout").'" title="'.$langs->trans("Logout").'"></a>';
} }
else else
{ {
print $user->login ; print $user->login ;
} }
print '</td>'; print "</div><!-- class=tmenu -->\n";
print "</tr>\n";
/*
* Table principale
*
*/
print '<tr><td valign="top">';
} }
/* /*
@ -551,17 +532,25 @@ function left_menu($menu, $help_url='', $form_search='', $author='')
* *
*/ */
print "\n<!-- Debut left menu -->\n"; print "\n<!-- Debut left menu -->\n";
print '<div class="vmenu">'."\n";
for ($i = 0 ; $i < sizeof($menu) ; $i++) for ($i = 0 ; $i < sizeof($menu) ; $i++)
{ {
print '<div class="leftmenu">'."\n"; if (($i%2==0))
print '<a class="leftmenu" href="'.$menu[$i][0].'">'.$menu[$i][1].'</a>'; {
print '<div class="blockvmenuimpair">'."\n";
}
else
{
print '<div class="blockvmenupair">'."\n";
}
print '<a class="vmenu" href="'.$menu[$i][0].'">'.$menu[$i][1].'</a><br>';
for ($j = 2 ; $j < sizeof($menu[$i]) - 1 ; $j = $j +2) for ($j = 2 ; $j < sizeof($menu[$i]) - 1 ; $j = $j +2)
{ {
print '<br><a class="leftsubmenu" href="'.$menu[$i][$j].'">'.$menu[$i][$j+1].'</a>'; print '<a class="vsmenu" href="'.$menu[$i][$j].'">'.$menu[$i][$j+1].'</a><br>';
} }
print "</div>\n"; print '</div>';
} }
/* /*
@ -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->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 (($conf->produit->enabled || $conf->service->enabled) && defined("MAIN_SEARCHFORM_PRODUITSERVICE") && MAIN_SEARCHFORM_PRODUITSERVICE > 0) $addzonerecherche=1;
if ($addzonerecherche) { if ($addzonerecherche)
{
print '<div class="leftmenu">'."\n"; if ($conf->societe->enabled && defined("MAIN_SEARCHFORM_SOCIETE") && MAIN_SEARCHFORM_SOCIETE > 0)
{
if ($conf->societe->enabled && defined("MAIN_SEARCHFORM_SOCIETE") && MAIN_SEARCHFORM_SOCIETE > 0) $langs->load("companies");
{
$langs->load("companies"); if (strstr($_SERVER["SCRIPT_URL"], "/comm/prospect/"))
{
if (strstr($_SERVER["SCRIPT_URL"], "/comm/prospect/")) $url=DOL_URL_ROOT.'/comm/prospect/prospects.php';
{ }
$url=DOL_URL_ROOT.'/comm/prospect/prospects.php'; else
} {
else $url=DOL_URL_ROOT.'/societe.php';
{ }
$url=DOL_URL_ROOT.'/societe.php';
} printSearchForm($url,DOL_URL_ROOT.'/comm/clients.php',$langs->trans("Companies"),'soc','socname');
}
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 "</div>";
}
/* /*
* Zone de recherche supplémentaire * Zone de recherche supplémentaire
*/ */
if (strlen($form_search) > 0) if (strlen($form_search) > 0)
{ {
print '<div class="leftmenu">';
print $form_search; print $form_search;
print '</div>';
} }
/* /*
* Lien vers l'aide en ligne * Lien vers l'aide en ligne
*/ */
if (strlen($help_url) > 0) if (strlen($help_url) > 0)
{ {
print '<div class="leftmenu">';
define('MAIN_AIDE_URL','http://www.dolibarr.com/wikidev/index.php'); define('MAIN_AIDE_URL','http://www.dolibarr.com/wikidev/index.php');
print '<a class="leftmenu" target="_blank" href="'.MAIN_AIDE_URL.'/'.$help_url.'">'.$langs->trans("Help").'</a></div>'; print '<a class="leftmenu" target="_blank" href="'.MAIN_AIDE_URL.'/'.$help_url.'">'.$langs->trans("Help").'</a>';
} }
print "</div>\n";
print "<!-- Fin left menu -->\n"; print "<!-- Fin left menu -->\n";
print "</td>";
print "<td valign=\"top\" colspan=\"2\">\n";
print '<div class="fiche">'."\n";
} }
@ -649,13 +631,15 @@ function left_menu($menu, $help_url='', $form_search='', $author='')
*/ */
function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$htmlinputname) function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$htmlinputname)
{ {
print '<form action="'.$urlaction.'" method="post">'; print '<div class="vblockmenupair">';
print '<a class="menu" href="'.$urlobject.'">'.$title.'</a><br>'; print '<form action="'.$urlaction.'" method="post">';
print '<input type="hidden" name="mode" value="search">'; print '<a class="vmenu" href="'.$urlobject.'">'.$title.'</a><br>';
print '<input type="hidden" name="mode-search" value="'.$htmlmodesearch.'">'; print '<input type="hidden" name="mode" value="search">';
print '<input type="text" class="flat" name="'.$htmlinputname.'" size="10">&nbsp;'; print '<input type="hidden" name="mode-search" value="'.$htmlmodesearch.'">';
print '<input type="submit" class="flat" value="go">'; print '<input type="text" class="flat" name="'.$htmlinputname.'" size="10">&nbsp;';
print "</form>\n"; print '<input type="submit" class="flat" value="go">';
print "</form>\n";
print "</div>\n";
} }
@ -666,29 +650,8 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$
function llxFooter($foot='') function llxFooter($foot='')
{ {
global $dolibarr_auto_user; global $dolibarr_auto_user;
print "\n</td></tr>\n"; print "\n".'</div><!-- div class="fiche" -->'."\n";
/* print '</div><!-- div class="body" -->'."\n";
* print "</body>\n</html>\n";
*/
print "</table>\n";
/* Suppression temporaire, mauvais affichage sur petit ecran
print '<p id="powered-by-dolibarr">';
print '<a href="http://savannah.gnu.org/bugs/?group_id=1915">Bug report</a>&nbsp;';
// print '<a href="http://savannah.gnu.org/projects/dolibarr/">Source Code</a>&nbsp;'.$foot.'</p>';
// Suppression temporaire du footer
print '<a href="http://savannah.gnu.org/projects/dolibarr/">Source Code</a></p>';
if (!empty ($dolibarr_auto_user))
{
print '<p>
<a href="http://validator.w3.org/check/referer"><img border="0"
src="http://www.w3.org/Icons/valid-html40"
alt="Valid HTML 4.0!" height="31" width="88"></a>
</p>';
}
*/
print "</body></html>";
} }
?> ?>

14
htdocs/product/fiche.php
View File

@ -301,16 +301,16 @@ else
*/ */
// Zone recherche // Zone recherche
print '<table border="0" width="100%" cellspacing="0" cellpadding="4">';
print '<tr class="liste_titre">'; print '<div class="formsearch">';
print '<form action="liste.php" method="post"><td>'; print '<form action="liste.php" method="post">';
print '<input type="hidden" name="type" value="'.$product->type.'">'; print '<input type="hidden" name="type" value="'.$product->type.'">';
print $langs->trans("Ref").': <input class="flat" type="text" size="10" name="sref">&nbsp;<input class="flat" type="submit" value="go">'; print $langs->trans("Ref").': <input class="flat" type="text" size="10" name="sref">&nbsp;<input class="flat" type="submit" value="go">';
print '</td></form><form action="liste.php" method="post"><td>';
print 'Libellé : <input class="flat" type="text" size="20" name="snom">&nbsp;<input class="flat" type="submit" value="go">'; print 'Libellé : <input class="flat" type="text" size="20" name="snom">&nbsp;<input class="flat" type="submit" value="go">';
print '</td></form></tr></table>'; print '</form></div>';
print '<br>';
$head[0][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id; $head[0][0] = DOL_URL_ROOT."/product/fiche.php?id=".$product->id;
$head[0][1] = 'Fiche'; $head[0][1] = 'Fiche';

15
htdocs/product/index.php
View File

@ -44,6 +44,13 @@ if ($action == 'update')
llxHeader("","",$langs->trans("ProductsAndServices")); llxHeader("","",$langs->trans("ProductsAndServices"));
print '<div class="formsearch"><form action="liste.php" method="post">';
print '<input type="hidden" name="type" value="'.$product->type.'">';
print $langs->trans("Ref").': <input class="flat" type="text" size="10" name="sref">&nbsp;<input class="flat" type="submit" value="go">';
print 'Libellé : <input class="flat" type="text" size="20" name="snom">&nbsp;<input class="flat" type="submit" value="go">';
print '</form></div>';
print_titre($langs->trans("ProductsAndServices")); print_titre($langs->trans("ProductsAndServices"));
print '<table border="0" width="100%" cellspacing="0" cellpadding="3">'; print '<table border="0" width="100%" cellspacing="0" cellpadding="3">';
@ -69,8 +76,8 @@ if ($db->query($sql))
$db->free(); $db->free();
} }
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">'; print '<table class="liste">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Number").'</td></tr>'; print '<tr><th colspan="2">'.$langs->trans("Number").'</th></tr>';
if ($conf->produit->enabled) if ($conf->produit->enabled)
{ {
print "<tr $bc[0]>"; print "<tr $bc[0]>";
@ -113,9 +120,9 @@ if ($result)
if ($num > 0) if ($num > 0)
{ {
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="3">'; print '<table class="liste">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("LastRecorded").'</td></tr>'; print '<tr><th colspan="3">'.$langs->trans("LastRecorded").'</th></tr>';
$var=True; $var=True;
while ($i < $num) while ($i < $num)

34
htdocs/theme/dev/dev.css
View File

@ -18,11 +18,14 @@
* $Source$ * $Source$
* *
*/ */
@import url("new.css");
body body
{ {
background: #dcdad5; background: white;
margin: 0px; font-family: sans-serif;
font-family: sans-serif; font-size: 0.7em; font-size: 0.7em;
} }
/* /*
@ -31,13 +34,22 @@ body
div.tabs div.tabs
{ {
float: none; float: none;
margin: 0em; margin: 0px;
padding: 0em 0em; padding: 0px;
text-align: left; 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 { a.tabTitle {
background: #436976; background: #436976;
border: 1px solid #8CACBB; border: 1px solid #8CACBB;
@ -71,12 +83,6 @@ a.tabimage {
white-space: nowrap; 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 { div.tabsAction {
margin: 0em 0em 0.5em 0em ; margin: 0em 0em 0.5em 0em ;
@ -165,7 +171,7 @@ a {
color: #000000; color: #000000;
} }
a:hover { text-decoration: underline; }
td.menu { td.menu {
border-bottom: 1px solid #000000; border-bottom: 1px solid #000000;