From 5cb2ba39094d82e1b229d8c259649f429e752400 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 19 Jun 2013 17:02:09 +0200
Subject: [PATCH] Several fixes in CSS

Conflicts:
	htdocs/core/menus/standard/empty.php
---
 htdocs/core/menus/standard/auguria_menu.php |  2 +-
 htdocs/core/menus/standard/eldy_menu.php    |  2 +-
 htdocs/core/menus/standard/empty.php        | 52 ++++++++++-----------
 htdocs/theme/eldy/style.css.php             |  4 ++
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index 802bda1ff3d..abf3abddc0f 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -186,7 +186,7 @@ class MenuManager
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
-        		print '<ul data-role="listview" data-inset="true">';
+        		print '<ul class="ulmenu" data-role="listview" data-inset="true">';
         		print '<li data-role="list-divider">';
         		if ($val['enabled'] == 1)
         		{
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 47e7e723682..91c67a4ff55 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -140,7 +140,7 @@ class MenuManager
         	print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
         	foreach($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
         	{
-        		print '<ul data-role="listview" data-inset="true">';
+        		print '<ul class="ulmenu" data-role="listview" data-inset="true">';
         		print '<li data-role="list-divider">';
         		if ($val['enabled'] == 1)
         		{
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 240953afd57..e0e69c14c10 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -194,32 +194,32 @@ class MenuManager
 			}
 		}
 
-		if ($mode == 'jmobile')
-		{
-			foreach($this->topmenu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-			{
-				print '<ul data-role="listview" data-inset="true">';
-				print '<li data-role="list-divider">';
-				if ($val['enabled'] == 1)
-				{
-					$relurl=dol_buildpath($val['url'],1);
-					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
-					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
-
-					print '<a href="#">'.$val['titre'].'</a>'."\n";
-					// Search submenu fot this entry
-					$tmpmainmenu=$val['mainmenu'];
-					$tmpleftmenu='all';
-					//$submenu=new Menu();
-					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
-					//$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
-					$submenu=$this->leftmenu;
-
-					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
-					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
-					//var_dump($canonrelurl);
-					//var_dump($canonnexturl);
-					print '<ul>';
+		if ($mode == 'jmobile')
+		{
+			foreach($this->topmenu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
+			{
+				print '<ul class="ulmenu" data-role="listview" data-inset="true">';
+				print '<li data-role="list-divider">';
+				if ($val['enabled'] == 1)
+				{
+					$relurl=dol_buildpath($val['url'],1);
+					$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
+					$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
+
+					print '<a href="#">'.$val['titre'].'</a>'."\n";
+					// Search submenu fot this entry
+					$tmpmainmenu=$val['mainmenu'];
+					$tmpleftmenu='all';
+					//$submenu=new Menu();
+					//$res=print_left_eldy_menu($this->db,$this->menu_array,$this->menu_array_after,$this->tabMenu,$submenu,1,$tmpmainmenu,$tmpleftmenu);
+					//$nexturl=dol_buildpath($submenu->liste[0]['url'],1);
+					$submenu=$this->leftmenu;
+
+					$canonrelurl=preg_replace('/\?.*$/','',$relurl);
+					$canonnexturl=preg_replace('/\?.*$/','',$nexturl);
+					//var_dump($canonrelurl);
+					//var_dump($canonnexturl);
+					print '<ul>';
         			if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
 					{
 						// We add sub entry
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index bf41bf162cd..5f6b0ca9228 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -2695,6 +2695,10 @@ div.ui-radio
 	padding-bottom: 10px; margin-bottom: 4px; border-bottom: 1px solid #AAAAAA !important;
 }
 
+ul.ulmenu {
+	border-radius: 0;
+	-webkit-border-radius: 0;
+}
 
 <?php
 if (is_object($db)) $db->close();