Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 09:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Qual: Top menus use div only now. Menu manager eldy and auguria does not

Browse Source 
differs.
First work to align eldy theme to dolibarr theme.
This commit is contained in:
Laurent Destailleur
2012-05-01 23:40:23 +02:00
parent 4618b9b9c5
commit 3a05649df1
7 changed files with 129 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/core/menus/standard/auguria.lib.php
View File

@@ -80,7 +80,7 @@ function print_auguria_menu($db,$atarget,$type_user)
else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"'; else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
else $classname='class="tmenu"'; else $classname='class="tmenu"';
print_start_menu_entry_auguria($idsel); print_start_menu_entry_auguria($idsel,$classname);
print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($newTabMenu[$i]['target']?' target="'.$newTabMenu[$i]['target'].'"':($atarget?' target="'.$atarget.'"':'')).'>'; print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($newTabMenu[$i]['target']?' target="'.$newTabMenu[$i]['target'].'"':($atarget?' target="'.$atarget.'"':'')).'>';
print_text_menu_entry_auguria($newTabMenu[$i]['titre']); print_text_menu_entry_auguria($newTabMenu[$i]['titre']);
@@ -91,7 +91,7 @@ function print_auguria_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry_auguria($idsel); print_start_menu_entry_auguria($idsel,'class="tmenu"');
print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="mainmenu '.$idsel.'"><span class="mainmenu_'.$idsel.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry_auguria($newTabMenu[$i]['titre']); print_text_menu_entry_auguria($newTabMenu[$i]['titre']);
@@ -109,28 +109,27 @@ function print_auguria_menu($db,$atarget,$type_user)
/** /**
* Output start menu entry * Output start menu array
* *
* @return void * @return void
*/ */
function print_start_menu_array_auguria() function print_start_menu_array_auguria()
{ {
global $conf; global $conf;
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<table class="tmenu" summary="topmenu"><tr class="tmenu">'; print '<div class="tmenudiv">';
else print '<ul class="tmenu">'; print '<ul class="tmenu">';
} }
/** /**
* Output menu entry * Output start menu entry
* *
* @param string $idsel Text * @param string $idsel Text
* @return void * @return void
*/ */
function print_start_menu_entry_auguria($idsel) function print_start_menu_entry_auguria($idsel,$classname)
{ {
global $conf; print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<td class="tmenu" id="mainmenutd_'.$idsel.'">'; print '<div class="tmenuleft"></div><div class="tmenucenter">';
else print '<li class="tmenu" id="mainmenutd_'.$idsel.'">';
} }
/** /**
@@ -141,7 +140,6 @@ function print_start_menu_entry_auguria($idsel)
*/ */
function print_text_menu_entry_auguria($text) function print_text_menu_entry_auguria($text)
{ {
global $conf;
print '<span class="mainmenuaspan">'; print '<span class="mainmenuaspan">';
print $text; print $text;
print '</span>'; print '</span>';
@@ -154,9 +152,8 @@ function print_text_menu_entry_auguria($text)
*/ */
function print_end_menu_entry_auguria() function print_end_menu_entry_auguria()
{ {
global $conf; print '</div>';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</td>'; print '</li>';
else print '</li>';
print "\n"; print "\n";
} }
@@ -167,9 +164,8 @@ function print_end_menu_entry_auguria()
*/ */
function print_end_menu_array_auguria() function print_end_menu_array_auguria()
{ {
global $conf; print '</div>';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</tr></table>'; print '</ul>';
else print '</ul>';
print "\n"; print "\n";
} }

68
htdocs/core/menus/standard/eldy.lib.php
View File

@@ -55,7 +55,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$classname = 'class="tmenu"'; $classname = 'class="tmenu"';
} }
$idsel='home'; $idsel='home';
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($atarget?" target=$atarget":"").'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/index.php?mainmenu=home&amp;leftmenu="'.($atarget?" target=$atarget":"").'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -85,7 +85,7 @@ function print_eldy_menu($db,$atarget,$type_user)
if (($conf->societe->enabled && $user->rights->societe->lire) if (($conf->societe->enabled && $user->rights->societe->lire)
|| ($conf->fournisseur->enabled && $user->rights->fournisseur->lire)) || ($conf->fournisseur->enabled && $user->rights->fournisseur->lire))
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/societe/index.php?mainmenu=companies&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -98,7 +98,7 @@ function print_eldy_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("ThirdParties")); print_text_menu_entry($langs->trans("ThirdParties"));
@@ -131,7 +131,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$idsel='products'; $idsel='products';
if ($user->rights->produit->lire || $user->rights->service->lire) if ($user->rights->produit->lire || $user->rights->service->lire)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/product/index.php?mainmenu=products&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -144,7 +144,7 @@ function print_eldy_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($chaine); print_text_menu_entry($chaine);
@@ -178,7 +178,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$idsel='commercial'; $idsel='commercial';
if($user->rights->societe->lire || $user->rights->societe->contact->lire) if($user->rights->societe->lire || $user->rights->societe->contact->lire)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/comm/index.php?mainmenu=commercial&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="'.$id.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="'.$id.'"></span></div>';
print '</a>'; print '</a>';
@@ -191,7 +191,7 @@ function print_eldy_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print print_text_menu_entry($langs->trans("Commercial")); print print_text_menu_entry($langs->trans("Commercial"));
@@ -221,7 +221,7 @@ function print_eldy_menu($db,$atarget,$type_user)
if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire if ($user->rights->compta->resultat->lire || $user->rights->accounting->plancompte->lire
|| $user->rights->facture->lire || $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire) || $user->rights->facture->lire || $user->rights->deplacement->lire || $user->rights->don->lire || $user->rights->tax->charges->lire)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/compta/index.php?mainmenu=accountancy&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -234,7 +234,7 @@ function print_eldy_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("MenuFinancial")); print_text_menu_entry($langs->trans("MenuFinancial"));
@@ -263,7 +263,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$idsel='bank'; $idsel='bank';
if ($user->rights->banque->lire) if ($user->rights->banque->lire)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/compta/bank/index.php?mainmenu=bank&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/compta/bank/index.php?mainmenu=bank&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -276,7 +276,7 @@ function print_eldy_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("MenuBankCash")); print_text_menu_entry($langs->trans("MenuBankCash"));
@@ -304,7 +304,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$idsel='project'; $idsel='project';
if ($user->rights->projet->lire) if ($user->rights->projet->lire)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/projet/index.php?mainmenu=project&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -317,7 +317,7 @@ function print_eldy_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("Projects")); print_text_menu_entry($langs->trans("Projects"));
@@ -345,7 +345,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$idsel='tools'; $idsel='tools';
if ($user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run) if ($user->rights->mailing->lire || $user->rights->export->lire || $user->rights->import->run)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/core/tools.php?mainmenu=tools&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -358,7 +358,7 @@ function print_eldy_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("Tools")); print_text_menu_entry($langs->trans("Tools"));
@@ -384,7 +384,7 @@ function print_eldy_menu($db,$atarget,$type_user)
} }
$idsel='shop'; $idsel='shop';
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/boutique/index.php?mainmenu=shop&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -412,7 +412,7 @@ function print_eldy_menu($db,$atarget,$type_user)
$idsel='members'; $idsel='members';
if ($user->rights->adherent->lire) if ($user->rights->adherent->lire)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>'; print '<a class="tmenuimage" href="'.DOL_URL_ROOT.'/adherents/index.php?mainmenu=members&amp;leftmenu="'.($atarget?' target="'.$atarget.'"':'').'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -425,7 +425,7 @@ function print_eldy_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($langs->trans("MenuMembers")); print_text_menu_entry($langs->trans("MenuMembers"));
@@ -475,7 +475,7 @@ function print_eldy_menu($db,$atarget,$type_user)
else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"'; else if (! empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname='class="tmenusel"';
else $classname='class="tmenu"'; else $classname='class="tmenu"';
print_start_menu_entry($idsel); print_start_menu_entry($idsel,$classname);
print '<a class="tmenuimage" href="'.$url.'"'.($newTabMenu[$i]['target']?" target='".$newTabMenu[$i]['target']."'":($atarget?' target="'.$atarget.'"':'')).'>'; print '<a class="tmenuimage" href="'.$url.'"'.($newTabMenu[$i]['target']?" target='".$newTabMenu[$i]['target']."'":($atarget?' target="'.$atarget.'"':'')).'>';
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '</a>'; print '</a>';
@@ -488,7 +488,7 @@ function print_eldy_menu($db,$atarget,$type_user)
{ {
if (! $type_user) if (! $type_user)
{ {
print_start_menu_entry($idsel); print_start_menu_entry($idsel,'class="tmenu"');
print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>'; print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'; print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
print_text_menu_entry($newTabMenu[$i]['titre']); print_text_menu_entry($newTabMenu[$i]['titre']);
@@ -503,12 +503,15 @@ function print_eldy_menu($db,$atarget,$type_user)
} }
/**
* Output start menu array
*
* @return void
*/
function print_start_menu_array() function print_start_menu_array()
{ {
global $conf; print '<div class="tmenudiv">';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<table class="tmenu" summary="topmenu"><tr class="tmenu">'; print '<ul class="tmenu">';
else print '<ul class="tmenu">';
} }
/** /**
@@ -517,11 +520,10 @@ function print_start_menu_array()
* @param string $idsel Text * @param string $idsel Text
* @return void * @return void
*/ */
function print_start_menu_entry($idsel) function print_start_menu_entry($idsel,$classname)
{ {
global $conf; print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '<td class="tmenu" id="mainmenutd_'.$idsel.'">'; print '<div class="tmenuleft"></div><div class="tmenucenter">';
else print '<li class="tmenu" id="mainmenutd_'.$idsel.'">';
} }
/** /**
@@ -532,7 +534,6 @@ function print_start_menu_entry($idsel)
*/ */
function print_text_menu_entry($text) function print_text_menu_entry($text)
{ {
global $conf;
print '<span class="mainmenuaspan">'; print '<span class="mainmenuaspan">';
print $text; print $text;
print '</span>'; print '</span>';
@@ -545,9 +546,7 @@ function print_text_menu_entry($text)
*/ */
function print_end_menu_entry() function print_end_menu_entry()
{ {
global $conf; print '</div></li>';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</td>';
else print '</li>';
print "\n"; print "\n";
} }
@@ -558,9 +557,8 @@ function print_end_menu_entry()
*/ */
function print_end_menu_array() function print_end_menu_array()
{ {
global $conf; print '</div>';
if (preg_match('/bluelagoon|eldy|freelug|rodolphe|yellow|dev/',$conf->css)) print '</tr></table>'; print '</ul>';
else print '</ul>';
print "\n"; print "\n";
} }

BIN
htdocs/theme/eldy/img/menutab-active.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 111 B

BIN
htdocs/theme/eldy/img/menutab-r.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 306 B

BIN
htdocs/theme/eldy/img/nav-overlay.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 144 B

BIN
htdocs/theme/eldy/img/nav-overlay3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

133
htdocs/theme/eldy/style.css.php
View File

@@ -353,12 +353,28 @@ if (! empty($conf->browser->phone))
} }
else else
{ {
$minwidthtmenu=64; $minwidthtmenu=66;
$heightmenu=48; // $heightmenu=48;
$heightmenu=54;
} }
?> ?>
div.tmenu {
div#tmenu_tooltip {
<?php if (! empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED) || ! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) {
$colortexttopmenu=$colortextmain;
?>
background: rgb(<?php echo $colorback1 ?>);
<?php } else {
if ($usecss3) $colortexttopmenu='FFFFFF';
else $colortexttopmenu='000000';
?>
background: #305582; /* 2C68A3 */
<?php
} ?>
}
div.tmenudiv {
<?php if (GETPOST("optioncss") == 'print') { ?> <?php if (GETPOST("optioncss") == 'print') { ?>
display:none; display:none;
<?php } else { ?> <?php } else { ?>
@@ -370,17 +386,18 @@ div.tmenu {
border-<?php print $right; ?>: 0px solid #555555; border-<?php print $right; ?>: 0px solid #555555;
border-bottom: 1px solid #FFFFFF; border-bottom: 1px solid #FFFFFF;
padding: 0px 0px 0px 0px; /* t r b l */ padding: 0px 0px 0px 0px; /* t r b l */
margin: 0px 0px 7px 0px; /* t r b l */ margin: 0px 0px 0px 0px; /* t r b l */
font-size: 13px; font-size: 13px;
font-weight: normal; font-weight: normal;
height: <?php print ($heightmenu+1); ?>px; height: <?php print ($heightmenu+1); ?>px;
<?php if ($usecss3) { ?> <?php if ($usecss3) { ?>
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); /* background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); /* background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%); /* background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%);*/
background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); /* background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); /* background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 50% 0% repeat-x;
<?php } else { ?> <?php } else { ?>
background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/tmenu2.jpg' ?>); background-image: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/tmenu2.jpg' ?>);
background-position:top; background-position:top;
@@ -391,20 +408,8 @@ div.tmenu {
<?php } ?> <?php } ?>
} }
table.tmenu {
padding: 0px 0px 10px 0px; /* t r b l */
margin: 0px 0px 0px 0px; /* t r b l */
text-align: center;
}
td.tmenu {
<?php print $minwidthtmenu?'width: '.$minwidthtmenu.'px;':''; ?>
text-align: center;
vertical-align: bottom;
white-space: nowrap;
}
a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudisabled:active { a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudisabled:active {
color: #757575; color: #808080;
font-weight: normal; font-weight: normal;
padding: 0px 5px 0px 5px; padding: 0px 5px 0px 5px;
margin: 0px 1px 2px 1px; margin: 0px 1px 2px 1px;
@@ -416,49 +421,46 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis
a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active { a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
font-weight: normal; font-weight: normal;
padding: 0px 5px 0px 5px; padding: 0px 5px 0px 5px;
margin: 0px 1px 2px 1px;
white-space: nowrap; white-space: nowrap;
text-shadow: 1px 1px 1px #FFFFFF; /* text-shadow: 1px 1px 1px #000000; */
color: #<?php echo $colortexttopmenu; ?>;
} }
a.tmenu:link, a.tmenu:visited { a.tmenu:link, a.tmenu:visited {
color: #<?php echo $colortextmain; ?>; color: #<?php echo $colortexttopmenu; ?>;
} }
a.tmenu:hover, a.tmenu:active { a.tmenu:hover, a.tmenu:active {
color: #233030;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
border-<?php print $right; ?>: 1px solid #555555; /* border-<?php print $right; ?>: 1px solid #555555; */
border-<?php print $left; ?>: 1px solid #D8D8D8; /* border-<?php print $left; ?>: 1px solid #D8D8D8; */
border-top: 1px solid #D8D8D8; /* border-top: 1px solid #D8D8D8; */
border-bottom: 2px solid #F4F4F4; /* border-bottom: 2px solid #F4F4F4; */
background: #F4F4F4; /* background: #F4F4F4; */
text-shadow: 1px 1px 1px #FFFFFF; /* text-shadow: 1px 1px 1px #FFFFFF !important; */
color: #<?php echo $colortexttopmenu; ?>;
} }
a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active { a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
font-weight: normal; font-weight: normal;
color: #233030;
padding: 0px 5px 0px 5px; padding: 0px 5px 0px 5px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
background: #F4F4F4; /* background: #F4F4F4; */
border-<?php print $right; ?>: 1px solid #555555; /* border-<?php print $right; ?>: 1px solid #555555; */
border-top: 1px solid #D8D8D8; /* border-top: 1px solid #D8D8D8; */
border-<?php print $left; ?>: 1px solid #D8D8D8; /* border-<?php print $left; ?>: 1px solid #D8D8D8; */
border-bottom: 2px solid #F4F4F4; /* border-bottom: 2px solid #F4F4F4; */
white-space: nowrap; white-space: nowrap;
text-shadow: 1px 1px 1px #FFFFFF; /* text-shadow: 1px 1px 1px #FFFFFF;*/
} color: #<?php echo $colortexttopmenu; ?>;
* html li.tmenu a {
min-width:60px;
} }
ul.tmenu { /* t r b l */ ul.tmenu { /* t r b l */
padding: 0px 0px 10px 0px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 6px; margin: 0px 0px 0px 0px;
list-style: none; list-style: none;
height: <?php print $heightmenu; ?>px;
background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 0 0 repeat-x !important;
} }
li.tmenu { li.tmenu, li.tmenusel {
<?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?> <?php print $minwidthtmenu?'min-width: '.$minwidthtmenu.'px;':''; ?>
text-align: center; text-align: center;
vertical-align: bottom; vertical-align: bottom;
@@ -466,10 +468,33 @@ li.tmenu {
height: <?php print $heightmenu; ?>px; height: <?php print $heightmenu; ?>px;
position:relative; position:relative;
display: block; display: block;
padding: 2px 5px 0px 5px; padding: 0px 0px 0px 0px;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
font-weight: normal; font-weight: normal;
} }
li.tmenu:hover, li.tmenusel {
<?php if ($usecss3) { ?>
/* background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
/* background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
/* background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 40%, rgb(<?php echo $colorback2; ?>) 60%, rgb(<?php echo $colorback1; ?>) 100%); */
/* background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%);*/
/* background-image: linear-gradient(bottom, rgb(<?php echo $colorback1; ?>) 75%, rgb(<?php echo $colorback2; ?>) 100%); */
background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/nav-overlay3.png' ?>) 50% 0 repeat-x;
<?php } ?>
}
div.tmenuleft
{
width: 5px;
float: <?php print $left; ?>;
height: <?php print $heightmenu; ?>px;
background: url(<?php echo DOL_URL_ROOT.'/theme/eldy/img/menutab-r.png' ?>) 100% 0 no-repeat;
}
div.tmenucenter
{
padding-top: 2px;
padding-right: 5px;
height: <?php print $heightmenu; ?>px;
}
div.mainmenu { div.mainmenu {
@@ -619,7 +644,6 @@ foreach($mainmenuusedarray as $key => $val)
{ {
print "div.mainmenu.".$val." {\n"; print "div.mainmenu.".$val." {\n";
print " background-image: url(".$url.");\n"; print " background-image: url(".$url.");\n";
print " height:28px;\n";
print "}\n"; print "}\n";
} }
} }
@@ -700,10 +724,10 @@ div.login {
font-weight: bold; font-weight: bold;
} }
div.login a { div.login a {
color: #233030; color: #<?php echo $colortextmain; ?>;
} }
div.login a:hover { div.login a:hover {
color: black; color: #<?php echo $colortextmain; ?>;
text-decoration:underline; text-decoration:underline;
} }
@@ -1704,6 +1728,13 @@ div.error {
background: #EFCFCF; background: #EFCFCF;
} }
div.jnotify-background {
opacity : 0.95 !important;
-moz-box-shadow: 4px 4px 4px #888 !important;
-webkit-box-shadow: 4px 4px 4px #888 !important;
box-shadow: 4px 4px 4px #888 !important;
}
/* Info admin */ /* Info admin */
div.info { div.info {
color: #807050; color: #807050;