fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-29 08:09:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/member/tpl/denied_id_list.html
View file

@ -63,7 +63,7 @@
</tr>
<tr>
<th scope="row">{$lang->description}</th>
<td ><textarea name="description"></textarea></td>
<td ><textarea name="description" rows="8" cols="42"></textarea></td>
</tr>
</table>
</div>

8
modules/member/tpl/group_list.html
View file

@ -9,7 +9,7 @@
._imageMarkButton img { max-height:16px }
.filebox_item { border: 1px solid #ccc!important; padding: 2px; max-height: 16px; }
.x .multiLangEdit input.vLang { width:120px }
.x .multiLangEdit input.vLang.loading { padding-right:24px;width:100px;background:transparent url(../../admin/tpl/img/preLoader16.gif) no-repeat 96px center }
.x .multiLangEdit input.vLang.loading { padding-right:24px;width:100px;background:transparent url(./modules/admin/tpl/img/preLoader16.gif) no-repeat 96px center }
</style>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
@ -64,7 +64,7 @@
<td><input type="radio" name="defaultGroup" value="{$group_info->group_srl}" title="Default" checked="checked"|cond="$group_info->is_default=='Y'" /></td>
<td class="_imageMarkButton"><input type="hidden" name="image_marks[]" value="{$group_info->image_mark}" class="_imgMarkHidden" />
<img src="{$group_info->image_mark}" alt="{$group_info->title}" cond="$config->group_image_mark == 'Y' && $group_info->image_mark" />
<a href="#imageMark" class="modalAnchor _imageMark filebox">{$lang->cmd_modify}</a></td>
<a href="#imageMark" class="modalAnchor _imageMark filebox">{$lang->cmd_modify}...</a></td>
<td><div class="_deleteTD" style="display:none"|cond="$group_info->is_default == 'Y'"><a href="#{$group_srl}" class="_deleteGroup">{$lang->cmd_delete}</a></div></td>
</tr>
<tr style="display:none" class="_template">
@ -78,7 +78,7 @@
<td><input type="text" name="descriptions[]" value="" style="width:240px" disabled="disabled" /></td>
<td><input type="radio" name="defaultGroup" value="" title="Default" disabled="disabled" /></td>
<td class="_imageMarkButton"><input type="hidden" name="image_marks[]" value="" class="_imgMarkHidden" disabled="disabled" />
<a href="#imageMark" class="modalAnchor _imageMark">{$lang->cmd_modify}</a></td>
<a href="#imageMark" class="modalAnchor _imageMark">{$lang->cmd_modify}...</a></td>
<td><div class="_deleteTD"><a href="#new" class="_deleteGroup">{$lang->cmd_delete}</a></div></td>
</tr>
@ -93,7 +93,7 @@
<div id="langEdit" class="langEdit tgContent">
<ul class="langList"></ul>
<div class="langInput">
<h2>{$lang->cmd_multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
<h2>{$lang->cmd_multilingual} <strong>{$lang->cmd_modify}...</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
<ul>
{@
/* move current language to the top */

2
modules/member/tpl/group_update_form.html
View file

@ -26,7 +26,7 @@
<!--@end-->
<tr>
<th scope="row">{$lang->description}</th>
<td ><textarea name="description">{$selected_group->description}</textarea></td>
<td ><textarea name="description" rows="8" cols="42">{$selected_group->description}</textarea></td>
</tr>
<tr>
<th scope="row">{$lang->group_image_mark}</th>

4
modules/member/tpl/insert_join_form.html
View file

@ -17,7 +17,7 @@
</select>
</p>
<p class="q multiExample">{$lang->about_multi_type}</p>
<p class="a multiExample"><textarea rows="5" cols="42" id="multiSelect" name="default_value"><block cond="$default_value">{implode('<enter>', $default_value)}</block></textarea></p>
<p class="a multiExample"><textarea rows="8" cols="42" id="multiSelect" name="default_value"><block cond="$default_value">{implode('<enter>', $default_value)}</block></textarea></p>
</li>
<script type="text/javascript">
var $ = jQuery;
@ -38,7 +38,7 @@
</script>
<li>
<p class="q"><label for="desc">{$lang->description}</label></p>
<p class="a"><textarea rows="5" cols="42" id="desc" name="description">{$formInfo->description}</textarea></p>
<p class="a"><textarea rows="8" cols="42" id="desc" name="description">{$formInfo->description}</textarea></p>
</li>
<li>
<p class="a">

4
modules/member/tpl/insert_member.html
View file

@ -61,7 +61,7 @@
<p class="q">{$lang->allow_message}</p>
<p class="a">
<block loop="$lang->allow_message_type=>$key,$val">
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key || (!$member_info->member_srl && $key == 'Y')" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
</block>
</p>
</li>
@ -91,7 +91,7 @@
<li>
<p class="q"><label for="description">{$lang->description}</label></p>
<p class="a">
<textarea name="description" id="description" cols="42" rows="5">{htmlspecialchars($member_info->description)}</textarea>
<textarea name="description" id="description" rows="8" cols="42">{htmlspecialchars($member_info->description)}</textarea>
<span class="desc">{$lang->about_member_description}</span>
</p>
</li>

2
modules/member/tpl/join_form_list.html
View file

@ -33,7 +33,7 @@
<td>
<button type="button" class="text" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','up');return false;">{$lang->cmd_move_up}</button>
<button type="button" class="text" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','down');return false;">{$lang->cmd_move_down}</button>
<a href="{getUrl('member_join_form_srl',$val->member_join_form_srl,'act','dispMemberAdminInsertJoinForm')}">{$lang->cmd_modify}</a>
<a href="{getUrl('member_join_form_srl',$val->member_join_form_srl,'act','dispMemberAdminInsertJoinForm')}">{$lang->cmd_modify}...</a>
<button type="button" class="text" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</button>
</td>
</tr>

2
modules/member/tpl/leave_form.html
View file

@ -20,7 +20,7 @@
</ul>
</fieldset>
<div class="cm">
<input type="submit" value="{$lang->cmd_leave}" accesskey="s" class="bn"/>
<input type="submit" value="{$lang->cmd_leave}" class="bn"/>
<a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_back}</span></a>
</div>

4
modules/member/tpl/login_form.html
View file

@ -1,7 +1,7 @@
<load target="css/mlogin.css" usecdn="true" />
<div class="bd">
<div class="hx h2">
<h2>{$lang->cmd_login}</h2>
<h2>{$lang->cmd_login}...</h2>
</div>
<form action="./" method="POST" class="ff">
<input type="hidden" name="module" value="member" />
@ -13,7 +13,7 @@
</ul>
<div class="bna">
<div class="fl"><input name="keep_signed" type="checkbox" value="Y" id="autoLogin" /> <label for="autoLogin">{$lang->keep_signed}</label></div>
<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}</button></div>
<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}...</button></div>
</div>
</form>
</div>

10
modules/member/tpl/member_config.html
View file

@ -93,7 +93,7 @@
</ul>
</div>
<div class="a">
<textarea rows="4" cols="42" id="prohibited_id" title="{$lang->add_prohibited_id}"></textarea>
<textarea rows="8" cols="42" id="prohibited_id" title="{$lang->add_prohibited_id}"></textarea>
<span class="btn"><button type="button" class="_addDeniedID">{$lang->add}</button></span>
<span class="desc">{$lang->multi_line_input}</span>
</div>
@ -130,7 +130,7 @@
</th>
<td><input type="radio" name="identifier" value="{$item->name}" checked="checked" /></td>
<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked" disabled="disabled" /></td>
<td>
<td class="nowr">
<input type="radio" id="{$item->name}_re" name="{$item->name}" value="requierd" checked="checked" disabled="disabled" /> <label for="{$item->name}_re">{$lang->cmd_required}</label>
<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" disabled="disabled" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
</td>
@ -150,7 +150,7 @@
</th>
<td><input type="radio" name="identifier" value="{$item->name}" cond="$item->name== 'email_address' || $item->name=='user_id'" /></td>
<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"|cond="$item->mustRequired || $item->isUse" disabled="disabled"|cond="$item->mustRequired" /></td>
<td>
<td class="nowr">
<input type="radio" id="{$item->name}_re" name="{$item->name}" value="required" checked="checked"|cond="$item->mustRequired || $item->required" disabled="disabled"|cond="$item->mustRequired || !$item->isUse" /> <label for="{$item->name}_re">{$lang->cmd_required}</label>
<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" checked="checked"|cond="!$item->mustRequired && ($item->isUse && !$item->required)" disabled="disabled"|cond="$item->mustRequired || !$item->isUse" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
<div cond="$item->imageType" class="_subItem">
@ -174,12 +174,12 @@
</th>
<td></td>
<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"|cond="$item->isUse" /></td>
<td>
<td class="nowr">
<input type="radio" id="{$item->name}_re" name="{$item->name}" value="required" checked="checked"|cond="$item->required" disabled="disabled"|cond="!$item->isUse"/> <label for="{$item->name}_re">{$lang->cmd_required}</label>
<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" checked="checked"|cond="$item->isUse && !$item->required" disabled="disabled"|cond="!$item->isUse" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
</td>
<td class="text">{$item->description}</td>
<td id="{$item->member_join_form_srl}"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->cmd_edit}</a> | <a href="#" class="_extendFormDelete">{$lang->cmd_delete}</a></td>
<td id="{$item->member_join_form_srl}" class="nowr"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->cmd_edit}</a> | <a href="#" class="_extendFormDelete">{$lang->cmd_delete}</a></td>
</tr>
<!--@end-->
<!--@end-->

2
modules/member/tpl/member_info.html
View file

@ -3,7 +3,7 @@
<table width="100%" border="1" cellspacing="0">
<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
<!--@if($formInfo->isDefaultForm)-->
{@$title = $formInfo->title}
{@$title = Context::getLang($formInfo->name)}
{@$value = $memberInfo[$formInfo->name]}
<!--@if($formInfo->name == 'find_account_question')-->
{@$value = $lang->find_account_question_items[$value].' : '.$memberInfo['find_account_answer']}

52
modules/member/tpl/member_list.html
View file

@ -28,14 +28,14 @@
</caption>
<thead>
<tr>
<th scope="col">{$lang->email}</th>
<th scope="col" loop="$usedIdentifiers=>$name,$title">{$title}</th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList')}">{$lang->signup_date}</a></th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order', 'asc')}">{$lang->last_login}</a></th>
<th scope="col" class="text">{$lang->member_group}</th>
<th scope="col">{$lang->status}</th>
<th scope="col">{$lang->cmd_view}</th>
<th scope="col">{$lang->cmd_modify}</th>
<th scope="col" class="nowr">{$lang->email}</th>
<th scope="col" class="nowr" loop="$usedIdentifiers=>$name,$title">{$title}</th>
<th scope="col" class="nowr"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'regdate', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->signup_date}<block cond="$sort_index == 'regdate'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>
<th scope="col" class="nowr"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->last_login}<block cond="$sort_index == 'last_login'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>
<th scope="col">{$lang->member_group}</th>
<th scope="col" class="nowr">{$lang->status}</th>
<th scope="col" class="nowr">{$lang->cmd_view}</th>
<th scope="col" class="nowr">{$lang->cmd_modify}...</th>
<th scope="col">
<input type="checkbox" title="Check All" data-name="user" />
</th>
@ -43,14 +43,14 @@
</thead>
<tfoot>
<tr>
<th scope="col">{$lang->email}</th>
<th scope="col" loop="$usedIdentifiers=>$name,$title">{$title}</th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList')}">{$lang->signup_date}</a></th>
<th scope="col"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order', 'asc')}">{$lang->last_login}</a></th>
<th scope="col" class="text">{$lang->member_group}</th>
<th scope="col">{$lang->status}</th>
<th scope="col">{$lang->cmd_view}</th>
<th scope="col">{$lang->cmd_modify}</th>
<th scope="col" class="nowr">{$lang->email}</th>
<th scope="col" class="nowr" loop="$usedIdentifiers=>$name,$title">{$title}</th>
<th scope="col" class="nowr"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'regdate', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->signup_date}<block cond="$sort_index == 'regdate'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>
<th scope="col" class="nowr"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList', 'sort_index', 'last_login', 'sort_order', ($sort_order == 'asc') ? 'desc' : 'asc')}">{$lang->last_login}<block cond="$sort_index == 'last_login'"> <em cond="$sort_order=='asc'">▲</em><em cond="$sort_order != 'asc'">▼</em></block></a></th>
<th scope="col">{$lang->member_group}</th>
<th scope="col" class="nowr">{$lang->status}</th>
<th scope="col class="nowr"">{$lang->cmd_view}</th>
<th scope="col" class="nowr">{$lang->cmd_modify}...</th>
<th scope="col">
<input type="checkbox" title="Check All" data-name="user" />
</th>
@ -59,21 +59,21 @@
<tbody>
<tr loop="$member_list=>$no,$member_info">
{@$member_info = get_object_vars($member_info)}
<td>
<td class="nowr">
<a href="#popup_menu_area" class="cMenu member_{$member_info['member_srl']}">Info</a>
<span class="masked">{getEncodeEmailAddress($member_info['email_address'])}</span>
</td>
{@ $member_info['group_list'] = implode(', ', $member_info['group_list'])}
<td loop="$usedIdentifiers=>$name,$title">{$member_info[$name]}</td>
<td>{zdate($member_info['regdate'], 'Y-m-d')}</td>
<td>{zdate($member_info['last_login'], 'Y-m-d')}</td>
<td class="text">{$member_info['group_list']}&nbsp;</td>
<td class="nowr" loop="$usedIdentifiers=>$name,$title">{$member_info[$name]}</td>
<td class="nowr">{zdate($member_info['regdate'], 'Y-m-d')}</td>
<td class="nowr">{zdate($member_info['last_login'], 'Y-m-d')}</td>
<td>{$member_info['group_list']}&nbsp;</td>
{@ $lang_denied = ($member_info['denied'] == 'N')?$lang->approval:$lang->denied}
<td>{$lang_denied}</td>
<td>
<td class="nowr">{$lang_denied}</td>
<td class="nowr">
<a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInfo', 'member_srl', $member_info['member_srl'])}">{$lang->cmd_view}</a>
</td>
<td><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_info['member_srl'])}">{$lang->cmd_modify}</a></td>
<td class="nowr"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_info['member_srl'])}">{$lang->cmd_modify}...</a></td>
{@$used_values = ''}
<!--@foreach($usedIdentifiers as $name=>$title)-->
{@$used_values .= "\t".$member_info[$name]}
@ -123,10 +123,10 @@
</p>
<p class="q"><label for="message">{$lang->about_send_message}</label></p>
<p>
<textarea cols="42" rows="3" id="message" style="width:98%" name="message" ></textarea>
<textarea rows="8" cols="42" id="message" style="width:98%" name="message" ></textarea>
</p>
<div class="btnArea">
<span class="btn"><button type="submit" name="type" value="modify">{$lang->cmd_modify}</button></span>
<span class="btn"><button type="submit" name="type" value="modify">{$lang->cmd_modify}...</button></span>
<span class="btn"><button type="submit" name="type" value="delete">{$lang->cmd_delete}</button></span>
</div>
</form>

8
modules/member/tpl/modify_info_mobile.html
View file

@ -94,7 +94,7 @@
<li><label for="mailing" class="db fb al">{$lang->allow_mailing}</label><input id="mailing" type="checkbox" name="allow_mailing" value="Y" class="checkbox" <!--@if($member_info->allow_mailing!='N')-->checked="checked"<!--@end--> /> <p style="color:#666">{$lang->about_allow_mailing}</p></li>
<!--@if($member_config->signature != 'N')-->
<li><label for="signature" class="db fb al">{$lang->signature}</label><textarea name="signature" class="itxx" value=""></textarea></li>
<li><label for="signature" class="db fb al">{$lang->signature}</label><textarea name="signature" rows="8" cols="42" class="itxx" value=""></textarea></li>
<!--@end-->
</ul>
</fieldset>
@ -120,7 +120,7 @@
<input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[2])}" size="4"/>
<!--// textarea -->
<!--@elseif($val->column_type == 'textarea')-->
<textarea name="{$val->column_name}" class="itxx">{htmlspecialchars($val->value)}</textarea>
<textarea name="{$val->column_name}" rows="8" cols="42" class="itxx">{htmlspecialchars($val->value)}</textarea>
<!--// 다중 선택 -->
<!--@elseif($val->column_type == 'checkbox')-->
<!--@if($val->default_value)-->
@ -172,7 +172,7 @@
<!--// 날짜 입력 -->
<!--@elseif($val->column_type == 'date')-->
<input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
<input type="text" class="inputDate inputTypeText" value="" />
<input type="text" class="inputDate" value="" />
<!--@end-->
<p style="color:#666">{$val->description}</p>
<!--// 공개 필드 css확인 필요 -->
@ -198,7 +198,7 @@
</fieldset>
<!--@end-->
<div class="cm">
<input type="submit" value="{$lang->cmd_registration}" accesskey="s" class="bn"/>
<input type="submit" value="{$lang->cmd_registration}" class="bn"/>
<a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_cancel}</span></a>
</div>
</form>

2
modules/member/tpl/modify_password.html
View file

@ -23,7 +23,7 @@
</ul>
</fieldset>
<div class="cm">
<input type="submit" value="{$lang->cmd_registration}" accesskey="s" class="bn"/><a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_back}</span></a>
<input type="submit" value="{$lang->cmd_registration}" class="bn"/><a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_back}</span></a>
</div>
</form>

2
modules/member/tpl/signup_form.html
View file

@ -54,7 +54,7 @@
</li>
</ul>
<div class="bna">
<input type="submit" class="bn dark" value="{$lang->cmd_registration}" accesskey="s" />
<input type="submit" class="bn dark" value="{$lang->cmd_registration}" />
</div>
</form>
</div>