diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php index 69c11d3e5d9..00c32ab5926 100644 --- a/htdocs/externalsite/frames.php +++ b/htdocs/externalsite/frames.php @@ -27,7 +27,7 @@ require("../main.inc.php"); -$langs->load("@externalsite"); +$langs->load("externalsite@externalsite"); if (empty($conf->global->EXTERNALSITE_URL)) { @@ -39,6 +39,8 @@ if (empty($conf->global->EXTERNALSITE_URL)) $mainmenu=isset($_GET["mainmenu"])?$_GET["mainmenu"]:""; $leftmenu=isset($_GET["leftmenu"])?$_GET["leftmenu"]:""; $idmenu=isset($_GET["idmenu"])?$_GET["idmenu"]:""; +$theme=isset($_GET["theme"])?$_GET["theme"]:""; +$codelang=isset($_GET["lang"])?$_GET["lang"]:""; print " @@ -47,7 +49,7 @@ print " - + global->EXTERNALSITE_URL."\"> <body> diff --git a/htdocs/externalsite/frametop.php b/htdocs/externalsite/frametop.php index 5deb5d4cf64..9cd532fde75 100644 --- a/htdocs/externalsite/frametop.php +++ b/htdocs/externalsite/frametop.php @@ -1,5 +1,6 @@ <?php /* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> + * Copyright (C) 2010 Laurent Destailleur <eldy@users.sourceforge.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,11 +18,11 @@ */ /** - \file htdocs/externalsite/frametop.php - \ingroup externalsite - \brief Top frame to show external web application - \version $Id$ -*/ + * \file htdocs/externalsite/frametop.php + * \ingroup externalsite + * \brief Top frame to show external web application + * \version $Id$ + */ require ("../main.inc.php"); diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql index 3b28cd96046..e2286ecf8e1 100644 --- a/htdocs/install/mysql/data/llx_const.sql +++ b/htdocs/install/mysql/data/llx_const.sql @@ -71,7 +71,7 @@ insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT insert into llx_const (name, value, type, note, visible) values ('MAIN_MENU_BARRELEFT','eldy_backoffice.php','chaine','Module de gestion de la barre de menu gauche pour utilisateurs internes',0); insert into llx_const (name, value, type, note, visible) values ('MAIN_MENUFRONT_BARRELEFT','eldy_frontoffice.php','chaine','Module de gestion de la barre de menu gauche pour utilisateurs externes',0); -insert into llx_const (name, value, type, note, visible) values ('MAIN_THEME','eldy','chaine','Thème par défaut',0); +insert into llx_const (name, value, type, note, visible) values ('MAIN_THEME','auguria','chaine','Default theme',0); -- -- Delai tolerance diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 843a64bf369..7f8f3ea7ab2 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -337,14 +337,13 @@ foreach($mainmenuusedarray as $key => $val) font-family:Tahoma,sans-serif; text-transform:uppercase; background: url(<?php echo DOL_URL_ROOT.'/theme/auguria' ?>/img/menus/topmenu_bg.gif) repeat-x bottom left; - padding:0 0 0 10px; } .tmenu ul{ - margin:0; + margin:0 60px 0 0; /* t r b l */ padding:0; list-style-type:none; - width:auto; + width:auto; /* Having 100% instead of auto works on IE but IE fails to down main content, so we forget IE and use best value for Firefox */ float:left; } diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 0204b1efa67..2bfee75ffaf 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -347,6 +347,14 @@ div.mainmenu.cashdesk { background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/pointofsale.png' ?>); } +div.mainmenu.webcal { + background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/agenda.png' ?>); +} + +div.mainmenu.google { + background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menus/globe.png' ?>); +} + <?php // Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')