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

merge from 1.7.3.5(r13153:r13167)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/member/tpl/js/config.js Normal file
View file

@ -0,0 +1,5 @@
function enableSignUpTab(isEnable)
{
var $ = jQuery;
$('#signupTab').toggle(isEnable);
}

16
modules/member/tpl/js/default_config.js Normal file
View file

@ -0,0 +1,16 @@
jQuery(function($){
$('input[name=enable_join]').click(function(){
var checked = $('input[name=enable_join]:checked').val();
enableSignUpTab(checked == 'Y');
});
$('.__sync').click(function (){
exec_xml(
'importer', // module
'procImporterAdminSync', // act
null,
function(ret){if(ret && (!ret.error || ret.error == '0'))alert(ret.message);}, // callback
resp = ['error','message'] // response tags
);
});
});

24
modules/member/tpl/js/design_config.js Normal file
View file

@ -0,0 +1,24 @@
/* 멤버 스킨 컬러셋 구해옴 */
function doGetSkinColorset(skin) {
var params = {skin:skin};
var response_tags = ['error','message','tpl'];
function on_complete(ret) {
jQuery('#colorset').show();
var $colorset = jQuery('#member_colorset'), old_h, new_h;
old_h = $colorset.height();
$colorset.html(ret.tpl);
new_h = $colorset.height();
try{ fixAdminLayoutFooter(new_h - old_h) }catch(e){ };
}
exec_xml(
'member',
'getMemberAdminColorset',
{skin:skin},
on_complete,
['error','message','tpl']
);
}

4
modules/member/tpl/js/member_admin.js
View file

@ -1,3 +1,7 @@
/**
* Deprecate this file.
*
*/
/* 사용자 추가 */
function completeInsert(ret_obj) {
var error = ret_obj['error'];

5
modules/member/tpl/js/member_admin_group.js
View file

@ -67,7 +67,8 @@ jQuery(function ($){
.find('input:radio').val(index).end()
.find('input[name="group_srls[]"]').val(index).end()
.show()
.appendTo($tbody);
.appendTo($tbody)
.find('.lang_code').xeApplyMultilingualUI();
return false;
});
@ -79,7 +80,7 @@ jQuery(function ($){
if ($targetImage.length){
$targetImage.attr('src', src);
}else{
$targetImage = $('<img src="'+src+'" alt="" />').insertBefore(this);
$targetImage = $('<img src="'+src+'" alt="" style="margin-right:4px" />').insertBefore(this);
}
$imageMarkHidden.val(src);
});

20
modules/member/tpl/js/member_admin_list.js
View file

@ -1,7 +1,6 @@
jQuery(function ($){
jQuery(function($){
$('a.modalAnchor._member').bind('before-open.mw', function(){
var $memberList = $('._memberList input[name=user]:checked');
var $memberList = $('#memberList tbody :checked');
if ($memberList.length == 0){
alert(xe.lang.msg_select_user);
return false;
@ -10,11 +9,22 @@ jQuery(function ($){
var memberTag = "";
$('input[name="groups[]"]:checked').removeAttr('checked');
$('#message').val('');
$('#popupBody').empty();
for (var i = 0; i<$memberList.length; i++){
memberInfo = $memberList.eq(i).val().split('\t');
memberSrl = memberInfo.shift();
memberTag += '<tr><td>'+memberInfo.join("</td><td>")+'<input type="hidden" name="member_srls[]" value="'+memberSrl+'"/></td></tr>'
$tr = $('<tr></tr>');
for(var j in memberInfo)
{
var info = memberInfo[j];
var $td = $('<td></td>').text(info);
$tr.append($td);
}
$tr.append('<td><input type="hidden" name="member_srls[]" value="'+memberSrl+'"/></td>');
$('#popupBody').append($tr);
}
$('#popupBody').empty().html(memberTag);
});
});

2
modules/member/tpl/js/signup_check.js
View file

@ -40,7 +40,7 @@ function completeMemberCheckValue(ret_obj, response_tags, field) {
}
if (!dummy.length) {
dummy = jQuery('<div class="checkValue" />').attr('id', _id).appendTo(field.parentNode);
dummy = jQuery('<p class="checkValue help-inline" style="color:red" />').attr('id', _id).appendTo(field.parentNode);
}
dummy.html(ret_obj['message']).show();

95
modules/member/tpl/js/member_admin_config.js → modules/member/tpl/js/signup_config.js
View file

@ -1,28 +1,3 @@
/* 멤버 스킨 컬러셋 구해옴 */
function doGetSkinColorset(skin) {
var params = {skin:skin};
var response_tags = ['error','message','tpl'];
function on_complete(ret) {
jQuery('#colorset').show();
var $colorset = jQuery('#member_colorset'), old_h, new_h;
old_h = $colorset.height();
$colorset.html(ret.tpl);
new_h = $colorset.height();
try{ fixAdminLayoutFooter(new_h - old_h) }catch(e){ };
}
exec_xml(
'member',
'getMemberAdminColorset',
{skin:skin},
on_complete,
['error','message','tpl']
);
}
/* 금지아이디 관련 작업들 */
function doUpdateDeniedID(user_id, mode, message) {
if(typeof(message)!='undefined'&&!confirm(message)) return;
@ -62,29 +37,38 @@ function doUpdateDeniedNickName(nick_name, mode, message)
jQuery(function($){
// hide form if enable_join is setted "No"
var suSetting = $('fieldset.suSetting'); // 회원가입 설정
var suForm = $('fieldset.suForm'); // 회원가입 양식
suForm.find(':checkbox[name="usable_list[]"]').each(function(){
var $i = $(this);
$i.change(function(){
var suForm = $('table.__join_form'); // 회원가입 양식
function changeTable($i)
{
if($i.is(':checked')){
$i.parent('td').next('td')
.find(':radio, :text')
.removeAttr('disabled')
.end()
.find(':radio[value=option]').attr('checked', 'checked')
.end()
.next('td')
.find(':input[value=Y]').removeAttr('disabled').attr('checked', 'checked');
$i.parent('td').next('td').next('td')
.find('>._subItem').show().end()
.find(':radio, [type="number"]')
.removeAttr('disabled')
.end()
.find(':radio[value=option]').attr('checked', 'checked')
.end()
.prev('td')
.find(':input[value=Y]').removeAttr('disabled').attr('checked', 'checked');
} else {
$i.parent('td').next('td')
.find(':radio, :text').attr('disabled','disabled').removeAttr('checked')
.next('label').css('fontWeight','normal').end()
.end()
.next('td')
.find(':input[value=Y]').removeAttr('checked').attr('disabled', 'disabled');
$i.parent('td').next('td').next('td')
.find('>._subItem').hide().end()
.find(':radio, [type="number"]').attr('disabled','disabled').removeAttr('checked')
.next('label').css('fontWeight','normal').end()
.end()
.prev('td')
.find(':input[value=Y]').removeAttr('checked').attr('disabled', 'disabled');
}
}
suForm.find(':checkbox[name="usable_list[]"]').each(function(){
var $i = $(this);
$i.change(function(){
changeTable($i);
});
});
@ -142,7 +126,7 @@ jQuery(function($){
if(userIds == '') return;
var uids = userIds.split(',');
for (var i=0; i<uids.length; i++){
tag = '<li id="denied_'+uids[i]+'">'+uids[i]+' <a href="#" class="side" onclick="doUpdateDeniedID(\''+uids[i]+'\', \'delete\', \''+xe.lang.confirm_delete+'\');return false;">'+xe.lang.cmd_delete+'</a></li>';
tag = '<li id="denied_'+uids[i]+'">'+uids[i]+' <button type="button" class="x_icon-remove" onclick="doUpdateDeniedID(\''+uids[i]+'\',\'delete\',\''+xe.lang.confirm_delete+'\');return false;">'+xe.lang.cmd_delete+'</button></li>';
$('#deniedList').append($(tag));
}
$('#prohibited_id').val('');
@ -175,7 +159,7 @@ jQuery(function($){
var uids = nickNames.split(',');
for (var i=0; i<uids.length; i++)
{
tag = '<li id="denied_'+uids[i]+'">'+uids[i]+' <a href="#" class="side" onclick="doUpdateDeniedNickName(\''+uids[i]+'\', \'delete\', \''+xe.lang.confirm_delete+'\');return false;">'+xe.lang.cmd_delete+'</a></li>';
tag = '<li id="denied_'+uids[i]+'">'+uids[i]+' <button type="button" class="x_icon-remove" onclick="doUpdateDeniedNickName(\''+uids[i]+'\',\'delete\',\''+xe.lang.confirm_delete+'\');return false;">'+xe.lang.cmd_delete+'</button></li>';
$('#deniedNickNameList').append($(tag));
}
@ -214,18 +198,8 @@ jQuery(function($){
// add sticky class
}
});
$('.__sync').click(function (){
exec_xml(
'importer', // module
'procImporterAdminSync', // act
null,
function(ret){if(ret && (!ret.error || ret.error == '0'))alert(ret.message);}, // callback
resp = ['error','message'] // response tags
);
});
$('#userDefine form').submit(function(e) {
$('#userDefine').submit(function(e) {
var id_list = $(this).find('input[name=join_form_id_list]').val();
var id_list_arr = id_list.split(',');
@ -237,4 +211,9 @@ jQuery(function($){
}
else return true;
});
$('.__redirect_url_btn').click(function(e){
$(this).parent().find('input[name=redirect_url]').val('');
$(this).parent().find('input[type=text]').val('');
});
});