Dolibarr frame for external web site

diff --git a/htdocs/compta/bank/pre.inc.php b/htdocs/compta/bank/pre.inc.php index 2c96ff17cc2..50820e8635e 100644 --- a/htdocs/compta/bank/pre.inc.php +++ b/htdocs/compta/bank/pre.inc.php @@ -31,11 +31,12 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/account.class.php"); $langs->load("banks"); -function llxHeader($head = "") +function llxHeader($head = '', $title='', $help_url='', $target='', $disablejs=0, $disablehead=0, $arrayofjs='', $arrayofcss='') { 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(); if ($user->rights->banque->lire) diff --git a/htdocs/compta/paiement/cheque/pre.inc.php b/htdocs/compta/paiement/cheque/pre.inc.php index aef8fe5682e..d8aebb39e69 100644 --- a/htdocs/compta/paiement/cheque/pre.inc.php +++ b/htdocs/compta/paiement/cheque/pre.inc.php @@ -31,11 +31,12 @@ $langs->load("bills"); $langs->load("compta"); $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; - 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(); if ($user->rights->banque->lire) diff --git a/htdocs/core/searchpostalcode.php b/htdocs/core/searchpostalcode.php index 892cdac25d1..3836334a3ca 100644 --- a/htdocs/core/searchpostalcode.php +++ b/htdocs/core/searchpostalcode.php @@ -89,7 +89,6 @@ print ''; print $javascript; -print '

'; print "

"; // Ouvre div a la place de top_menu car le llxFooter en ferme un print "

"; diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php index ee958f7f3c4..321e31d1722 100644 --- a/htdocs/externalsite/frames.php +++ b/htdocs/externalsite/frames.php @@ -44,7 +44,7 @@ print " Dolibarr frame for external web site - + global->EXTERNALSITE_URL."\"> diff --git a/htdocs/externalsite/frametop.php b/htdocs/externalsite/frametop.php index aad9ef55e72..49bfa7ef124 100644 --- a/htdocs/externalsite/frametop.php +++ b/htdocs/externalsite/frametop.php @@ -17,14 +17,15 @@ */ /** - \file htdocs/mantis/mantistop.php + \file htdocs/externalsite/frametop.php \ingroup externalsite - \brief Top frame to show mantis application + \brief Top frame to show external web application \version $Id$ */ require ("../main.inc.php"); +top_htmlhead("",""); top_menu("","","_top"); ?> diff --git a/htdocs/ftp/pre.inc.php b/htdocs/ftp/pre.inc.php index 32d78d5acce..3a4307d92d9 100644 --- a/htdocs/ftp/pre.inc.php +++ b/htdocs/ftp/pre.inc.php @@ -32,7 +32,8 @@ function llxHeader($head = '', $title='', $help_url='', $morehtml='') global $conf,$langs,$user; $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(); diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index c275106cba6..bb8c07c729a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -709,6 +709,11 @@ else define('ROWS_9',8); } +$heightforframes=48; + + +// Functions + /** * \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='') { + top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss); 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->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>'; /* diff --git a/htdocs/mantis/mantis.php b/htdocs/mantis/mantis.php index 78ba4ddf7bd..26fd5939d5c 100644 --- a/htdocs/mantis/mantis.php +++ b/htdocs/mantis/mantis.php @@ -44,7 +44,7 @@ print " <title>Dolibarr frame for Mantis</title> </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=\"main\" src=\"".$conf->global->PHPMANTIS_URL."\"> <noframes> diff --git a/htdocs/mantis/mantistop.php b/htdocs/mantis/mantistop.php index 2b8c117c857..4b9ceb3f5f0 100644 --- a/htdocs/mantis/mantistop.php +++ b/htdocs/mantis/mantistop.php @@ -25,6 +25,7 @@ require ("../main.inc.php"); +top_htmlhead("",""); top_menu("","","_top"); ?> diff --git a/htdocs/oscommerce_ws/clients/pre.inc.php b/htdocs/oscommerce_ws/clients/pre.inc.php index 7fb905929d1..166d1dbdc2d 100644 --- a/htdocs/oscommerce_ws/clients/pre.inc.php +++ b/htdocs/oscommerce_ws/clients/pre.inc.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require("./osc_customer.class.php"); +require(DOL_DOCUMENT_ROOT."/oscommerce_ws/osc_customer.class.php"); function llxHeader($head = "", $urlp = "") { diff --git a/htdocs/oscommerce_ws/commandes/pre.inc.php b/htdocs/oscommerce_ws/commandes/pre.inc.php index 8c54d5fdc6c..2e0d6acd60f 100644 --- a/htdocs/oscommerce_ws/commandes/pre.inc.php +++ b/htdocs/oscommerce_ws/commandes/pre.inc.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require("./osc_order.class.php"); +require(DOL_DOCUMENT_ROOT."/oscommerce_ws/osc_order.class.php"); function llxHeader($head = "", $urlp = "") { diff --git a/htdocs/oscommerce_ws/index.php b/htdocs/oscommerce_ws/index.php index c5283ab28e9..c0839c90214 100644 --- a/htdocs/oscommerce_ws/index.php +++ b/htdocs/oscommerce_ws/index.php @@ -30,6 +30,10 @@ $langs->load("shop"); $langs->load("orders"); +/* + * View + */ + llxHeader("",$langs->trans("OSCommerceShop")); print_fiche_titre($langs->trans("OSCommerceShop")); diff --git a/htdocs/oscommerce_ws/pre.inc.php b/htdocs/oscommerce_ws/pre.inc.php index 7c3f0635396..9904d53de01 100644 --- a/htdocs/oscommerce_ws/pre.inc.php +++ b/htdocs/oscommerce_ws/pre.inc.php @@ -33,6 +33,7 @@ function llxHeader($head = '', $title='', $help_url='') global $user, $conf, $langs; $langs->load("shop"); + top_htmlhead($head); top_menu($head); $menu = new Menu(); diff --git a/htdocs/oscommerce_ws/produits/pre.inc.php b/htdocs/oscommerce_ws/produits/pre.inc.php index cabd5eb82db..ea21ebc45be 100644 --- a/htdocs/oscommerce_ws/produits/pre.inc.php +++ b/htdocs/oscommerce_ws/produits/pre.inc.php @@ -27,7 +27,7 @@ */ require("../../main.inc.php"); -require("./osc_product.class.php"); +require(DOL_DOCUMENT_ROOT."/oscommerce_ws/osc_product.class.php"); function llxHeader($head = "", $urlp = "") { diff --git a/htdocs/phenix/phenix.php b/htdocs/phenix/phenix.php index 1bbab647b2d..fa930fa3e3f 100644 --- a/htdocs/phenix/phenix.php +++ b/htdocs/phenix/phenix.php @@ -42,7 +42,7 @@ print " <title>Dolibarr frame for Phenix</title> </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=\"main\" src=\"".$conf->global->PHPPHENIX_URL."\"> <noframes> diff --git a/htdocs/phenix/phenixtop.php b/htdocs/phenix/phenixtop.php index 6494299855d..17f9de7667b 100644 --- a/htdocs/phenix/phenixtop.php +++ b/htdocs/phenix/phenixtop.php @@ -26,6 +26,7 @@ require ("../main.inc.php"); +top_htmlhead(""); top_menu("","","_top"); ?> diff --git a/htdocs/theme/eldy/eldy.css.php b/htdocs/theme/eldy/eldy.css.php index dcb08c36b22..3d95add702f 100644 --- a/htdocs/theme/eldy/eldy.css.php +++ b/htdocs/theme/eldy/eldy.css.php @@ -437,6 +437,16 @@ div.mainmenu_accountancy { 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 { position : relative; color: white; @@ -447,6 +457,16 @@ div.mainmenu_tools { 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 { position : relative; color: white; @@ -467,6 +487,16 @@ div.mainmenu_ecm { 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 { position : relative; color: white; diff --git a/htdocs/theme/eldy/img/menus/.cvsignore b/htdocs/theme/eldy/img/menus/.cvsignore new file mode 100644 index 00000000000..fe283d71a09 --- /dev/null +++ b/htdocs/theme/eldy/img/menus/.cvsignore @@ -0,0 +1 @@ +tango-icon-theme* diff --git a/htdocs/theme/eldy/img/menus/company2.png b/htdocs/theme/eldy/img/menus/company2.png deleted file mode 100644 index 6f467068d79..00000000000 Binary files a/htdocs/theme/eldy/img/menus/company2.png and /dev/null differ diff --git a/htdocs/theme/eldy/img/menus/members.png b/htdocs/theme/eldy/img/menus/members.png new file mode 100644 index 00000000000..4b703f42cd7 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/members.png differ diff --git a/htdocs/theme/eldy/img/menus/pointofsale.png b/htdocs/theme/eldy/img/menus/pointofsale.png new file mode 100644 index 00000000000..748ec41b1e6 Binary files /dev/null and b/htdocs/theme/eldy/img/menus/pointofsale.png differ diff --git a/htdocs/theme/eldy/img/menus/project.png b/htdocs/theme/eldy/img/menus/project.png new file mode 100644 index 00000000000..5bc0f86b4be Binary files /dev/null and b/htdocs/theme/eldy/img/menus/project.png differ diff --git a/htdocs/webcal/webcal.php b/htdocs/webcal/webcal.php index 97d51e5c7d9..c2fec51ff02 100644 --- a/htdocs/webcal/webcal.php +++ b/htdocs/webcal/webcal.php @@ -42,7 +42,7 @@ print " <title>Dolibarr frame for Webcalendar</title> </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=\"main\" src=\"".$conf->global->PHPWEBCALENDAR_URL."\"> <noframes> diff --git a/htdocs/webcal/webcaltop.php b/htdocs/webcal/webcaltop.php index a210dd59e44..87fc13a76db 100644 --- a/htdocs/webcal/webcaltop.php +++ b/htdocs/webcal/webcaltop.php @@ -26,6 +26,7 @@ require ("../main.inc.php"); +top_htmlhead(""); top_menu("","","_top"); ?>