From b1de42894b6027d7e83e820a23bc5be5b00030e2 Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Thu, 5 Nov 2009 10:02:50 +0200
Subject: [PATCH] Story Id:1627025 Updated services templating

---
 setup/wizard/templates/complete.tpl | 20 ++++++++++++++++----
 setup/wizard/templates/services.tpl |  4 ++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/setup/wizard/templates/complete.tpl b/setup/wizard/templates/complete.tpl
index e108075..7cd99d1 100644
--- a/setup/wizard/templates/complete.tpl
+++ b/setup/wizard/templates/complete.tpl
@@ -16,10 +16,22 @@
 	
 	<?php if(!$servicesValidation) { ?>
 		<h3>Services</h3>
-		Run the dmsctl.sh script in KnowledgeTree source root from a terminal.<br/>
-		<i>cd KnowledgeTree_Installation_Folder<br/>
-		./dmsctl.sh start
-		</i>
+		The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation.
+		<?php if(WINDOWS_OS) { ?>
+		To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal.<br/><br/>
+		<?php } else { ?>
+		To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.<br/><br/>
+		<?php } ?>
+		<p class="disclaimer">
+		<?php if(WINDOWS_OS) { ?>
+		cd KnowledgeTree_Installation_Folder<br/>
+		dmsctl.bat start
+		<?php } else { ?>
+		cd /usr/share/knowledgetree-ce<br/>
+		sudo ./dmsctl.sh start
+		<?php } ?>
+		</p>
+		
 		<br/>
 	<?php } ?>
 	<!--	Paths and Permissions	-->
diff --git a/setup/wizard/templates/services.tpl b/setup/wizard/templates/services.tpl
index a3bd613..03d7e68 100644
--- a/setup/wizard/templates/services.tpl
+++ b/setup/wizard/templates/services.tpl
@@ -41,7 +41,7 @@
 <!--Content-->
 	<div id="step_content_configuration" class="step">
 		<?php if(!$alreadyInstalled) { ?>
-			<?php if($validation) { ?>
+			<?php if($servicesValidation) { ?>
 				<?php if($javaExeError) { ?>
 					Specify the location of your Java executable
 					&nbsp;&nbsp;&nbsp;
@@ -171,7 +171,7 @@
 			All services are already installed.
 <!--			</p>-->
 		<?php } ?>
-		<?php if($validation) { ?>
+		<?php if($servicesValidation) { ?>
 		<h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
 		<?php if($silent) { ?>
 			<?php if($serviceCheck != 'tick') {
--
libgit2 0.21.4