From 998352f9f1b8c06f7ae0711702f4e9d12fae09b1 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sat, 5 Dec 2009 16:09:18 +0000
Subject: [PATCH] - Improved Ajax tabs code (Web UI)

---
 src/webui/properties.html   | 68 ++++++++++++++++---------------------
 src/webui/scripts/client.js |  9 +++--
 2 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/src/webui/properties.html b/src/webui/properties.html
index 874f4f4c3..bb7b6a184 100644
--- a/src/webui/properties.html
+++ b/src/webui/properties.html
@@ -1,45 +1,37 @@
+<script type="text/javascript">
+		MochaUI.initializeTabs('propertiesTabs');
+		MochaUI.updateContent({
+				'element':  $('properties'),
+				'url':       'prop-general.html'
+			});
+		
+		$('PropGeneralLink').addEvent('click', function(e){
+			MochaUI.updateContent({
+				'element':  $('properties'),
+				'url':       'prop-general.html'
+			});
+		});
+		
+		$('PropTrackersLink').addEvent('click', function(e){
+			MochaUI.updateContent({
+				'element':  $('properties'),
+				'url':       'prop-trackers.html'
+			});
+		});
+		
+		$('PropFilesLink').addEvent('click', function(e){
+			MochaUI.updateContent({
+				'element':  $('properties'),
+				'url':       'prop-files.html'
+			});
+		});
+</script>
+
 <div class="toolbarTabs">
-	<!-- <div style="float:right;padding-top:3px;"><img src="images/icons/help.gif" width="16" height="16" alt="Help" /></div> -->
 	<ul id="propertiesTabs" class="tab-menu">
 		<li id="PropGeneralLink" class="selected"><a>_(General)</a></li>
 		<li id="PropTrackersLink"><a>_(Trackers)</a></li>
 		<li id="PropFilesLink"><a>_(Files)</a></li>
 	</ul>
 	<div class="clear"></div>
-	<div id="propertyTab"></div>
-</div>
-
-<script type="text/javascript">
-
-	MochaUI.initializeTabs('propertiesTabs');
-	MochaUI.updateContent({
-			'element':  $('properties'),
-		        'childElement': $('propertyTab'),
-			'url':       'prop-general.html'
-		});
-
-	$('PropGeneralLink').addEvent('click', function(e){
-		MochaUI.updateContent({
-			'element':  $('properties'),
-		        'childElement': $('propertyTab'),
-			'url':       'prop-general.html'
-		});
-	});
-
-	$('PropTrackersLink').addEvent('click', function(e){
-		MochaUI.updateContent({
-			'element':  $('properties'),
-			'childElement': $('propertyTab'),
-			'url':       'prop-trackers.html'
-		});
-	});
-
-	$('PropFilesLink').addEvent('click', function(e){
-		MochaUI.updateContent({
-			'element':  $('properties'),
-			'childElement': $('propertyTab'),
-			'url':       'prop-files.html'
-		});
-	});
-
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/webui/scripts/client.js b/src/webui/scripts/client.js
index 6649f6731..00f6eb46c 100644
--- a/src/webui/scripts/client.js
+++ b/src/webui/scripts/client.js
@@ -93,10 +93,13 @@ window.addEvent('load', function(){
     new MochaUI.Panel({
 		id: 'properties',
 		title: 'Panel',
-		header: false,
+		header: true,
 		padding: { top: 0, right: 0, bottom: 0, left: 0 },
-		loadMethod: 'xhr',
-		contentURL: 'properties.html',
+		contentURL: 'prop-general.html',
+		require: {
+                  css: ['css/Tabs.css']
+                },
+                tabsURL: 'properties.html',
 		column: 'mainColumn',
 		height: prop_h
 	});