Index: branches/5.0.x/core/install/step_templates/db_config.tpl
===================================================================
diff -u -r12117 -r12204
--- branches/5.0.x/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 12117)
+++ branches/5.0.x/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 12204)
@@ -1,5 +1,5 @@
 <tr class="table-color2">
-	<td class="text"><b>Server Type<span class="error">*</span>:</b></td>
+	<td class="text"><b>Database Server Type <span class="error">*</span>:</b></td>
   	<td align="left">
     	<select name="DBType">
     	<?php
@@ -16,22 +16,36 @@
 </tr>
 
 <tr class="table-color2">
-	<td class="text"><b>Hostname<span class="error">*</span>:</b></td>
+	<td class="text"><b>Database Hostname <span class="error">*</span>:</b></td>
 	<td align="left">
 		<input type="text" name="DBHost" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBHost'); ?>" />
 	</td>
 </tr>
 
 <tr class="table-color2">
-	<td class="text"><b>Database Name<span class="error">*</span>:</b></td>
+	<td class="text"><b>Database Name <span class="error">*</span>:</b></td>
 	<td align="left">
 		<input type="text" name="DBName" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBName'); ?>" />
 	</td>
 </tr>
 
 <tr class="table-color2">
-	<td class="text"><b>Database Collation<span class="error">*</span>:</b></td>
+	<td class="text"><b>Database User Name <span class="error">*</span>:</b></td>
 	<td align="left">
+		<input type="text" name="DBUser" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBUser'); ?>" />
+	</td>
+</tr>
+
+<tr class="table-color2">
+	<td class="text"><b>Database User Password:</b></td>
+	<td align="left">
+		<input type="password" name="DBUserPassword" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBUserPassword'); ?>" />
+	</td>
+</tr>
+
+<tr class="table-color2">
+	<td class="text"><b>Database Collation <span class="error">*</span>:</b></td>
+	<td align="left">
 		<select name="DBCollation" class="text">
 			<?php
 				$option_tpl = '<option value="%1$s"%2$s>%1$s</option>'."\n";
@@ -46,28 +60,14 @@
 </tr>
 
 <tr class="table-color2">
-	<td class="text"><b>Database User Name<span class="error">*</span>:</b></td>
+	<td class="text"><b>Prefix for Table Names:</b></td>
 	<td align="left">
-		<input type="text" name="DBUser" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBUser'); ?>" />
-	</td>
-</tr>
-
-<tr class="table-color2">
-	<td class="text"><b>Database User Password:</b></td>
-	<td align="left">
-		<input type="password" name="DBUserPassword" class="text" value="<?php echo $this->toolkit->getSystemConfig('Database', 'DBUserPassword'); ?>" />
-	</td>
-</tr>
-
-<tr class="table-color2">
-	<td class="text"><b>Table Name Prefix:</b></td>
-	<td align="left">
 		<input type="text" name="TablePrefix" class="text" maxlength="7" value="<?php echo $this->toolkit->getSystemConfig('Database', 'TablePrefix'); ?>" />
 	</td>
 </tr>
 
 <tr class="table-color2">
-	<td class="text"><b>Use existing installation:</b></td>
+	<td class="text" width="55%"><b>Use existing In-Portal installation in this Database:</b></td>
 	<td align="left">
 		<input type="radio" name="UseExistingSetup" id="UseExistingSetup_1" value="1"/> <label for="UseExistingSetup_1">Yes</label> <input type="radio" name="UseExistingSetup" id="UseExistingSetup_0" value="0" checked/> <label for="UseExistingSetup_0">No</label>
 	</td>