spamfilter UI cleaning.

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11943 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/admin/tpl/js/admin.js

@@ -248,13 +248,12 @@ jQuery(function($){
 	$('label:not([for])').labelMaker();
 // :radio, :checkbox checked class
 	$.fn.checkToggle = function(){
-		this.change(function(){
+		function check(){
-			var $this = $(this);
+			$(':checked').parent('label').addClass('checked');
-			if($this.is(':checked')){
+			$(':not(":checked")').parent('label').removeClass('checked');
-				$this.parent('label').addClass('checked');
+		}
-			}
+		this.change(check);
-			$(':radio, :checkbox').not(':checked').parent('label').removeClass('checked');
+		check();
-		});
 	};
 	$(':radio, :checkbox').checkToggle();
 // File input .overlap style

modules/spamfilter/lang/lang.xml

@@ -151,7 +151,7 @@ les articles en plus seront reconnus comme polluriel, et l'adresse IP sera bloqu
  bài viết của bạn sẽ bị ghi vào danh sách và IP của bạn sẽ bị lưu vào danh sách IP bị cấm.]]></value>
 	</item>
 	<item name="about_denied_ip">
-		<value xml:lang="ko"><![CDATA['<em>스팸 IP // 메모</em>' 형식으로 입력하세요. 여러개의 항목은 줄을 바꾸어 입력하세요.]]></value>
+		<value xml:lang="ko"><![CDATA['스팸 IP // 메모' 형식으로 입력하세요. 여러개의 항목은 줄을 바꾸어 입력하세요.]]></value>
 		<value xml:lang="en"><![CDATA[You can add IP address range like 127.0.0.* by using *.]]></value>
 		<value xml:lang="jp"><![CDATA[「127.0.0.* 」のように「*」で、「127.0.0」以下のIP帯域をすべて禁止することができます。]]></value>
 		<value xml:lang="zh-CN"><![CDATA[禁止IP可以使用通配符。(如：如 "127.0.*.*"）]]></value>

modules/spamfilter/tpl/config_block.html

@@ -10,32 +10,34 @@
 		<input type="hidden" name="module" value="spamfilter" />
 		<input type="hidden" name="ruleset" value="insertConfig" />
 		<div class="x_control-group">
-			<label class="x_control-label" for="inputEmail2">{$lang->cmd_interval}</label>
+			<p><strong>{$lang->cmd_interval}</strong></p>
 			<label for="spamCond1_yes" class="x_inline">
-			<input type="radio" name="limits" id="spamCond1_yes" value="Y" <!--@if($config->limits=='Y' || $config->limits =='')-->checked="checked"<!--@end--> />
+				<input type="radio" name="limits" id="spamCond1_yes" value="Y" checked="checked"|cond="$config->limits=='Y' || $config->limits ==''" />
-			{$lang->cmd_yes}</label>
+				{$lang->cmd_yes}
-			<label for="spamCond1_no" class="x_inline">
+			</label>
-				<input type="radio" name="limits" id="spamCond1_no" value="N" <!--@if($config->limits!='Y' && $config->limits !='')--> checked="checked"<!--@end--> /> {$lang->cmd_no}
+			<label for="spamCond1_no" class="x_inline">
+				<input type="radio" name="limits" id="spamCond1_no" value="N" checked="checked"|cond="$config->limits!='Y' && $config->limits !=''" /> 
+				{$lang->cmd_no}
 			</label>
-				
 		</div>
 		<div class="x_control-group">
-			<label class="x_control-label" for="inputEmail2">{$lang->cmd_check_trackback}</label>
+			<p><strong>{$lang->cmd_check_trackback}</strong></p>
 			<label for="spamCond2_yes" class="x_inline">
-				<input type="radio" name="check_trackback" id="spamCond2_yes" value="Y" <!--@if($config->check_trackback=='Y' || $config->check_trackback=='')--> checked="checked"<!--@end--> />{$lang->cmd_yes}
+				<input type="radio" name="check_trackback" id="spamCond2_yes" value="Y" checked="checked"|cond="$config->check_trackback=='Y' || $config->check_trackback==''" />
+				{$lang->cmd_yes}
 			</label>
-			<label for="spamCond2_yes" class="x_inline">
+			<label for="spamCond2_no" class="x_inline">
-				<input type="radio" name="check_trackback" id="spamCond2_yes" value="N" <!--@if($config->check_trackback!='Y' &&  $config->check_trackback!='')--> checked="checked"<!--@end--> / > {$lang->cmd_no}
+				<input type="radio" name="check_trackback" id="spamCond2_no" value="N" checked="checked"|cond="$config->check_trackback!='Y' &&  $config->check_trackback!=''" / > 
+				{$lang->cmd_no}
 			</label>
 		</div>
 		<div class="x_clearfix btnArea">
 			<div class="x_pull-right">
-				<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
+				<button type="submit" class="x_btn x_btn-large x_btn-primary">{$lang->cmd_save}</button>
 			</div>
 		</div>
 	</form>
 </section>
-
 <include target="./footer.html" />
 
 

modules/spamfilter/tpl/denied_ip_list.html

@@ -9,10 +9,10 @@
 		<caption><strong>{$lang->cmd_denied_ip}</strong></caption>
 		<thead>
 			<tr>
-				<th style="width:160px">IP</th>
+				<th scope="col">IP</th>
-				<th>{$lang->description}</th>
+				<th scope="col">{$lang->description}</th>
-				<th style="width:100px">{$lang->regdate}</th>
+				<th scope="col">{$lang->regdate}</th>
-				<th style="width:50px">{$lang->cmd_delete}</th>
+				<th scope="col">{$lang->cmd_delete}</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -22,22 +22,20 @@
 				<td>{zdate($ip_info->regdate,'Y-m-d')}</td>
 				<td><a href="#" onclick="doDeleteDeniedIP('{$ip_info->ipaddress}')">{$lang->cmd_delete}</a></td>
 			</tr>
+			<tr cond="!$ip_list">
+				<td colspan="4" style="text-align:center">{$lang->no_data}</td>
+			</tr>
 		</tbody>
 	</table>
-	<form action="./" class="x_form-horizontal">
+	<form action="./" style="margin-right:14px">
 		<input type="hidden" name="act" value="procSpamfilterAdminInsertDeniedIP" />
 		<input type="hidden" name="module" value="spamfilter" />
 		<input type="hidden" name="ruleset" value="insertDeniedIp" />
 		<input type="hidden" name="active" value="ip" />
-		<div class="x_control-group">
+		<textarea name="ipaddress_list" title="{$lang->add_denied_ip}: {$lang->about_denied_ip}" rows="4" cols="42" style="width:100%" placeholder="{$lang->about_denied_ip}"></textarea>
-			<textarea name="ipaddress_list" title="{$lang->add_denied_ip}"></textarea>
+		<span class="x_pull-right" style="margin-right:-14px">
-			<span class="x_muted">{$lang->about_denied_ip}</span>
+			<button type="submit" class="x_btn x_btn-primary">{$lang->add_denied_ip}</button>
-		</div>
+		</span>
-		<div class="x_clearfix btnArea">
-			<div class="x_pull-left">
-				<button type="submit" class="x_btn x_btn-primary">{$lang->add}</button>
-			</div>
-		</div>
 	</form>
 </section>
 <include target="./footer.html" />

modules/spamfilter/tpl/denied_word_list.html

@@ -9,37 +9,35 @@
 		<caption><strong>{$lang->cmd_denied_word}</strong></caption>
 		<thead>
 			<tr>
-				<th>IP</th>
+				<th scope="col">IP</th>
-				<th style="width:100px" class="center">{$lang->latest_hit}</th>
+				<th scope="col">{$lang->latest_hit}</th>
-				<th style="width:50px" class="center">{$lang->hit}</th>
+				<th scope="col">{$lang->hit}</th>
-				<th style="width:100px">{$lang->regdate}</th>
+				<th scope="col">{$lang->regdate}</th>
-				<th style="width:50px">{$lang->cmd_delete}</th>
+				<th scope="col">{$lang->cmd_delete}</th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr loop="$word_list => $word_info">
 				<td>{$word_info->word}</td>
-				<td class="center"><!--@if($word_info->latest_hit)-->{$word_info->latest_hit}<!--@else-->-<!--@end--></td>
+				<td><!--@if($word_info->latest_hit)-->{$word_info->latest_hit}<!--@else-->-<!--@end--></td>
-				<td class="center">{$word_info->hit}</td>
+				<td>{$word_info->hit}</td>
 				<td>{zdate($word_info->regdate,'Y-m-d')}</td>
 				<td><a href="#" onclick="doDeleteDeniedWord('{$word_info->word}')">{$lang->cmd_delete}</a></td>
 			</tr>
+			<tr cond="!$word_list">
+				<td colspan="5" style="text-align:center">{$lang->no_data}</td>
+			</tr>
 		</tbody>
 	</table>
-	<form action="./" class="x_form-horizontal">
+	<form action="./" style="margin-right:14px">
 		<input type="hidden" name="act" value="procSpamfilterAdminInsertDeniedWord" />
 		<input type="hidden" name="module" value="spamfilter" />
 		<input type="hidden" name="ruleset" value="insertDeniedWord" />
 		<input type="hidden" name="active" value="word" />
-		<div class="x_control-group">
+		<textarea name="word_list" title="{$lang->add_denied_word}: {$lang->about_denied_word}" placeholder="{$lang->about_denied_word}" rows="4" cols="42" style="width:100%"></textarea>
-			<textarea name="word_list" title="{$lang->add_denied_word}"></textarea>
+		<span class="x_pull-right" style="margin-right:-14px">
-			<span class="x_muted">{$lang->about_denied_word}</span>
+			<button type="submit" class="x_btn x_btn-primary">{$lang->add_denied_word}</button>
-		</div>
+		</span>
-		<div class="x_clearfix btnArea">
-			<div class="x_pull-left">
-				<button type="submit" class="x_btn x_btn-primary">{$lang->add}</button>
-			</div>
-		</div>
 	</form>
 </section>
 <include target="./footer.html" />

modules/spamfilter/tpl/header.html

@@ -1,7 +1,7 @@
 <load target="js/spamfilter_admin.js" usecdn="true" />
-<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
-    <p>{$XE_VALIDATOR_MESSAGE}</p>
-</div>
 <div class="x_page-header">
 	<h1>{$lang->spamfilter}</h1>
 </div>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+    <p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>