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

Qual: Separate function of html header from menu header

Browse Source
This commit is contained in:
Laurent Destailleur 2010-04-03 15:08:09 +00:00
parent d6164deddc
commit fbc31d9cb5
24 changed files with 63 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/bank/pre.inc.php
View File

@ -31,11 +31,12 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php");
$langs->load("banks"); $langs->load("banks");
function llxHeader($head = "") function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
{ {
global $db, $user, $conf, $langs; global $db, $user, $conf, $langs;
top_menu($head); top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
$menu = new Menu(); $menu = new Menu();
if ($user->rights->banque->lire) if ($user->rights->banque->lire)

5
htdocs/compta/paiement/cheque/pre.inc.php
View File

@ -31,11 +31,12 @@ $langs->load("bills");
$langs->load("compta"); $langs->load("compta");
$langs->load("banks"); $langs->load("banks");
function llxHeader($head = "", $title="") function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
{ {
global $db, $user, $conf, $langs; global $db, $user, $conf, $langs;
top_menu($head); top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
$menu = new Menu(); $menu = new Menu();
if ($user->rights->banque->lire) if ($user->rights->banque->lire)

1
htdocs/core/searchpostalcode.php
View File

@ -89,7 +89,6 @@ print '<body>';
print $javascript; print $javascript;
print '<table summary="" width="100%"><tr><td>';
print "<div><br>"; // Ouvre div a la place de top_menu car le llxFooter en ferme un print "<div><br>"; // Ouvre div a la place de top_menu car le llxFooter en ferme un
print "<form method=\"post\" action=\"javascript:MAJ(".$_GET['targettown'].",".$_GET['targetcountry'].",".$_GET['targetstate'].");\" name=\"searchform\" enctype=\"application/x-www-form-urlencoded\">"; print "<form method=\"post\" action=\"javascript:MAJ(".$_GET['targettown'].",".$_GET['targetcountry'].",".$_GET['targetstate'].");\" name=\"searchform\" enctype=\"application/x-www-form-urlencoded\">";

2
htdocs/externalsite/frames.php
View File

@ -44,7 +44,7 @@ print "
<title>Dolibarr frame for external web site</title> <title>Dolibarr frame for external web site</title>
</head> </head>
<frameset rows=\"28,*\" border=0 framespacing=0 frameborder=0> <frameset rows=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
<frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder> <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder>
<frame name=\"main\" src=\"".$conf->global->EXTERNALSITE_URL."\"> <frame name=\"main\" src=\"".$conf->global->EXTERNALSITE_URL."\">
<noframes> <noframes>

5
htdocs/externalsite/frametop.php
View File

@ -17,14 +17,15 @@
*/ */
/** /**
\file htdocs/mantis/mantistop.php \file htdocs/externalsite/frametop.php
\ingroup externalsite \ingroup externalsite
\brief Top frame to show mantis application \brief Top frame to show external web application
\version $Id$ \version $Id$
*/ */
require ("../main.inc.php"); require ("../main.inc.php");
top_htmlhead("","");
top_menu("","","_top"); top_menu("","","_top");
?> ?>

3
htdocs/ftp/pre.inc.php
View File

@ -32,7 +32,8 @@ function llxHeader($head = '', $title='', $help_url='', $morehtml='')
global $conf,$langs,$user; global $conf,$langs,$user;
$langs->load("ftp"); $langs->load("ftp");
top_menu($head, $title); top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
$menu = new Menu(); $menu = new Menu();

8
htdocs/main.inc.php
View File

@ -709,6 +709,11 @@ else
define('ROWS_9',8); define('ROWS_9',8);
} }
$heightforframes=48;
// Functions
/** /**
* \brief Show HTML header HTML + BODY + Top menu + left menu + DIV * \brief Show HTML header HTML + BODY + Top menu + left menu + DIV
@ -725,6 +730,7 @@ if (! function_exists("llxHeader"))
{ {
function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='') function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='')
{ {
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss); top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
left_menu('', $help_url); left_menu('', $help_url);
} }
@ -748,8 +754,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php'; if (! $conf->top_menu) $conf->top_menu ='eldy_backoffice.php';
if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php'; if (! $conf->left_menu) $conf->left_menu='eldy_backoffice.php';
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
print '<body id="mainbody"><div id="dhtmltooltip"></div>'; print '<body id="mainbody"><div id="dhtmltooltip"></div>';
/* /*

2
htdocs/mantis/mantis.php
View File

@ -44,7 +44,7 @@ print "
<title>Dolibarr frame for Mantis</title> <title>Dolibarr frame for Mantis</title>
</head> </head>
<frameset rows=\"28,*\" border=0 framespacing=0 frameborder=0> <frameset rows=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
<frame name=\"barre\" src=\"mantistop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder> <frame name=\"barre\" src=\"mantistop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder>
<frame name=\"main\" src=\"".$conf->global->PHPMANTIS_URL."\"> <frame name=\"main\" src=\"".$conf->global->PHPMANTIS_URL."\">
<noframes> <noframes>

1
htdocs/mantis/mantistop.php
View File

@ -25,6 +25,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
top_htmlhead("","");
top_menu("","","_top"); top_menu("","","_top");
?> ?>

2
htdocs/oscommerce_ws/clients/pre.inc.php
View File

@ -27,7 +27,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require("./osc_customer.class.php"); require(DOL_DOCUMENT_ROOT."/oscommerce_ws/osc_customer.class.php");
function llxHeader($head = "", $urlp = "") function llxHeader($head = "", $urlp = "")
{ {

2
htdocs/oscommerce_ws/commandes/pre.inc.php
View File

@ -27,7 +27,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require("./osc_order.class.php"); require(DOL_DOCUMENT_ROOT."/oscommerce_ws/osc_order.class.php");
function llxHeader($head = "", $urlp = "") function llxHeader($head = "", $urlp = "")
{ {

4
htdocs/oscommerce_ws/index.php
View File

@ -30,6 +30,10 @@ $langs->load("shop");
$langs->load("orders"); $langs->load("orders");
/*
* View
*/
llxHeader("",$langs->trans("OSCommerceShop")); llxHeader("",$langs->trans("OSCommerceShop"));
print_fiche_titre($langs->trans("OSCommerceShop")); print_fiche_titre($langs->trans("OSCommerceShop"));

1
htdocs/oscommerce_ws/pre.inc.php
View File

@ -33,6 +33,7 @@ function llxHeader($head = '', $title='', $help_url='')
global $user, $conf, $langs; global $user, $conf, $langs;
$langs->load("shop"); $langs->load("shop");
top_htmlhead($head);
top_menu($head); top_menu($head);
$menu = new Menu(); $menu = new Menu();

2
htdocs/oscommerce_ws/produits/pre.inc.php
View File

@ -27,7 +27,7 @@
*/ */
require("../../main.inc.php"); require("../../main.inc.php");
require("./osc_product.class.php"); require(DOL_DOCUMENT_ROOT."/oscommerce_ws/osc_product.class.php");
function llxHeader($head = "", $urlp = "") function llxHeader($head = "", $urlp = "")
{ {

2
htdocs/phenix/phenix.php
View File

@ -42,7 +42,7 @@ print "
<title>Dolibarr frame for Phenix</title> <title>Dolibarr frame for Phenix</title>
</head> </head>
<frameset rows=\"28,*\" border=0 framespacing=0 frameborder=0> <frameset rows=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
<frame name=\"barre\" src=\"phenixtop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder> <frame name=\"barre\" src=\"phenixtop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder>
<frame name=\"main\" src=\"".$conf->global->PHPPHENIX_URL."\"> <frame name=\"main\" src=\"".$conf->global->PHPPHENIX_URL."\">
<noframes> <noframes>

1
htdocs/phenix/phenixtop.php
View File

@ -26,6 +26,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
top_htmlhead("");
top_menu("","","_top"); top_menu("","","_top");
?> ?>

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

@ -437,6 +437,16 @@ div.mainmenu_accountancy {
margin-left: 0px; margin-left: 0px;
} }
div.mainmenu_project {
position : relative;
color: white;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/project.png' ?>);
background-repeat:no-repeat;
background-position:center top;
height:27px;
margin-left: 0px;
}
div.mainmenu_tools { div.mainmenu_tools {
position : relative; position : relative;
color: white; color: white;
@ -447,6 +457,16 @@ div.mainmenu_tools {
margin-left: 0px; margin-left: 0px;
} }
div.mainmenu_members {
position : relative;
color: white;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/members.png' ?>);
background-repeat:no-repeat;
background-position:center top;
height:28px;
margin-left: 0px;
}
div.mainmenu_agenda { div.mainmenu_agenda {
position : relative; position : relative;
color: white; color: white;
@ -467,6 +487,16 @@ div.mainmenu_ecm {
margin-left: 0px; margin-left: 0px;
} }
div.mainmenu_cashdesk {
position : relative;
color: white;
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/pointofsale.png' ?>);
background-repeat:no-repeat;
background-position:center top;
height:28px;
margin-left: 0px;
}
div.mainmenu_generic1 { div.mainmenu_generic1 {
position : relative; position : relative;
color: white; color: white;

1
htdocs/theme/eldy/img/menus/.cvsignore Normal file
View File

@ -0,0 +1 @@
tango-icon-theme*

BIN
htdocs/theme/eldy/img/menus/company2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
htdocs/theme/eldy/img/menus/members.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
htdocs/theme/eldy/img/menus/pointofsale.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
htdocs/theme/eldy/img/menus/project.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

2
htdocs/webcal/webcal.php
View File

@ -42,7 +42,7 @@ print "
<title>Dolibarr frame for Webcalendar</title> <title>Dolibarr frame for Webcalendar</title>
</head> </head>
<frameset rows=\"28,*\" border=0 framespacing=0 frameborder=0> <frameset rows=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
<frame name=\"barre\" src=\"webcaltop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder> <frame name=\"barre\" src=\"webcaltop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu."&nobackground=1\" noresize scrolling=\"NO\" noborder>
<frame name=\"main\" src=\"".$conf->global->PHPWEBCALENDAR_URL."\"> <frame name=\"main\" src=\"".$conf->global->PHPWEBCALENDAR_URL."\">
<noframes> <noframes>

1
htdocs/webcal/webcaltop.php
View File

@ -26,6 +26,7 @@
require ("../main.inc.php"); require ("../main.inc.php");
top_htmlhead("");
top_menu("","","_top"); top_menu("","","_top");
?> ?>