issue 2381 update theme in poll page

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

modules/poll/lang/lang.xml

@@ -118,7 +118,7 @@
 		<value xml:lang="tr"><![CDATA[Zaten oylamada bulundunuz!]]></value>
 		<value xml:lang="vi"><![CDATA[Bạn đã bỏ phiếu rồi!]]></value>
 	</item>
-	<item name="msg_cart_is_null">
+	<item name="msg_poll_is_null">
 		<value xml:lang="ko"><![CDATA[삭제할 설문을 선택해주세요.]]></value>
 		<value xml:lang="en"><![CDATA[Please select a poll to delete.]]></value>
 		<value xml:lang="jp"><![CDATA[削除するアンケートを選択してください。]]></value>
@@ -142,6 +142,9 @@
 		<value xml:lang="tr"><![CDATA[%d oylama silindi.]]></value>
 		<value xml:lang="vi"><![CDATA[%d đã được xóa.]]></value>
 	</item>
+	<item name="confirm_poll_delete">
+		<value xml:lang="ko"><![CDATA[%s개의 설문을 삭제하시겠습니까?]]></value>
+	</item>
 	<item name="msg_check_poll_item">
 		<value xml:lang="ko"><![CDATA[설문에 응할 항목을 선택하여 주세요. (설문조사 마다 필수 선택항목이 다를 수 있습니다.)]]></value>
 		<value xml:lang="en"><![CDATA[Please select a poll item to poll.\n(Required poll item(s) may be different in each poll.)]]></value>
@@ -190,7 +193,7 @@
 		<value xml:lang="tr"><![CDATA[Oylamayı göndermeyi onaylıyor musunuz?]]></value>
 		<value xml:lang="vi"><![CDATA[Bạn có chắc chắn muốn gửi thăm dò?]]></value>
 	</item>
-	<item name="search_target_list" type="array">
+	<item name="search_poll_target_list" type="array">
 		<item name="title">
 			<value xml:lang="ko"><![CDATA[제목]]></value>
 			<value xml:lang="en"><![CDATA[Title]]></value>
@@ -240,16 +243,11 @@
 		<value xml:lang="jp"><![CDATA[複数選択]]></value>
 		<value xml:lang="zh-TW"><![CDATA[複選]]></value>
 	</item>
-	<item name="poll_manager">
-		<value xml:lang="ko"><![CDATA[선택한 설문 관리]]></value>
-		<value xml:lang="en"><![CDATA[Manage selected poll]]></value>
-		<value xml:lang="jp"><![CDATA[選択したアンケートの管理]]></value>
-		<value xml:lang="zh-TW"><![CDATA[管理所選投票]]></value>
-	</item>
 	<item name="selected_poll">
 		<value xml:lang="ko"><![CDATA[선택한 설문]]></value>
 		<value xml:lang="en"><![CDATA[Selected poll]]></value>
 		<value xml:lang="jp"><![CDATA[選択したアンケート]]></value>
 		<value xml:lang="zh-TW"><![CDATA[已選擇的投票]]></value>
 	</item>
+
 </lang>

modules/poll/tpl/js/poll_admin.js

@@ -55,50 +55,6 @@ function completeMovePoll(ret_obj, response_tags) {
     winopen(url, 'pollTarget');
 }
 
-function getPollList()
-{
-	var pollListTable = jQuery('#pollListTable');
-	var cartList = [];
-	pollListTable.find(':checkbox[name=cart]').each(function(){
-		if(this.checked) cartList.push(this.value); 
-	});
-
-    var params = new Array();
-    var response_tags = ['error','message', 'poll_list'];
-	params["poll_srls"] = cartList.join(",");
-
-    exec_xml('poll','procPollGetList',params, completeGetPollList, response_tags);
-}
-
-function completeGetPollList(ret_obj, response_tags)
-{
-	var htmlListBuffer = '';
-
-	if(ret_obj['poll_list'] == null)
-	{
-		htmlListBuffer = '<tr>' +
-							'<td colspan="3" style="text-align:center;">'+ret_obj['message']+'</td>' +
-						'</tr>';
-	}
-	else
-	{
-		var poll_list = ret_obj['poll_list']['item'];
-		if(!jQuery.isArray(poll_list)) poll_list = [poll_list];
-		for(var x in poll_list)
-		{
-			var objPoll = poll_list[x];
-			htmlListBuffer += '<tr>' +
-								'<td class="title">'+objPoll.title+'</td>' +
-								'<td class="nowr">'+objPoll.poll_count+'</td>' +
-								'<td class="nowr">'+objPoll.nick_name+'</td>' +
-							'</tr>' +
-							'<input type="hidden" name="cart[]" value="'+objPoll.poll_index_srl+'" />';
-		}
-		jQuery('#selectedPollCount').html(poll_list.length);
-	}
-	jQuery('#pollManageListTable>tbody').html(htmlListBuffer);
-}
-
 function checkSearch(form)
 {
 	if(form.search_target.value == '')
@@ -112,3 +68,24 @@ function checkSearch(form)
 		return false;
 	}
 }
+
+jQuery(function ($){
+	$('#pollList').submit(function(e){
+		var cnt = $('#pollList input[name=cart]:checked').length;
+		if(cnt == 0)
+		{
+			e.stopPropagation();
+			alert(xe.lang.msg_select_poll);
+			return false;
+		}
+
+		var msg = xe.lang.confirm_poll_delete.replace("%s", cnt);
+		if(!confirm(msg))
+		{
+			e.stopPropagation();
+			return false;
+			
+		}
+	});
+	
+});

modules/poll/tpl/poll_list.html

@@ -1,19 +1,26 @@
 <script>
 xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
 xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
+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>
-<form action="" class="form">
+<div class="x_page-header">
+	<h1>{$lang->poll}</h1>
+</div>
+<form 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" />
-	<h1 class="h1">{$lang->poll}</h1>
+	<div class="x_clearfix" style="margin-bottom:-48px">
-	<div class="table even">
+		<span class="x_pull-right"><input type="submit" class="x_btn x_btn-danger" value="{$lang->cmd_delete_checked_poll}" /></span>
-		<table width="100%" border="1" cellspacing="0" id="pollListTable">
+	</div>
+	<table class="x_table x_table-striped x_table-hover" id="pollListTable">
 		<caption>
 			All({number_format($total_count)})
-				<span class="side"><span class="btn"><a href="#listManager" class="modalAnchor" onclick="getPollList();">{$lang->poll_manager}...</a></span></span>
 		</caption>
 		<thead>
 			<tr>
@@ -23,7 +30,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 				<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" data-name="cart" title="Check All" /></th>
 			</tr>
 		</thead>
 		<tfoot>
@@ -38,8 +45,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 			</tr>
 		</tfoot>
 		<tbody>
-				<!--@foreach($poll_list as $no => $val)-->
+			<tr loop="$poll_list => $no,$val">
-				<tr>
 				<td class="title"><a href="<!--@if($val->document_srl)-->{getUrl('')}?document_srl={$val->document_srl}<!--@end--><!--@if($val->comment_srl)-->#comment_{$val->comment_srl}<!--@end-->" target="_blank">{$val->title}</a></td>
 				<td class="nowr"><!--@if($val->checkcount == 1)-->{$lang->single_check}<!--@else-->{$lang->multi_check}<!--@end--></td>
 				<td class="nowr">{$val->poll_count}</td>
@@ -50,20 +56,20 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 					<input type="checkbox" name="cart" value="{$val->poll_index_srl}" />
 				</td>
 			</tr>
-				<!--@end-->
 		</tbody>
 	</table>
-		<div class="btnArea">
+	<div class="x_clearfix">
-			<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getPollList();">{$lang->poll_manager}...</a></span>
+		<span class="x_pull-right"><input type="submit" class="x_btn x_btn-danger" value="{$lang->cmd_delete_checked_poll}" /></span>
-		</div>
 	</div>
 </form>
-<div class="modal" id="listManager">
+<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}" />
-		<h2 class="h2">{$lang->poll_manager}</h2>
 		<div class="table">
 			<table width="100%" border="1" cellspacing="0" id="pollManageListTable">
 				<caption>{$lang->selected_poll} <strong id="selectedPollCount"></strong></caption>
@@ -83,49 +89,42 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		</div>
 	</form>
 </div>
-<div class="search">
-<form action="" class="pagination">
-	<input type="hidden" name="error_return_url" value="" />
-	<input type="hidden" name="module" value="{$module}" />
-	<input type="hidden" name="act" value="{$act}" />
-  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
-  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
 
-	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+<!-- 페이지 네비게이션 -->
-	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+<div class="x_pagination x_pagination-centered">
-		{@$isGoTo = true}
+	<ul>
-		<a href="{getUrl('page', '')}">1</a>
+		<li class="x_disabled"|cond="$page == 1 || !$page"><a href="{getUrl('page','','module_srl','')}">&laquo; {$lang->first_page}</a></li>
-		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
-	</block>
 		<!--@while($page_no = $page_navigation->getNextPage())-->
 		{@$last_page = $page_no}
-		<strong cond="$page_no == $page">{$page_no}</strong>
+		<li class="x_active"|cond="$page == $page_no">
-		<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+			<em cond="$page == $page_no">{$page_no}</em>
+			<a cond="$page != $page_no" href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
+		</li>
 		<!--@end-->
-	<block cond="$last_page != $page_navigation->last_page">
+		<li cond="$last_page != $page_navigation->last_page">
-		{@$isGoTo = true}
+			<a href="#goTo" data-toggle="#goTo" title="Jump to">...</a>
-		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+			<span id="goTo" class="x_input-append">
-		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+				<input type="number" required name="page" title="Go to">
-	</block>
+				<button type="submit" class="x_add-on">Go</button>
-	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
-	<span cond="$isGoTo" id="goTo" class="tgContent">
-		<input name="page" title="{$lang->cmd_go_to_page}" />
-		<button type="submit">Go</button>
 			</span>
-</form>
+		</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>
-	<form action="./" method="get" onsubmit="return checkSearch(this)">		
+	</ul>
-	<input type="hidden" name="module" value="{$module}" />
-	<input type="hidden" name="act" value="{$act}" />
-	<input type="hidden" name="error_return_url" value="" />
-		<select name="search_target">
-			<option value="">{$lang->search_target}</option>
-			<!--@foreach($lang->search_target_list as $key => $val)-->
-			<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-			<!--@end-->
-		</select>
-		<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
-		<input type="submit" value="{$lang->cmd_search}" />
-		<a href="{getUrl('','module',$module,'act',$act)}">{$lang->cmd_cancel}</a>
-	</form>
 </div>
+
+<form action="./" method="post" class="search x_input-append" onsubmit="return checkSearch(this)">		
+<input type="hidden" name="module" value="{$module}" />
+<input type="hidden" name="act" value="{$act}" />
+<input type="hidden" name="error_return_url" value="" />
+	<div class="x_clearfix">
+	<div class="x_pull-right">
+	<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}" />
+	<a class="x_btn" href="{getUrl('','module',$module,'act',$act)}">{$lang->cmd_cancel}</a>
+	</div>
+	</div>
+</form>