From 219d4e665311eb876a9486d45c8e49a5a06807c5 Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Fri, 23 Oct 2009 11:06:24 +0200
Subject: [PATCH] KTS-4443: Updated CSS On Setup Wizards

---
 setup/wizard/lib/validation/luceneValidation.php |  6 +++---
 setup/wizard/resources/css/ie6.css               | 32 ++++++++++++++++++++++++++++++++
 setup/wizard/templates/welcome.tpl               |  1 +
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/setup/wizard/lib/validation/luceneValidation.php b/setup/wizard/lib/validation/luceneValidation.php
index 4e58d3c..e475b2d 100644
--- a/setup/wizard/lib/validation/luceneValidation.php
+++ b/setup/wizard/lib/validation/luceneValidation.php
@@ -363,11 +363,11 @@ class luceneValidation extends serviceValidation {
 	* @access private
 	* @return boolean
 	*/
-    private function detSettings() {
-    	$javaExecutable = $this->util->javaSpecified();// Retrieve java bin
+ private function detSettings($attempt = false) {
+    	$javaExecutable = $this->util->javaSpecified(); // Retrieve java bin
     	if($javaExecutable == '') {
     		if($this->java == '') {
-    			return false;
+				$this->java = 'java'; // Assume java is in classpath
     		}
     		$javaExecutable = $this->java;
     	}
diff --git a/setup/wizard/resources/css/ie6.css b/setup/wizard/resources/css/ie6.css
index e69de29..0bedaab 100644
--- a/setup/wizard/resources/css/ie6.css
+++ b/setup/wizard/resources/css/ie6.css
@@ -0,0 +1,32 @@
+#logo {
+	position:relative;
+	right:700px;
+	top:20px;
+}
+
+td.ext_description {
+	width:330px;
+}
+
+#outer-wrapper {
+	border:1px solid #B7B7B7;
+	margin-left:auto;
+	margin-right:auto;
+	width:964px;
+}
+
+#outer-outer-wrapper {
+	margin-left:auto;
+	margin-right:auto;
+}
+
+#content {
+	padding-left:50px;
+    margin-left: 220px;
+    height:515px;
+}
+
+#step_content {
+	height: 400px;
+	overflow:auto;
+}
\ No newline at end of file
diff --git a/setup/wizard/templates/welcome.tpl b/setup/wizard/templates/welcome.tpl
index 652c790..54f9ad0 100644
--- a/setup/wizard/templates/welcome.tpl
+++ b/setup/wizard/templates/welcome.tpl
@@ -4,6 +4,7 @@
 		<p class="empty_space"> This wizard will lead you through all the steps required to install and configure KnowledgeTree on your server.</p> 
 		<p class="empty_space">
 		Press <b>Next</b> to continue.</p>
+		<?php echo $html->image('kt_browse.png'); ?>
 	</div>
 	<input type="submit" name="Next" value="Next" class="button_next"/>
 <!--	<input type="submit" name="Migrate" value="Migrate" class="button_next"/>-->
--
libgit2 0.21.4