From faae93bd033d0df24ceb124929d8cd7010c074d4 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 22 Oct 2013 17:57:22 +0200 Subject: [PATCH 1/2] Fix: Duplicate code --- htdocs/main.inc.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 20a08f9b1bc..9274004d615 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -725,13 +725,6 @@ if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea' $conf->css = "/theme/".$conf->theme."/style.css.php"; } -// Disabled bugged themes -if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo'))) -{ - $conf->theme='eldy'; - $conf->css = "/theme/".$conf->theme."/style.css.php"; -} - if (! defined('NOREQUIRETRAN')) { if (! GETPOST('lang')) // If language was not forced on URL From d542576d23ed4c48011e04c1075884529165469e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 22 Oct 2013 18:01:54 +0200 Subject: [PATCH 2/2] Fix: Menu entry into getmenu_div is clicable on all line. --- htdocs/core/menus/standard/auguria_menu.php | 8 +-- htdocs/core/menus/standard/eldy_menu.php | 8 +-- htdocs/core/menus/standard/empty.php | 6 +-- htdocs/theme/amarok/style.css.php | 52 +++++++++++++++++-- htdocs/theme/auguria/style.css.php | 51 +++++++++++++++++-- htdocs/theme/bureau2crea/style.css.php | 42 ++++++++++++++-- htdocs/theme/cameleo/style.css.php | 49 ++++++++++++++++-- htdocs/theme/eldy/style.css.php | 56 +++++++++++++++++++-- 8 files changed, 240 insertions(+), 32 deletions(-) diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php index 159038d00f6..74612aa57fd 100644 --- a/htdocs/core/menus/standard/auguria_menu.php +++ b/htdocs/core/menus/standard/auguria_menu.php @@ -187,14 +187,14 @@ class MenuManager foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu' { print '