From bf5b6a19b94decac310639a3dda79dc7282a8301 Mon Sep 17 00:00:00 2001
From: ChanMyeong <dece24@gmail.com>
Date: Tue, 9 Oct 2012 05:29:30 +0000
Subject: [PATCH] Issue 2056. DB hostname, port, table prefix items should be
 hidden. Fixed.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11639 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/lang/lang.xml              |  6 ++++-
 modules/install/tpl/form.cubrid.html       | 27 ++++++++++++----------
 modules/install/tpl/form.mssql.html        | 27 ++++++++++++----------
 modules/install/tpl/form.mysql.html        | 27 ++++++++++++----------
 modules/install/tpl/form.mysql_innodb.html | 27 ++++++++++++----------
 modules/install/tpl/form.mysqli.html       | 27 ++++++++++++----------
 6 files changed, 80 insertions(+), 61 deletions(-)

diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml
index 230b21e47..4b99ef49a 100644
--- a/modules/install/lang/lang.xml
+++ b/modules/install/lang/lang.xml
@@ -65,6 +65,10 @@
 		<value xml:lang="ko"><![CDATA[자세히]]></value>
 		<value xml:lang="en"><![CDATA[Details]]></value>
 	</item>
+	<item name="advanced_setup">
+		<value xml:lang="ko"><![CDATA[고급 설정]]></value>
+		<value xml:lang="en"><![CDATA[Advanced Setup]]></value>
+	</item>
 	<item name="install_ftp_reason">
 		<value xml:lang="ko"><![CDATA[FTP 정보를 등록하는 이유.]]></value>
 		<value xml:lang="en"><![CDATA[Reason of FTP info is needed.]]></value>
@@ -488,7 +492,7 @@
 	</item>
 	<item name="db_password">
 		<value xml:lang="ko"><![CDATA[DB 비밀번호]]></value>
-		<value xml:lang="en"><![CDATA[DB Password]]></value>
+		<value xml:lang="en"><![CDATA[DB PW]]></value>
 		<value xml:lang="jp"><![CDATA[パスワード]]></value>
 		<value xml:lang="zh-CN"><![CDATA[DB密码]]></value>
 		<value xml:lang="zh-TW"><![CDATA[密碼]]></value>
diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html
index c8e3a0f56..97cf31135 100644
--- a/modules/install/tpl/form.cubrid.html
+++ b/modules/install/tpl/form.cubrid.html
@@ -11,14 +11,6 @@
 				<input type="hidden" name="act" value="procCubridDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$db_type}</h2>
-				<div class="x_control-group">
-					<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
-					<div class="x_controls"><input name="db_hostname" value="127.0.0.1" type="text" id="dbHostName" required /></div>
-				</div>
-				<div class="x_control-group">
-					<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
-					<div class="x_controls"><input name="db_port" value="33000" type="text" id="dbPort" required /></div>
-				</div>
 				<div class="x_control-group">
 					<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
 					<div class="x_controls"><input name="db_userid" type="text" id="dbId" required /></div>
@@ -31,11 +23,22 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<div class="x_control-group">
-					<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
-					<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<div id="advanced" style="display:none">
+					<div class="x_control-group">
+						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
+						<div class="x_controls"><input name="db_hostname" value="127.0.0.1" type="text" id="dbHostName" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
+						<div class="x_controls"><input name="db_port" value="33000" type="text" id="dbPort" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
+						<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+					</div>
+					<div class="desc">{$lang->db_info_desc}</div>
 				</div>
-				<div class="desc">{$lang->db_info_desc}</div>
 				<div class="ibtnArea">
 					<span class="x_pull-left">
 						<a href="{getUrl('', 'act', 'dispInstallSelectDB')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
diff --git a/modules/install/tpl/form.mssql.html b/modules/install/tpl/form.mssql.html
index fc80f36bc..4ad0f4436 100644
--- a/modules/install/tpl/form.mssql.html
+++ b/modules/install/tpl/form.mssql.html
@@ -11,14 +11,6 @@
 				<input type="hidden" name="act" value="procMssqlDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$db_type}</h2>
-				<div class="x_control-group">
-					<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
-					<div class="x_controls"><input name="db_hostname" value="localhost" type="text" id="dbHostName" required /></div>
-				</div>
-				<div class="x_control-group">
-					<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
-					<div class="x_controls"><input name="db_port" value="3306" type="text" id="dbPort" required /></div>
-				</div>
 				<div class="x_control-group">
 					<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
 					<div class="x_controls"><input name="db_userid" type="text" id="dbId" required /></div>
@@ -31,11 +23,22 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<div class="x_control-group">
-					<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
-					<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<div id="advanced" style="display:none">
+					<div class="x_control-group">
+						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
+						<div class="x_controls"><input name="db_hostname" value="localhost" type="text" id="dbHostName" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
+						<div class="x_controls"><input name="db_port" value="3306" type="text" id="dbPort" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
+						<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+					</div>
+					<div class="desc">{$lang->db_info_desc}</div>
 				</div>
-				<div class="desc">{$lang->db_info_desc}</div>
 				<div class="ibtnArea">
 					<span class="x_pull-left">
 						<a href="{getUrl('', 'act', 'dispInstallSelectDB')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html
index 4e9b91993..050318d56 100644
--- a/modules/install/tpl/form.mysql.html
+++ b/modules/install/tpl/form.mysql.html
@@ -11,14 +11,6 @@
 				<input type="hidden" name="act" value="procMysqlDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$db_type}</h2>
-				<div class="x_control-group">
-					<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
-					<div class="x_controls"><input name="db_hostname" value="localhost" type="text" id="dbHostName" required /></div>
-				</div>
-				<div class="x_control-group">
-					<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
-					<div class="x_controls"><input name="db_port" value="3306" type="text" id="dbPort" required /></div>
-				</div>
 				<div class="x_control-group">
 					<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
 					<div class="x_controls"><input name="db_userid" type="text" id="dbId" required /></div>
@@ -31,11 +23,22 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<div class="x_control-group">
-					<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
-					<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<div id="advanced" style="display:none">
+					<div class="x_control-group">
+						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
+						<div class="x_controls"><input name="db_hostname" value="localhost" type="text" id="dbHostName" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
+						<div class="x_controls"><input name="db_port" value="3306" type="text" id="dbPort" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
+						<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+					</div>
+					<div class="desc">{$lang->db_info_desc}</div>
 				</div>
-				<div class="desc">{$lang->db_info_desc}</div>
 				<div class="ibtnArea">
 					<span class="x_pull-left">
 						<a href="{getUrl('', 'act', 'dispInstallSelectDB')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
diff --git a/modules/install/tpl/form.mysql_innodb.html b/modules/install/tpl/form.mysql_innodb.html
index 4e9b91993..050318d56 100644
--- a/modules/install/tpl/form.mysql_innodb.html
+++ b/modules/install/tpl/form.mysql_innodb.html
@@ -11,14 +11,6 @@
 				<input type="hidden" name="act" value="procMysqlDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$db_type}</h2>
-				<div class="x_control-group">
-					<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
-					<div class="x_controls"><input name="db_hostname" value="localhost" type="text" id="dbHostName" required /></div>
-				</div>
-				<div class="x_control-group">
-					<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
-					<div class="x_controls"><input name="db_port" value="3306" type="text" id="dbPort" required /></div>
-				</div>
 				<div class="x_control-group">
 					<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
 					<div class="x_controls"><input name="db_userid" type="text" id="dbId" required /></div>
@@ -31,11 +23,22 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<div class="x_control-group">
-					<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
-					<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<div id="advanced" style="display:none">
+					<div class="x_control-group">
+						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
+						<div class="x_controls"><input name="db_hostname" value="localhost" type="text" id="dbHostName" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
+						<div class="x_controls"><input name="db_port" value="3306" type="text" id="dbPort" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
+						<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+					</div>
+					<div class="desc">{$lang->db_info_desc}</div>
 				</div>
-				<div class="desc">{$lang->db_info_desc}</div>
 				<div class="ibtnArea">
 					<span class="x_pull-left">
 						<a href="{getUrl('', 'act', 'dispInstallSelectDB')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>
diff --git a/modules/install/tpl/form.mysqli.html b/modules/install/tpl/form.mysqli.html
index 4e9b91993..050318d56 100644
--- a/modules/install/tpl/form.mysqli.html
+++ b/modules/install/tpl/form.mysqli.html
@@ -11,14 +11,6 @@
 				<input type="hidden" name="act" value="procMysqlDBSetting" />
 				<input type="hidden" name="db_type" value="{$db_type}" />
 				<h2>{$db_type}</h2>
-				<div class="x_control-group">
-					<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
-					<div class="x_controls"><input name="db_hostname" value="localhost" type="text" id="dbHostName" required /></div>
-				</div>
-				<div class="x_control-group">
-					<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
-					<div class="x_controls"><input name="db_port" value="3306" type="text" id="dbPort" required /></div>
-				</div>
 				<div class="x_control-group">
 					<label for="dbId" class="x_control-label">{$lang->db_userid}</label>
 					<div class="x_controls"><input name="db_userid" type="text" id="dbId" required /></div>
@@ -31,11 +23,22 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<div class="x_control-group">
-					<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
-					<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<div id="advanced" style="display:none">
+					<div class="x_control-group">
+						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>
+						<div class="x_controls"><input name="db_hostname" value="localhost" type="text" id="dbHostName" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPort" class="x_control-label">{$lang->db_port}</label>
+						<div class="x_controls"><input name="db_port" value="3306" type="text" id="dbPort" required /></div>
+					</div>
+					<div class="x_control-group">
+						<label for="dbPrefix" class="x_control-label">{$lang->db_table_prefix}</label>
+						<div class="x_controls"><input name="db_table_prefix" type="text" id="dbPrefix" value="xe" required /></div>
+					</div>
+					<div class="desc">{$lang->db_info_desc}</div>
 				</div>
-				<div class="desc">{$lang->db_info_desc}</div>
 				<div class="ibtnArea">
 					<span class="x_pull-left">
 						<a href="{getUrl('', 'act', 'dispInstallSelectDB')}" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</a>