From a2fa8d3019aba8a7e5eaee90ddf288ffc76bd663 Mon Sep 17 00:00:00 2001
From: Paul Arthur <paul.arthur@flowerysong.com>
Date: Mon, 13 May 2013 19:25:04 -0400
Subject: More cleanup of install, add DB port option

---
 templates/show_install.inc.php        | 20 ++++++++++++--------
 templates/show_install_config.inc.php |  4 ++++
 2 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'templates')

diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php
index dcbae665..bea5d0a6 100644
--- a/templates/show_install.inc.php
+++ b/templates/show_install.inc.php
@@ -36,31 +36,35 @@ require $prefix . '/templates/install_header.inc.php';
         <form method="post" action="<?php echo $web_path . "/install.php?action=create_db&amp;htmllang=$htmllang&amp;charset=$charset"; ?>" enctype="multipart/form-data" >
 <table>
 <tr>
-    <td class="align"><?php echo T_("Desired Database Name"); ?></td>
+    <td class="align"><?php echo T_('Desired Database Name'); ?></td>
     <td><input type="text" name="local_db" value="ampache" /></td>
 </tr>
 <tr>
-    <td class="align"><?php echo T_("MySQL Hostname"); ?></td>
+    <td class="align"><?php echo T_('MySQL Hostname'); ?></td>
     <td><input type="text" name="local_host" value="localhost" /></td>
 </tr>
 <tr>
-    <td class="align"><?php echo T_("MySQL Administrative Username"); ?></td>
+    <td class="align"><?php echo T_('MySQL port (optional)'); ?></td>
+    <td><input type="text" name="local_port" /></td>
+</tr>
+<tr>
+    <td class="align"><?php echo T_('MySQL Administrative Username'); ?></td>
     <td><input type="text" name="local_username" value="root" /></td>
 </tr>
 <tr>
-    <td class="align"><?php echo T_("MySQL Administrative Password"); ?></td>
+    <td class="align"><?php echo T_('MySQL Administrative Password'); ?></td>
     <td><input type="password" name="local_pass" /></td>
 </tr>
 <tr>
-    <td class="align"><?php echo T_("Create Database User for New Database"); ?>? </td>
+    <td class="align"><?php echo T_('Create Database User for New Database?'); ?></td>
     <td><input type="checkbox" value="create_db_user" name="db_user" onclick="flipField('db_username');flipField('db_password');" /></td>
 </tr>
 <tr>
-    <td class="align"><?php echo T_("Ampache Database Username"); ?></td>
+    <td class="align"><?php echo T_('Ampache Database Username'); ?></td>
     <td><input type="text" id="db_username" name="db_username" value="ampache" /></td>
 </tr>
 <tr>
-    <td class="align"><?php echo T_("Ampache Database User Password"); ?></td>
+    <td class="align"><?php echo T_('Ampache Database User Password'); ?></td>
     <td><input type="password" id="db_password" name="db_password" value="" /></td>
 </tr>
 <tr>
@@ -73,7 +77,7 @@ require $prefix . '/templates/install_header.inc.php';
 </tr>
 <tr>
     <td>&nbsp;</td>
-    <td><input type="submit" value="<?php echo T_("Insert Database"); ?>" /></td>
+    <td><input type="submit" value="<?php echo T_('Insert Database'); ?>" /></td>
 </tr>
 </table>
 </form>
diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php
index ced21e38..2df35ee9 100644
--- a/templates/show_install_config.inc.php
+++ b/templates/show_install_config.inc.php
@@ -51,6 +51,10 @@ require $prefix . '/templates/install_header.inc.php';
     <td class="align"><?php echo T_('MySQL Hostname'); ?></td>
     <td class="align"><input type="text" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td>
 </tr>
+<tr>
+    <td class="align"><?php echo T_('MySQL port (optional)'); ?></td>
+    <td><input type="text" name="local_port" value="<?php echo scrub_out($_REQUEST['local_port']);?>" /></td>
+</tr>
 <tr>
     <td class="align"><?php echo T_('MySQL Username'); ?></td>
     <td class="align"><input type="text" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td>
-- 
cgit