Index: branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/db_config.tpl
===================================================================
diff -u -r8254 -r8607
--- branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 8254)
+++ branches/unlabeled/unlabeled-1.1.2/core/install/step_templates/db_config.tpl	(.../db_config.tpl)	(revision 8607)
@@ -1,11 +1,11 @@
 <tr class="table-color2">
 	<td class="text"><b>Server Type<span class="error">*</span>:</b></td>
-  	<td align="left"> 
+  	<td align="left">
     	<select name="DBType">
     	<?php
     		$options = Array ('mysql' => 'MySQL', /*'mssql' => 'MS-SQL Server', 'pgsql' => 'pgSQL'*/);
     		$option_tpl = '<option value="%1$s"%2$s>%3$s</option>'."\n";
-    		
+
     		foreach ($options as $option_key => $option_title) {
     			$selected = $option_key == $this->systemConfig['Database']['DBType'] ? ' selected' : '';
     			echo sprintf($option_tpl, $option_key, $selected, $option_title);
@@ -17,35 +17,51 @@
 
 <tr class="table-color2">
 	<td class="text"><b>Hostname<span class="error">*</span>:</b></td>
-	<td align="left"> 
+	<td align="left">
 		<input type="text" name="DBHost" class="text" value="<?php echo $this->systemConfig['Database']['DBHost']; ?>" />
 	</td>
 </tr>
-				            				            				            
+
 <tr class="table-color2">
 	<td class="text"><b>Database Name<span class="error">*</span>:</b></td>
-	<td align="left"> 
+	<td align="left">
 		<input type="text" name="DBName" class="text" value="<?php echo $this->systemConfig['Database']['DBName']; ?>" />
 	</td>
 </tr>
 
 <tr class="table-color2">
-  <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->systemConfig['Database']['DBUser']; ?>" />
-  </td>
-</tr>	
-			            				            				            				            
+	<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";
+				$collations = Array ('utf8_general_ci', 'latin1_swedish_ci');
+				foreach ($collations as $collation) {
+					$selected = ($collation == $this->systemConfig['Database']['DBCollation']) ? ' selected="selected"' : '';
+					echo sprintf($option_tpl, $collation, $selected);
+				}
+			?>
+		</select>
+	</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->systemConfig['Database']['DBUserPassword']; ?>" />
-  </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->systemConfig['Database']['DBUser']; ?>" />
+	</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->systemConfig['Database']['TablePrefix']; ?>" />
-  </td>
+	<td class="text"><b>Database User Password:</b></td>
+	<td align="left">
+		<input type="password" name="DBUserPassword" class="text" value="<?php echo $this->systemConfig['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->systemConfig['Database']['TablePrefix']; ?>" />
+	</td>
 </tr>
\ No newline at end of file