From 3af8a957d72e0ca7f128dc87d10d5cbb53cccc8a Mon Sep 17 00:00:00 2001
From: ChanMyeong <dece24@gmail.com>
Date: Tue, 9 Oct 2012 07:31:25 +0000
Subject: [PATCH] Issue 2048 fixed. Installation > rewrite_mode option UI
 refactoring. Not removed.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11641 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/lang/lang.xml        |  4 +--
 modules/install/tpl/config_form.html | 42 +++++++++++-----------------
 modules/install/tpl/css/install.css  |  6 +++-
 modules/install/tpl/select_db.html   |  1 -
 4 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml
index 4b99ef49a..20017154f 100644
--- a/modules/install/lang/lang.xml
+++ b/modules/install/lang/lang.xml
@@ -613,8 +613,8 @@
 		<value xml:lang="vi"><![CDATA[SSO]]></value>
 	</item>
 	<item name="about_rewrite">
-		<value xml:lang="ko"><![CDATA[이 기능을 사용하면 <em>http://yourdomain/<strong>?document_srl=123</strong></em> 과 같이 복잡한 주소를 <em>http://yourdomain/<strong>123</strong></em> 과 같이 간단하게 줄일 수 있습니다. 이 기능을 사용하려면 웹 서버에서 rewrite_mod를 지원해야 합니다. 웹 서버에서 rewrite_mod를 지원하는지 여부는 서버 관리자에게 문의하세요.]]></value>
-		<value xml:lang="en"><![CDATA[If web server provides rewrite mod, long URL such as http://blah/?document_srl=123 can be shortened like http://blah/123]]></value>
+		<value xml:lang="ko"><![CDATA[이 기능을 사용하면 <em>http://yourdomain/</em><strong>?document_srl=123</strong> 과 같이 복잡한 주소를 <em>http://yourdomain/</em><strong>123</strong> 과 같이 간단하게 줄일 수 있습니다. 웹 서버에서 <strong>rewrite_mod</strong>를 지원해야 합니다. 지원 여부는 서버 관리자에게 문의하세요.]]></value>
+		<value xml:lang="en"><![CDATA[If web server provides rewrite mod, long URL such as <em>http://blah/</em><strong>?document_srl=123</strong> can be shortened like <em>http://blah/</em><strong>123</strong>]]></value>
 		<value xml:lang="jp"><![CDATA[Webサーバで「リライト・モジュール（mod_rewrite）」をサポートしている場合は、「http://アドレス/?document_srl=123」のようなアドレスを、動的だけど「http://アドレス/123」のように静的なページに見せることができます。]]></value>
 		<value xml:lang="zh-CN"><![CDATA[如服务器支持rewrite模块且选择此项，可以简化复杂的网址。<br />例如，http://域名/?document_srl=123简化为http://域名/123。]]></value>
 		<value xml:lang="zh-TW"><![CDATA[如果支援 rewrite 功能，可縮短冗長的網址。<br />例>『http://域名/?document_srl=123』縮短成『http://域名/123』。]]></value>
diff --git a/modules/install/tpl/config_form.html b/modules/install/tpl/config_form.html
index cc86db5f2..944b1678d 100644
--- a/modules/install/tpl/config_form.html
+++ b/modules/install/tpl/config_form.html
@@ -8,33 +8,23 @@
 			</div>
 			<form action="./" method="post">
 				<input type="hidden" name="act" value="procConfigSetting" />
-				<ul class="form formXe">
-					<li>
-						<input name="use_rewrite" value="Y" <!--@if(function_exists('apache_get_modules')&&in_array('mod_rewrite',apache_get_modules()))-->checked="checked"<!--@end--> type="checkbox" class="iCheck" id="rewrite" /> <label for="rewrite">{$lang->use_rewrite}</label>
-						<p>{$lang->about_rewrite}</p>
-					</li>
-					<li>
-						<div class="select open" style="width:540px;">
-							<span class="ctrl"><span class="arrow"></span></span>
-							<div class="myValue"></div>
-							<div class="iList">
-								<ul>
-									<!--@foreach($time_zone as $key => $val)-->
-									<li><input name="time_zone" id="{$key}" class="option" type="radio" value="{$key}" <!--@if($key==date('O'))-->checked="checked"<!--@end--> /><label for="{$key}">{$val}</label></li>
-									<!--@end-->
-								</ul>
-							</div>
-						</div>
-						<p>{$lang->about_time_zone}</p>
-					</li>
-				</ul>
+				<div class="x_control-group">
+					<label for="rewrite"><input name="use_rewrite" value="Y" checked="checked"|cond="function_exists('apache_get_modules')&&in_array('mod_rewrite',apache_get_modules())" type="checkbox" id="rewrite" /> {$lang->use_rewrite}</label>
+					<p>{$lang->about_rewrite}</p>
+				</div>
+				<div class="x_control-group">
+					<select name="time_zone" style="width:100%">
+						<option loop="$time_zone => $key,$val" id="{$key}" value="{$key}" selected="selected"|cond="$key==date('O')">{$val}</option>
+					</select>
+					<p>{$lang->about_time_zone}</p>
+				</div>
 				<div class="ibtnArea">
-					<div class="fLeft">
-						<span class="ibtn icon"><span class="back"></span> <a href="#" onclick="document.backForm.submit();">{$lang->cmd_back}</a></span>
-					</div>
-					<div class="fRight">
-						<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
-					</div>
+					<span class="x_pull-left">
+						<button type="button" onclick="document.backForm.submit()" class="x_btn x_btn-small x_btn-inverse"><i class="x_icon-chevron-left x_icon-white"></i> {$lang->cmd_back}</button>
+					</span>
+					<span class="x_pull-right">
+						<button type="submit" class="x_btn x_btn-small x_btn-inverse" id="task-settings">{$lang->cmd_next} <i class="x_icon-chevron-right x_icon-white"></i></button>
+					</span>
 				</div>
 			</form>
 			<form name="backForm" method="post" action="./">
diff --git a/modules/install/tpl/css/install.css b/modules/install/tpl/css/install.css
index c73b3f8d3..53e69fb68 100644
--- a/modules/install/tpl/css/install.css
+++ b/modules/install/tpl/css/install.css
@@ -7,17 +7,21 @@ body{background:#3EAF0E -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ccc), to(
 img, fieldset {border:0}
 form, fieldset {margin:0;padding:0}
 em{color:#ffc;font-weight:normal;font-style:normal}
+strong{color:#f60}
 button{margin:0;padding:0;overflow:visible;cursor:pointer}
 a {text-decoration:none}
 a:hover, a:active, a:focus {text-decoration:underline}
 /* Bootstrap Override */
 .x label[for],
-.x .x_form-horizontal .x_control-label{font-weight: bold}
+.x .x_form-horizontal .x_control-label{font-weight:bold}
 .x ol,
 .x ul{margin-top:15px;margin-bottom:15px}
 .x input[type="radio"], 
 .x input[type="checkbox"]{margin:0}
 .x hr{border-bottom:0}
+.x .x_control-group{padding-top: 8px;margin-bottom: 10px;border-top: 1px dotted #888;clear: both}
+.x .x_control-group:first-child, 
+.x .x_control-group:first-of-type{border-top: 0;padding-top: 0}
 /* Layout */
 #xei{width:800px;margin:0 auto;padding:120px 0 0 0}
 #xei #header{position:relative;background:#444;margin:0 0 1px 0;padding:10px 20px;color:#fff;border-radius:5px 5px 0 0}
diff --git a/modules/install/tpl/select_db.html b/modules/install/tpl/select_db.html
index 4d114c426..ef55dc6c8 100644
--- a/modules/install/tpl/select_db.html
+++ b/modules/install/tpl/select_db.html
@@ -10,7 +10,6 @@
 					<label for="db_type_{$val->db_type}"><input name="db_type" type="radio" value="{$val->db_type}" disabled="disabled"|cond="!$val->enable" id="db_type_{$val->db_type}" checked="checked"|cond="$val->db_type=='mysqli'" /> {$val->db_type}</label>
 					<p>{$lang->db_desc[$val->db_type]}</p>
 				</div>
-				<hr>
 				<div class="x_control-group x_muted" loop="DB::getDisableList() => $key,$val">
 					<label for="db_type_{$val->db_type}"><input name="db_type" type="radio" value="{$val->db_type}" disabled="disabled"|cond="!$val->enable" id="db_type_{$val->db_type}" checked="checked"|cond="$val->db_type=='mysqli'" /> {$val->db_type}<em>({$lang->can_use_when_installed})</em></label>
 					<p>{$lang->db_desc[$val->db_type]}</p>