From 3cfb2826a4b63f7c1f8ecd58b0247d5d75c88188 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 24 Oct 2010 15:50:28 +0000
Subject: [PATCH] New: use jQuery mobile for smartphone menu

---
 .../includes/menus/smartphone/iphone.lib.php  | 35 ++++++++++++++-----
 .../theme/phones/smartphone/tpl/menu.tpl.php  |  6 ++++
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/htdocs/includes/menus/smartphone/iphone.lib.php b/htdocs/includes/menus/smartphone/iphone.lib.php
index 61a24b59a25..26ea8371d79 100644
--- a/htdocs/includes/menus/smartphone/iphone.lib.php
+++ b/htdocs/includes/menus/smartphone/iphone.lib.php
@@ -54,7 +54,7 @@ function print_iphone_menu($db,$atarget,$type_user)
 	{
 		if ($tabMenu[$i]['enabled'] == true)
 		{
-			print_start_top_menu($tabMenu[$i]['titre'],$i);
+			print_start_top_menu($tabMenu[$i]['rowid'],$tabMenu[$i]['titre'],$i);
 			
 			$idsel=(empty($tabMenu[$i]['mainmenu'])?'none':$tabMenu[$i]['mainmenu']);
 			if ($tabMenu[$i]['right'] == true)	// Is allowed
@@ -86,15 +86,32 @@ function print_iphone_menu($db,$atarget,$type_user)
 						print_start_left_menu();
 						
 						$num = count($menus);
+						//var_dump($menus);
 						
 						for($j=0; $j<$num; $j++)
 						{
-							$url=$menus[$j]['url'];
-							print_start_menu_entry();
-							print '<a href="'.$url.'"'.($menus[$j]['atarget']?" target='".$menus[$j]['atarget']."'":($atarget?" target=$atarget":'')).'>';
-							print_text_menu_entry($menus[$j]['titre']);
-							print '</a>';
-							print_end_menu_entry();
+							/*
+							if ($menus[$j]['level'] == 0)
+							{
+								print_start_top_menu($tabMenu[$i]['rowid'].'_'.$j, $menus[$j]['titre'], 1, 'c');
+								print_start_left_menu();
+							}*/
+							
+							if ($menus[$j]['level'] == 0)
+							{
+								$url=$menus[$j]['url'];
+								print_start_menu_entry();
+								print '<a href="'.$url.'"'.($menus[$j]['atarget']?" target='".$menus[$j]['atarget']."'":($atarget?" target=$atarget":'')).'>';
+								print_text_menu_entry($menus[$j]['titre']);
+								print '</a>';
+								print_end_menu_entry();
+							}
+							/*
+							if (empty($menus[$j+1]['level']))
+							{
+								print_end_left_menu();
+								print_end_top_menu();
+							}*/
 						}
 						
 						print_end_left_menu();
@@ -120,9 +137,9 @@ function print_iphone_menu($db,$atarget,$type_user)
 
 
 
-function print_start_top_menu($title,$selected=0)
+function print_start_top_menu($id,$title,$collapsed=1,$theme='b')
 {
-	print '<div data-role="collapsible"'.($selected?'data-state="collapsed"':'').' data-theme="b">';
+	print '<div id="collapse_'.$id.'" data-role="collapsible"'.($collapsed?' data-state="collapsed"':'').' data-theme="'.$theme.'">';
 	print '<h3>'.$title.'</h3>';
 	print "\n";
 }
diff --git a/htdocs/theme/phones/smartphone/tpl/menu.tpl.php b/htdocs/theme/phones/smartphone/tpl/menu.tpl.php
index fba37bd00d0..edb6c156490 100644
--- a/htdocs/theme/phones/smartphone/tpl/menu.tpl.php
+++ b/htdocs/theme/phones/smartphone/tpl/menu.tpl.php
@@ -23,6 +23,12 @@ $this->smartheader();
 <!-- START MENU SMARTPHONE TEMPLATE -->
 
 <div data-role="page" id="dol-home">
+	
+	<div data-role="header" data-nobackbtn="true" data-theme="b">
+		<div id="dol-homeheader">
+			<img src="<?php echo DOL_URL_ROOT.'/theme/phones/smartphone/theme/'.$this->theme.'/thumbs/dolibarr.png'; ?>">
+		</div>
+	</div>
 
 	<div data-role="content">