From 6bdf2859f35f565a85b782a8c62baea01a9d839c Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Sat, 31 Oct 2009 11:45:07 +0200
Subject: [PATCH] KTS-4438: Updated Services

---
 setup/wizard/lib/services/unixLucene.php    |  9 +++++----
 setup/wizard/lib/services/unixScheduler.php |  3 ++-
 setup/wizard/resources/css/wizard.css       |  9 +++++++--
 setup/wizard/templates/install.tpl          | 11 +++++++----
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/setup/wizard/lib/services/unixLucene.php b/setup/wizard/lib/services/unixLucene.php
index 1520874..6fcc98d 100644
--- a/setup/wizard/lib/services/unixLucene.php
+++ b/setup/wizard/lib/services/unixLucene.php
@@ -64,8 +64,8 @@ class unixLucene extends unixService {
 		$this->setLuceneDir(SYSTEM_DIR."bin".DS."luceneserver".DS);
 		$this->setIndexerDir(SYSTEM_DIR."search2".DS."indexing".DS."bin".DS);
 		$this->setLucenePidFile("lucene_test.pid");
-		$this->setJavaXms(512);
-		$this->setJavaXmx(512);
+		$this->setJavaXms(1024);
+		$this->setJavaXmx(1024);
 		$this->setLuceneSourceLoc("ktlucene.jar");
 		$this->setShutdownScript("shutdown.php");
 	}
@@ -201,10 +201,11 @@ class unixLucene extends unixService {
     public function start() {
     	$state = $this->status();
     	if($state != 'STARTED') {
-    		$logFile = $this->outputDir.DS."lucene.log";
+    		//$logFile = $this->outputDir."lucene.log";
+    		$logFile = "/dev/null";//$this->outputDir."lucene.log";
     		@unlink($logFile);
 	    	$cmd = "cd ".$this->getLuceneDir()."; ";
-	    	$cmd .= "nohup java  {$this->getJavaXmx()} {$this->getJavaXmx()} -jar ".$this->getLuceneSource()." > ".$logFile." 2>&1 & echo $!";
+	    	$cmd .= "nohup java ".$this->getLuceneSource()." {$this->getJavaXmx()} {$this->getJavaXms()} -jar > ".$logFile." 2>&1 & echo $!";
 	    	if(DEBUG) {
 	    		echo "Command : $cmd<br/>";
 	    		return false;
diff --git a/setup/wizard/lib/services/unixScheduler.php b/setup/wizard/lib/services/unixScheduler.php
index 9c5a4c0..c04fc06 100644
--- a/setup/wizard/lib/services/unixScheduler.php
+++ b/setup/wizard/lib/services/unixScheduler.php
@@ -180,7 +180,8 @@ class unixScheduler extends unixService {
 		// TODO : Write sh on the fly? Not sure the reasoning here
 		$source = $this->getSchedulerSourceLoc();
 		$this->writeSchedulerTask();
-		$logFile = $this->outputDir.DS."scheduler.log";
+//		$logFile = $this->outputDir."scheduler.log";
+		$logFile = "/dev/null";
 		@unlink($logFile);
 		if($source) { // Source
 			$cmd = "nohup ".$source." > ".$logFile." 2>&1 & echo $!";
diff --git a/setup/wizard/resources/css/wizard.css b/setup/wizard/resources/css/wizard.css
index c32b210..233dc55 100644
--- a/setup/wizard/resources/css/wizard.css
+++ b/setup/wizard/resources/css/wizard.css
@@ -509,9 +509,9 @@ td.dir_description {
 }
 
 .demo {
-	left:75px;
+	/*left:75px;
 	position:relative;
-	width:600px
+	width:600px*/
 }
 
 .text_message {
@@ -543,4 +543,9 @@ td.dir_description {
 	position:relative;
 	padding-left: 400px;
 	padding-top: 10px;
+}
+
+#left_space {
+	float:left;
+	width:50%;
 }
\ No newline at end of file
diff --git a/setup/wizard/templates/install.tpl b/setup/wizard/templates/install.tpl
index f25971f..b055deb 100644
--- a/setup/wizard/templates/install.tpl
+++ b/setup/wizard/templates/install.tpl
@@ -2,11 +2,14 @@
 	<p class="title">Finalizing System Installation</p>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<p class="empty_space">	The wizard will now complete the installation and run a final check on your system.	</p>
-		<p class="empty_space">
-			We would greatly appreciate it if you would allow us to collect anonymous usage statistics to help us provide a better quality product. The information includes a unique identification number, number of users you have created, your operating system type and your IP address. Your privacy is protected by the <a href="http://www.knowledgetree.com/about/legal" target="_blank">KnowledgeTree Privacy and Data Protection Agreements.</a>
+		<br/>
+		<p class="empty_space" id="left_space">
+			We would greatly appreciate it if you would allow us to collect anonymous usage statistics to help us provide a better quality product. 
+			<br/><br/>
+			The information includes a unique identification number, number of users you have created, your operating system type and your IP address. Your privacy is protected by the <a href="http://www.knowledgetree.com/about/legal" target="_blank">KnowledgeTree Privacy and Data Protection Agreements.</a>
 		</p>
-		<div class="demo"><?php echo $html->image('greenit.jpg'); ?></div>
-		<br/><br/>
+		<div class="demo"><?php echo $html->image('greenit.jpg', array('style'=>'padding-left: 35px;')); ?></div>
+		<br/><br/><br/><br/>
 <p>		<input class="" type='checkbox' name='call_home' value='enable' checked style="float:left;"/>&nbsp;&nbsp;
 		Help to improve KnowledgeTree by providing anonymous usage statistics</p>
 	</div>
--
libgit2 0.21.4