Poll list UI cleaning.

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

modules/poll/tpl/js/poll_admin.js

@@ -71,7 +71,7 @@ function checkSearch(form)
 
 jQuery(function ($){
 	$('#pollList').submit(function(e){
-		var cnt = $('#pollList input[name=cart[]]:checked').length;
+		var cnt = $('#pollList tbody :checked').length;
 		if(cnt == 0)
 		{
 			e.stopPropagation();

modules/poll/tpl/js/poll_admin.min.js

@@ -1,9 +1 @@
-/**
+function doDisplaySkinColorset(b,e){var c=b.options[b.selectedIndex].value;var d=new Array();d.skin=c;d.colorset=e;var a=new Array("error","message","colorset_list");exec_xml("poll","getPollGetColorsetList",d,completeGetSkinColorset,a,d);}function completeGetSkinColorset(g,a,f,e){var c=get_by_id("fo_poll").poll_colorset;var d=c.options.length;var l=f.colorset;for(var j=0;j<d;j++){c.remove(0);}var m=g.colorset_list.split("\n");var k=0;for(var j=0;j<m.length;j++){var h=m[j].split("|@|");if(l&&l==h[0]){k=j;}var b=new Option(h[1],h[0],false,false);c.options.add(b);}c.selectedIndex=k;}function doMovePoll(a,b){var d=new Array();d.poll_srl=a;d.upload_target_srl=b;var c=new Array("error","message","document_srl","comment_srl");exec_xml("poll","getPollAdminTarget",d,completeMovePoll,c);}function completeMovePoll(c,d){var e=c.document_srl;var a=c.comment_srl;var b=request_uri.setQuery("document_srl",e);if(a){b=b+"#comment_"+a;}winopen(b,"pollTarget");}function checkSearch(a){if(a.search_target.value==""){alert(xe.lang.msg_empty_search_target);return false;}if(a.search_keyword.value==""){alert(xe.lang.msg_empty_search_keyword);return false;}}jQuery(function(a){a("#pollList").submit(function(c){var b=a("#pollList tbody :checked").length;if(b==0){c.stopPropagation();alert(xe.lang.msg_select_poll);return false;}var d=xe.lang.confirm_poll_delete.replace("%s",b);if(!confirm(d)){c.stopPropagation();return false;}});});
- * @file   modules/poll/js/poll_admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief  poll 모듈의 관리자용 javascript
- **/
-function doDisplaySkinColorset(sel,colorset){var skin=sel.options[sel.selectedIndex].value,params=new Array();params.skin=skin;params.colorset=colorset;var response_tags=new Array("error","message","colorset_list");exec_xml("poll","getPollGetColorsetList",params,completeGetSkinColorset,response_tags,params)}
-function completeGetSkinColorset(ret_obj,response_tags,params,fo_obj){var sel=get_by_id("fo_poll").poll_colorset,length=sel.options.length,selected_colorset=params.colorset;for(var i=0;i<length;i++)sel.remove(0);var colorset_list=ret_obj.colorset_list.split("\n"),selected_index=0;for(var i=0;i<colorset_list.length;i++){var tmp=colorset_list[i].split("|@|");if(selected_colorset&&selected_colorset==tmp[0])selected_index=i;var opt=new Option(tmp[1],tmp[0],false,false);sel.options.add(opt)};sel.selectedIndex=selected_index}
-function doMovePoll(poll_srl,upload_target_srl){var params=new Array();params.poll_srl=poll_srl;params.upload_target_srl=upload_target_srl;var response_tags=new Array('error','message','document_srl','comment_srl');exec_xml('poll','getPollAdminTarget',params,completeMovePoll,response_tags)}
-function completeMovePoll(ret_obj,response_tags){var document_srl=ret_obj.document_srl,comment_srl=ret_obj.comment_srl,url=request_uri.setQuery('document_srl',document_srl);if(comment_srl)url=url+'#comment_'+comment_srl;winopen(url,'pollTarget')}

modules/poll/tpl/poll_list.html

@@ -5,22 +5,22 @@ xe.lang.msg_select_poll = '{$lang->msg_poll_is_null}';
 xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 </script>
 <load target="js/poll_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->poll}</h1>
 </div>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
 <form ruleset="deleteChecked" action="./" method="post" id="pollList">
 	<input type="hidden" name="act" value="procPollAdminDeleteChecked" />
 	<input type="hidden" name="page" value="{$page}" />
 	<input type="hidden" name="module" value="poll" />
-	<div class="x_clearfix" style="margin-bottom:-48px">
-		<span class="x_pull-right"><input type="submit" class="x_btn x_btn-danger _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" /></span>
-	</div>
 	<table class="x_table x_table-striped x_table-hover" id="pollListTable">
 		<caption>
 			All({number_format($total_count)})
+			<span class="x_pull-right">
+				<input type="submit" class="x_btn x_btn-danger _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" />
+			</span>
 		</caption>
 		<thead>
 			<tr>
@@ -30,7 +30,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 				<th scope="col" class="nowr">{$lang->author}</th>
 				<th scope="col" class="nowr">{$lang->regdate}</th>
 				<th scope="col" class="nowr">{$lang->poll_stop_date}</th>
-				<th scope="col"><input type="checkbox" data-name="cart[]" title="Check All" /></th>
+				<th scope="col"><input type="checkbox" title="Check All" /></th>
 			</tr>
 		</thead>
 		<tfoot>
@@ -41,7 +41,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 				<th scope="col" class="nowr">{$lang->author}</th>
 				<th scope="col" class="nowr">{$lang->regdate}</th>
 				<th scope="col" class="nowr">{$lang->poll_stop_date}</th>
-				<th scope="col"><input type="checkbox" data-name="cart[]" title="Check All" /></th>
+				<th scope="col"><input type="checkbox" title="Check All" /></th>
 			</tr>
 		</tfoot>
 		<tbody>
@@ -58,38 +58,12 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 			</tr>
 		</tbody>
 	</table>
-	<div class="x_clearfix">
+	<span class="x_pull-right">
-		<span class="x_pull-right"><input type="submit" class="x_btn x_btn-danger _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" /></span>
+		<input type="submit" class="x_btn x_btn-danger _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" />
-	</div>
+	</span>
 </form>
-<div class="x_modal" id="listManager">
-	<div class="x_page-header">	
-		<h1>{$lang->poll_manager}</h1>
-	</div>
-	<form ruleset="deleteChecked" action="./" method="post" class="fg form">
-	<input type="hidden" name="module" value="poll" />
-	<input type="hidden" name="act" value="procPollAdminDeleteChecked" />
-	<input type="hidden" name="page" value="{$page}" />
-		<table width="100%" border="1" cellspacing="0" id="pollManageListTable">
-			<caption>{$lang->selected_poll} <strong id="selectedPollCount"></strong></caption>
-			<thead>
-				<tr>
-					<th scope="col" class="text">{$lang->title}</th>
-					<th scope="col">{$lang->poll_join_count}</th>
-					<th scope="col">{$lang->author}</th>
-				</tr>
-			</thead>
-			<tbody>
-			</tbody>
-		</table>
-		<div class="btnArea">
-			<span class="btn"><input type="submit" value="Delete" /></span>
-		</div>
-	</form>
-</div>
 
-<!-- 페이지 네비게이션 -->
+<div class="x_pagination" style="margin-top:-10px">
-<div class="x_pagination x_pagination-centered">
 	<ul>
 		<li class="x_disabled"|cond="$page == 1 || !$page"><a href="{getUrl('page','','module_srl','')}">&laquo; {$lang->first_page}</a></li>
 		<!--@while($page_no = $page_navigation->getNextPage())-->
@@ -106,21 +80,19 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 				<button type="submit" class="x_add-on">Go</button>
 			</span>
 		</li>
-    	<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a></li>
+    	<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &raquo;</a></li>
 	</ul>
 </div>
 
-<form action="./" method="post" class="x_clearfix" onsubmit="return checkSearch(this)">		
+<form action="./" method="post" class="search center x_input-append" onsubmit="return checkSearch(this)">		
-<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="module" value="{$module}" />
-<input type="hidden" name="act" value="{$act}" />
+	<input type="hidden" name="act" value="{$act}" />
-<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="error_return_url" value="" />
-	<div class="x_pull-right search x_input-append">
 	<select name="search_target" style="width:auto">
 		<option value="">{$lang->search_target}</option>
 		<option loop="$lang->search_poll_target_list => $key, $val" value="{$key}" selected="selected"|cond="$search_target==$key">{$val}</option>
 	</select>
 	<input type="search" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
-	<input class="x_btn x_btn-inverse" type="submit" value="{$lang->cmd_search}" />
+	<button class="x_btn x_btn-inverse" type="submit">{$lang->cmd_search}</button>
 	<a class="x_btn" href="{getUrl('','module',$module,'act',$act)}">{$lang->cmd_cancel}</a>
-	</div>
+</form>
-</form>