From 03554f38ab5d1213794d46784c368a12d96b82a4 Mon Sep 17 00:00:00 2001
From: flyskyko <sinsy200@gmail.com>
Date: Thu, 27 Sep 2012 02:28:37 +0000
Subject: [PATCH] Issue 2376:	Admin UI Refactoring - Settings - File Upload

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11538 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/file/lang/lang.xml        |  2 +-
 modules/file/tpl/adminConfig.html | 96 ++++++++++++++++++-------------
 modules/file/tpl/js/fileConfig.js |  9 ---
 3 files changed, 56 insertions(+), 51 deletions(-)
 delete mode 100644 modules/file/tpl/js/fileConfig.js

diff --git a/modules/file/lang/lang.xml b/modules/file/lang/lang.xml
index 664798cc6..8f3c6ec0a 100644
--- a/modules/file/lang/lang.xml
+++ b/modules/file/lang/lang.xml
@@ -99,7 +99,7 @@
 		<value xml:lang="vi"><![CDATA[Danh sách đính kèm]]></value>
 	</item>
 	<item name="allow_outlink">
-		<value xml:lang="ko"><![CDATA[다른 사이트에서 첨부파일 링크하는 것을 허용할까요?]]></value>
+		<value xml:lang="ko"><![CDATA[파일 외부 링크]]></value>
 		<value xml:lang="en"><![CDATA[Allow External Link?]]></value>
 		<value xml:lang="jp"><![CDATA[外部からのファイルリンク]]></value>
 		<value xml:lang="zh-CN"><![CDATA[防盗链]]></value>
diff --git a/modules/file/tpl/adminConfig.html b/modules/file/tpl/adminConfig.html
index f1e07ac0a..b795cc89b 100644
--- a/modules/file/tpl/adminConfig.html
+++ b/modules/file/tpl/adminConfig.html
@@ -1,46 +1,60 @@
-<load target="js/fileConfig.js" type="body" usecdn="true" />
-<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+<div class="x_page-header">
+	<h1>File Upload</h1>
+</div>
+
+<div cond="$XE_VALIDATOR_MESSAGE" class="x_alert x_alert-{$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-<form ruleset="insertConfig" action="./" method="post" class="form">
+
+<form ruleset="insertConfig" action="./" method="post" class="x_form-horizontal section">
 	<input type="hidden" name="module" value="file" />
 	<input type="hidden" name="act" value="procFileAdminInsertConfig" />
-	<h1 class="h1">File Upload</h1>
-	<ul>
-		<li>
-			<p class="q"><label>{$lang->allow_outlink}</label></p>
-			<p class="a">
-				<input type="radio" name="allow_outlink" value="Y" id="allow_outlink_y" checked="checked"|cond="$config->allow_outlink == 'Y'" /> <label for="allow_outlink_y">{$lang->cmd_yes}</label>
-				<input type="radio" name="allow_outlink" value="N" id="allow_outlink_n" checked="checked"|cond="$config->allow_outlink == 'N'" /> <label for="allow_outlink_n">{$lang->cmd_no}</label>
-			</p>
-		</li>
-		<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
-			<p class="q"><label for="allow_outlink_format">{$lang->allow_outlink_format}</label></p>
-			<p class="a"><input type="text" name="allow_outlink_format" id="allow_outlink_format" value="{$config->allow_outlink_format}" /></p>
-			<p class="desc">{$lang->about_allow_outlink_format}</p>
-			
-		</li>
-		<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
-			<p class="q"><label for="allow_outlink_site">{$lang->allow_outlink_site}</label></p>
-			<p class="a"><textarea name="allow_outlink_site" id="allow_outlink_site" rows="8" cols="42">{$config->allow_outlink_site}</textarea></p>
-			<p class="desc">{$lang->about_allow_outlink_site}</p>
-			
-		</li>
-		<li>
-			<p class="q"><label for="filesize">{$lang->about_allowed_filesize}</label></p>
-			<p class="a"><input id="filesize" type="text" name="allowed_filesize" value="{$config->allowed_filesize}" style="width:40px" /> MB</p>
-		</li>
-		<li>
-			<p class="q"><label for="attachSize">{$lang->about_allowed_attach_size}</label></p>
-			<p class="a"><input id="attachSize" type="text" name="allowed_attach_size" value="{$config->allowed_attach_size}" style="width:40px" /> MB</p>
-		</li>
-		<li>
-			<p class="q"><label for="allowedFiletypes">{$lang->allowed_filetypes}</label></p>
-			<p class="a"><input id="allowedFiletypes" type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" /></p>
-			<p class="desc">{$lang->about_allowed_filetypes}</p>
-		</li>
-	</ul>
-	<div class="btnArea">
-		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+	<div class="x_control-group">
+		<label class="x_control-label">{$lang->allow_outlink}</label>
+		<div class="x_controls">
+			<label class="x_inline"><input type="radio" name="allow_outlink" id="allow_outlink_y" value="Y" checked="checked"|cond="$config->allow_outlink == 'Y'" /> {$lang->cmd_yes}</label>
+			<label class="x_inline"><input type="radio" name="allow_outlink" value="N" checked="checked"|cond="$config->allow_outlink == 'N'" /> {$lang->cmd_no}</label>
+			<span class="x_help-block">{$lang->about_allow_outlink}</span>
+		</div>
 	</div>
-</form>
\ No newline at end of file
+	<div class="x_control-group">
+		<label class="x_control-label" for="allow_outlink_format">{$lang->allow_outlink_format}</label>
+		<div class="x_controls">
+			<input type="text" name="allow_outlink_format" id="allow_outlink_format" value="{$config->allow_outlink_format}" />
+			<span class="x_help-block">{$lang->about_allow_outlink_format}</span>
+		</div>
+	</div>
+	<div class="x_control-group">
+		<label class="x_control-label" for="allow_outlink_site">{$lang->allow_outlink_site}</label>
+		<div class="x_controls">
+			<textarea name="allow_outlink_site" id="allow_outlink_site" rows="8" cols="42">{$config->allow_outlink_site}</textarea>
+			<span class="x_help-block">{$lang->about_allow_outlink_site}</span>
+		</div>
+	</div>
+	<div class="x_control-group">
+		<label for="filesize" class="x_control-label">{$lang->allowed_filesize}</label>
+		<div class="x_controls">
+			<input id="filesize" type="text" name="allowed_filesize" value="{$config->allowed_filesize}" style="width:40px" /> MB / {ini_get('upload_max_filesize')}
+			<span class="x_help-block">{$lang->about_allowed_filesize}</span>
+		</div>
+	</div>
+	<div class="x_control-group">
+		<label for="attachSize" class="x_control-label">{$lang->allowed_attach_size}</label>
+		<div class="x_controls">
+			<input id="attachSize" type="text" name="allowed_attach_size" value="{$config->allowed_attach_size}" style="width:40px" /> MB
+			<span class="x_help-block">{$lang->about_allowed_attach_size}</span>
+		</div>
+	</div>
+	<div class="x_control-group">
+		<label for="allowedFiletypes" class="x_control-label">{$lang->allowed_filetypes}</label>
+		<div class="x_controls">
+			<input id="allowedFiletypes" type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" />
+			<span class="x_help-block">{$lang->about_allowed_filetypes}</span>
+		</div>
+	</div>
+	<div class="x_clearfix btnArea">
+		<div class="x_pull-right">
+			<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
+		</div>
+	</div>
+</form>
diff --git a/modules/file/tpl/js/fileConfig.js b/modules/file/tpl/js/fileConfig.js
deleted file mode 100644
index 950c671e8..000000000
--- a/modules/file/tpl/js/fileConfig.js
+++ /dev/null
@@ -1,9 +0,0 @@
-(function($){
-	$('input[name=allow_outlink]').click(function(){
-		if($(this).val() == 'Y'){
-			$('._outLink').show();
-		}else{
-			$('._outLink').hide();
-		}
-	});
- }(jQuery))