Fix: Minor fix in themes

This commit is contained in:
Laurent Destailleur 2010-07-14 12:29:56 +00:00
parent f0fc5637bd
commit e9eb0b0203
5 changed files with 21 additions and 11 deletions

View File

@ -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 "
<html>
@ -47,7 +49,7 @@ print "
</head>
<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.($theme?'&theme='.$theme:'').($codelang?'&langs='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
<frame name=\"main\" src=\"".$conf->global->EXTERNALSITE_URL."\">
<noframes>
<body>

View File

@ -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");

View File

@ -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

View File

@ -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;
}

View File

@ -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')