mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-24 13:49:56 +09:00
merge from 1.5.2
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin
parent
6c23751ef8
commit
c727926d9e
382 changed files with 6855 additions and 3603 deletions
|
|
@ -29,7 +29,7 @@
|
|||
<title xml:lang="es">Poll</title>
|
||||
<title xml:lang="ru">Poll</title>
|
||||
<title xml:lang="fr">Poll</title>
|
||||
<title xml:lang="zh-TW">Poll</title>
|
||||
<title xml:lang="zh-TW">投票</title>
|
||||
<title xml:lang="vi">Poll</title>
|
||||
<title xml:lang="mn">Poll</title>
|
||||
<title xml:lang="tr">Poll</title>
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@
|
|||
<value xml:lang="en"><![CDATA[%d poll(s) are deleted.]]></value>
|
||||
<value xml:lang="jp"><![CDATA[%d個のアンケートが削除されました。]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[已删除%d个问卷。]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[已刪除%d個問卷。]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[已刪除 %d 個問卷。]]></value>
|
||||
<value xml:lang="fr"><![CDATA[%d Enquête(s) est(sont) supprimée(s).]]></value>
|
||||
<value xml:lang="ru"><![CDATA[%d опросов удалено.]]></value>
|
||||
<value xml:lang="es"><![CDATA[%d encuestas son eliminados.]]></value>
|
||||
|
|
@ -167,15 +167,11 @@
|
|||
<value xml:lang="vi"><![CDATA[Thăm dò đã chọn không tồn tại.]]></value>
|
||||
</item>
|
||||
<item name="cmd_null_item">
|
||||
<value xml:lang="ko"><![CDATA[설문조사로 등록할 값이 없습니다.
|
||||
다시 설정해주세요.]]></value>
|
||||
<value xml:lang="ko"><![CDATA[설문조사로 등록할 값이 없습니다. 다시 설정해주세요.]]></value>
|
||||
<value xml:lang="en"><![CDATA[No item value exists to post a poll. Please re-try.]]></value>
|
||||
<value xml:lang="jp"><![CDATA[アンケート調査に登録する項目がありません。
|
||||
もう一度設定してください。]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[没有要登录为投票调查的值。
|
||||
请重新设置。]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[沒有要登錄為投票調查的值。
|
||||
請重新設置。]]></value>
|
||||
<value xml:lang="jp"><![CDATA[アンケート調査に登録する項目がありません。 もう一度設定してください。]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[没有要登录为投票调查的值。 请重新设置。]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[沒有要登錄為投票調查的值。 請重新設置。]]></value>
|
||||
<value xml:lang="fr"><![CDATA[Aucune valeur à enrégistrer comme enquête n'existe pas. Essayez encore une fois, S.V.P.]]></value>
|
||||
<value xml:lang="ru"><![CDATA[Не выбран ответ для голосования. Пожалуйста, попробуйте еще.]]></value>
|
||||
<value xml:lang="es"><![CDATA[No existe ningún valor para la encuesta. Por favor trate nuevamente.]]></value>
|
||||
|
|
@ -224,7 +220,7 @@
|
|||
<value xml:lang="en"><![CDATA[IP Address]]></value>
|
||||
<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
|
||||
<value xml:lang="zh-CN"><![CDATA[IP 地址]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[IP位址]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[IP 位址]]></value>
|
||||
<value xml:lang="fr"><![CDATA[Adresse IP]]></value>
|
||||
<value xml:lang="ru"><![CDATA[IP-адрес]]></value>
|
||||
<value xml:lang="es"><![CDATA[Dirección IP]]></value>
|
||||
|
|
@ -236,20 +232,24 @@
|
|||
<value xml:lang="ko"><![CDATA[단일 선택]]></value>
|
||||
<value xml:lang="en"><![CDATA[Single Check]]></value>
|
||||
<value xml:lang="jp"><![CDATA[ひとつだけ選択]]></value>
|
||||
<value xml:lang="zh-TW"><![CDATA[單選]]></value>
|
||||
</item>
|
||||
<item name="multi_check">
|
||||
<value xml:lang="ko"><![CDATA[다중 선택]]></value>
|
||||
<value xml:lang="en"><![CDATA[Multi Check]]></value>
|
||||
<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>
|
||||
|
|
@ -1,14 +1,26 @@
|
|||
<query id="getPollList" action="select">
|
||||
<query id="getPollListWithMember" action="select">
|
||||
<tables>
|
||||
<table name="poll_title" alias="P" />
|
||||
<table name="poll" alias="P2" />
|
||||
<table name="member" alias="M" />
|
||||
</tables>
|
||||
<columns>
|
||||
<column name="*" />
|
||||
<column name="P.poll_srl" alias="poll_srl" />
|
||||
<column name="P.poll_index_srl" alias="poll_index_srl" />
|
||||
<column name="P.title" alias="title" />
|
||||
<column name="P.checkcount" alias="checkcount" />
|
||||
<column name="P.poll_count" alias="poll_count" />
|
||||
<column name="P.upload_target_srl" alias="upload_target_srl" />
|
||||
<column name="P.ipaddress" alias="ipaddress" />
|
||||
<column name="P.regdate" alias="poll_regdate" />
|
||||
<column name="P2.stop_date" alias="poll_stop_date" />
|
||||
<column name="M.*" />
|
||||
</columns>
|
||||
<conditions>
|
||||
<group pipe="and">
|
||||
<condition operation="equal" column="P.member_srl" var="M.member_srl" notnull="notnull" />
|
||||
<condition operation="equal" column="P2.member_srl" var="M.member_srl" notnull="notnull" pipe="and" />
|
||||
<condition operation="equal" column="P2.poll_srl" var="P.poll_srl" notnull="notnull" pipe="and" />
|
||||
<condition operation="in" column="poll_index_srl" var="pollIndexSrlList" filter="number" pipe="and" />
|
||||
</group>
|
||||
<condition operation="like" column="P.title" var="s_title" pipe="or"/>
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@
|
|||
<col />
|
||||
<col width="7" />
|
||||
<tr>
|
||||
<td><img src="./images/lh.png" alt="lh" class="iePngFix" width="7" height="7" /></td>
|
||||
<td><img src="./images/lh.png" alt="lh" width="7" height="7" /></td>
|
||||
<td class="h"><img src="./images/blank.gif" height="7" alt="blank" /></td>
|
||||
<td><img src="./images/rh.png" alt="rh" class="iePngFix" width="7" height="7" /></td>
|
||||
<td><img src="./images/rh.png" alt="rh" width="7" height="7" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="title" colspan="3">
|
||||
|
|
@ -83,9 +83,9 @@
|
|||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="lb" ><img src="./images/lb.png" alt="lb" class="iePngFix" width="7" height="7" /></td>
|
||||
<td class="lb" ><img src="./images/lb.png" alt="lb" width="7" height="7" /></td>
|
||||
<td class="b"><img src="./images/blank.gif" alt="blank" /></td>
|
||||
<td class="rb" ><img src="./images/rb.png" alt="rb" class="iePngFix" width="7" height="7" /></td>
|
||||
<td class="rb" ><img src="./images/rb.png" alt="rb" width="7" height="7" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
<col />
|
||||
<col width="7" />
|
||||
<tr>
|
||||
<td><img src="./images/lh.png" alt="lh" class="iePngFix" width="7" height="7" /></td>
|
||||
<td><img src="./images/lh.png" alt="lh" width="7" height="7" /></td>
|
||||
<td class="h"><img src="./images/blank.gif" height="7" alt="blank" /></td>
|
||||
<td><img src="./images/rh.png" alt="rh" class="iePngFix" width="7" height="7" /></td>
|
||||
<td><img src="./images/rh.png" alt="rh" width="7" height="7" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="title" colspan="3">
|
||||
|
|
@ -56,9 +56,9 @@
|
|||
<td class="r"><img src="./images/blank.gif" height="7" alt="blank" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="rlb" ><img src="./images/rlb.png" alt="lb" class="iePngFix" width="7" height="7" /></td>
|
||||
<td class="rlb" ><img src="./images/rlb.png" alt="lb" width="7" height="7" /></td>
|
||||
<td class="bb"><img src="./images/blank.gif" alt="blank" /></td>
|
||||
<td class="rrb" ><img src="./images/rrb.png" alt="rb" class="iePngFix" width="7" height="7" /></td>
|
||||
<td class="rrb" ><img src="./images/rrb.png" alt="rb" width="7" height="7" /></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<div class="bar"><img src="./images/color_bar.png" style="width:<!--@if($per<1)-->1<!--@else-->{$per}<!--@end-->%;height:6px;" alt="bar" /></div>
|
||||
<div class="status">{$item->poll_count} ({$per}%)</div>
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
|
||||
<!--@end-->
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -89,8 +89,8 @@ function completeGetPollList(ret_obj, response_tags)
|
|||
var objPoll = poll_list[x];
|
||||
htmlListBuffer += '<tr>' +
|
||||
'<td class="title">'+objPoll.title+'</td>' +
|
||||
'<td>'+objPoll.poll_count+'</td>' +
|
||||
'<td>'+objPoll.nick_name+'</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+'" />';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,20 +18,22 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
|
|||
<thead>
|
||||
<tr>
|
||||
<th scope="col" class="text">{$lang->title}</th>
|
||||
<th scope="col">{$lang->poll_checkcount}</th>
|
||||
<th scope="col">{$lang->poll_join_count}</th>
|
||||
<th scope="col">{$lang->author}</th>
|
||||
<th scope="col">{$lang->regdate}</th>
|
||||
<th scope="col" class="nowr">{$lang->poll_checkcount}</th>
|
||||
<th scope="col" class="nowr">{$lang->poll_join_count}</th>
|
||||
<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>
|
||||
</tr>
|
||||
</thead>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th scope="col" class="text">{$lang->title}</th>
|
||||
<th scope="col">{$lang->poll_checkcount}</th>
|
||||
<th scope="col">{$lang->poll_join_count}</th>
|
||||
<th scope="col">{$lang->author}</th>
|
||||
<th scope="col">{$lang->regdate}</th>
|
||||
<th scope="col" class="nowr">{$lang->poll_checkcount}</th>
|
||||
<th scope="col" class="nowr">{$lang->poll_join_count}</th>
|
||||
<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>
|
||||
</tr>
|
||||
</tfoot>
|
||||
|
|
@ -39,10 +41,11 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
|
|||
<!--@foreach($poll_list as $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><!--@if($val->checkcount == 1)-->{$lang->single_check}<!--@else-->{$lang->multi_check}<!--@end--></td>
|
||||
<td>{$val->poll_count}</td>
|
||||
<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
|
||||
<td>{zdate($val->regdate,"Y-m-d H:i")}</td>
|
||||
<td class="nowr"><!--@if($val->checkcount == 1)-->{$lang->single_check}<!--@else-->{$lang->multi_check}<!--@end--></td>
|
||||
<td class="nowr">{$val->poll_count}</td>
|
||||
<td class="nowr"><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
|
||||
<td class="nowr">{zdate($val->poll_regdate,"Y-m-d H:i")}</td>
|
||||
<td class="nowr">{zdate($val->poll_stop_date,"Y-m-d")}</td>
|
||||
<td>
|
||||
<input type="checkbox" name="cart" value="{$val->poll_index_srl}" />
|
||||
</td>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue