[Slim-Checkins] r12509 - in /trunk/server/HTML/EN: html/wizard.js settings/server/wizard.html

[mherger at svn.slimdevices.com]

Author: mherger
Date: Wed Aug  8 09:43:35 2007
New Revision: 12509

URL: http://svn.slimdevices.com?rev=12509&view=rev
Log:
Bug: n/a
Description: fix layout issue with FF

Modified:
    trunk/server/HTML/EN/html/wizard.js
    trunk/server/HTML/EN/settings/server/wizard.html

Modified: trunk/server/HTML/EN/html/wizard.js
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/html/wizard.js?rev=12509&r1=12508&r2=12509&view=diff
==============================================================================
--- trunk/server/HTML/EN/html/wizard.js (original)
+++ trunk/server/HTML/EN/html/wizard.js Wed Aug  8 09:43:35 2007
@@ -1,7 +1,8 @@
 Wizard = function(){
 	// we do not always show the language selection page
-	page = firstpage;
+	page = 0;
 	pages = new Array('welcome', 'proxy', 'sqn', 'source', 'audiodir', 'playlistdir', 'itunes', 'musicip', 'summary');
+	folderselectors = new Array();
 
 	return {
 		init : function(){
@@ -31,6 +32,21 @@
 			layout.add('center', new Ext.ContentPanel('main'));
 			layout.endUpdate();
 			flipPages(page);
+
+			folderselectors['audiodir'] = new FileSelector('audiodirselector', {
+				filter: 'foldersonly',
+				input: 'audiodir'
+			});
+
+			folderselectors['playlistdir'] = new FileSelector('playlistdirselector', {
+				filter: 'foldersonly',
+				input: 'playlistdir'
+			});
+
+			folderselectors['itunes'] = new FileSelector('itunespathselector', {
+				input: 'xml_path',
+				filter: 'filetype:xml'
+			});
 
 			Ext.get('previous').on('click', this.onPrevious);
 			Ext.get('next').on('click', this.onNext);
@@ -64,7 +80,7 @@
 					break;
 			}
 
-			page = Math.max(page, firstpage);
+			page = Math.max(page, 0);
 			flipPages(page);
 		},
 		
@@ -81,7 +97,6 @@
 Ext.EventManager.onDocumentReady(Wizard.init, Wizard, true);
 
 function flipPages(newPage) {
-
 	for (x = 0; x < pages.length; x++) {
 		if (el = Ext.get(pages[x] + '_h')) {
 			el.setVisible(newPage == x, false);
@@ -90,10 +105,19 @@
 		if (el = Ext.get(pages[x] + '_m')) {
 			el.setVisible(newPage == x, false);
 		}
+		
+		// workaround for FF problem: frame would be displayed on wrong page,
+		// if class is applied in the HTML code
+		if (folderselector = folderselectors[pages[x]]) {
+			el = Ext.get(folderselector.id);
+			if (el && newPage == x) {
+				el.addClass("folderselector");
+			}
+			else if (el) {
+				el.removeClass("folderselector");
+			}
+		}
 	}
-	
-	// update buttons
-	if (newPage == pages.length-1) {
-	}
+
 }
 

Modified: trunk/server/HTML/EN/settings/server/wizard.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/settings/server/wizard.html?rev=12509&r1=12508&r2=12509&view=diff
==============================================================================
--- trunk/server/HTML/EN/settings/server/wizard.html (original)
+++ trunk/server/HTML/EN/settings/server/wizard.html Wed Aug  8 09:43:35 2007
@@ -12,25 +12,8 @@
 		<script type="text/javascript" src="/html/ext/ext-all.js"></script>
 
 		<script type="text/javascript">
-			var firstpage = [% showLanguage ? 1 : 0 %];
 			var showproxy = [% showProxy %];
 			var showitunes = [% showiTunes ? 1 : 0 %];
-
-			Ext.onReady(function(){
-				new FileSelector('audiodirselector', {
-					filter: 'foldersonly',
-					input: 'audiodir'
-				});
-
-				new FileSelector('playlistdirselector', {
-					filter: 'foldersonly',
-					input: 'playlistdir'
-				});
-
-				new FileSelector('itunespathselector', {
-					input: 'xml_path'
-				});
-			});
 		</script>
 
 		<script type="text/javascript" src="/html/fileselector.js"></script>
@@ -164,19 +147,19 @@
 
 			<div id="audiodir_m" class="page">
 				<div>[% "SETUP_WIZARD_AUDIODIR_DESC" | string %]</div>
-				<div id="audiodirselector" class="folderselector"></div>			
+				<div id="audiodirselector"></div>
 				<div><input type="text" name="audiodir" id="audiodir" value="[% prefs.audiodir %]" class="stdedit" size="50"></div>
 			</div>
 
 			<div id="playlistdir_m" class="page">
 				<div>[% "SETUP_WIZARD_PLAYLISTDIR_DESC" | string %]</div>
-				<div id="playlistdirselector" class="folderselector"></div>
+				<div id="playlistdirselector"></div>
 				<div><input type="text" name="playlistdir" id="playlistdir" value="[% prefs.playlistdir %]" class="stdedit" size="50"></div>
 			</div>
 
 			<div id="itunes_m" class="page">
 				<div>[% "SETUP_WIZARD_ITUNES_DESC" | string %]</div>
-				<div id="itunespathselector" class="folderselector"></div>
+				<div id="itunespathselector"></div>
 				<div><input type="text" name="xml_path" id="xml_path" value="[% prefs.xml_path %]" class="stdedit" size="50"></div>
 			</div>