fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 12:02:24 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from luminous 11590 ~ 11593

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11594 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-04 09:29:55 +00:00
parent 30a61a0cb9
commit 3ca52fedc8
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/member/member.admin.controller.php
View file

@ -146,6 +146,7 @@
'layout_srl', 'layout_srl',
'skin', 'skin',
'colorset', 'colorset',
'mlayout_srl',
'mskin', 'mskin',
'profile_image', 'profile_image_max_width', 'profile_image_max_height', 'profile_image', 'profile_image_max_width', 'profile_image_max_height',
'image_name', 'image_name_max_width', 'image_name_max_height', 'image_name', 'image_name_max_width', 'image_name_max_height',
@ -190,6 +191,7 @@
if($args->signature!='Y') $args->signature = 'N'; if($args->signature!='Y') $args->signature = 'N';
$args->identifier = $all_args->identifier; $args->identifier = $all_args->identifier;
$args->layout_srl = $args->layout_srl ? $args->layout_srl : null; $args->layout_srl = $args->layout_srl ? $args->layout_srl : null;
$args->mlayout_srl = $args->mlayout_srl ? $args->mlayout_srl : null;
// set default // set default
$all_args->is_nick_name_public = 'Y'; $all_args->is_nick_name_public = 'Y';

17
modules/member/member.admin.view.php
View file

@ -115,6 +115,10 @@
Context::set('layout_list', $layout_list); Context::set('layout_list', $layout_list);
$mlayout_list = $oLayoutModel->getLayoutList(0, 'M');
Context::set('mlayout_list', $mlayout_list);
// list of skins for member module // list of skins for member module
$skin_list = $oModuleModel->getSkins($this->module_path); $skin_list = $oModuleModel->getSkins($this->module_path);
Context::set('skin_list', $skin_list); Context::set('skin_list', $skin_list);
@ -317,7 +321,7 @@
,$lang->cmd_delete); ,$lang->cmd_delete);
}elseif($formInfo->name == 'find_account_question'){ }elseif($formInfo->name == 'find_account_question'){
$formTag->type = 'select'; $formTag->type = 'select';
$inputTag = '<select name="find_account_question" style="width:290px; display:block;">%s</select>'; $inputTag = '<select name="find_account_question" id="find_account_question" style="width:290px; display:block;">%s</select>';
$optionTag = array(); $optionTag = array();
foreach($lang->find_account_question_items as $key=>$val){ foreach($lang->find_account_question_items as $key=>$val){
if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"'; if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
@ -328,10 +332,11 @@
,$val); ,$val);
} }
$inputTag = sprintf($inputTag, implode('', $optionTag)); $inputTag = sprintf($inputTag, implode('', $optionTag));
$inputTag .= '<input type="text" name="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="'.$memberInfo['find_account_answer'].'" class="inputText long tall" />'; $inputTag .= '<input type="text" name="find_account_answer" id="find_account_answer" title="'.Context::getLang('find_account_answer').'" value="'.$memberInfo['find_account_answer'].'" class="inputText long tall" />';
}else{ }else{
$formTag->type = 'text'; $formTag->type = 'text';
$inputTag = sprintf('<input type="text" name="%s" value="%s" class="inputText long tall" />' $inputTag = sprintf('<input type="text" name="%s" id="%s" value="%s" class="inputText long tall" />'
,$formInfo->name
,$formInfo->name ,$formInfo->name
,$memberInfo[$formInfo->name]); ,$memberInfo[$formInfo->name]);
} }
@ -344,7 +349,7 @@
$formTag->type = $extendForm->column_type; $formTag->type = $extendForm->column_type;
if($extendForm->column_type == 'text' || $extendForm->column_type == 'homepage' || $extendForm->column_type == 'email_address'){ if($extendForm->column_type == 'text' || $extendForm->column_type == 'homepage' || $extendForm->column_type == 'email_address'){
$template = '<input type="text" name="%column_name%" value="%value%" />'; $template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
}elseif($extendForm->column_type == 'tel'){ }elseif($extendForm->column_type == 'tel'){
$extentionReplace = array('tel_0' => $extendForm->value[0], $extentionReplace = array('tel_0' => $extendForm->value[0],
'tel_1' => $extendForm->value[1], 'tel_1' => $extendForm->value[1],
@ -376,7 +381,7 @@
$template = sprintf($template, implode('', $optionTag)); $template = sprintf($template, implode('', $optionTag));
} }
}elseif($extendForm->column_type == 'select'){ }elseif($extendForm->column_type == 'select'){
$template = '<select name="'.$formInfo->name.'">%s</select>'; $template = '<select name="'.$formInfo->name.'" id="'.$formInfo->name.'">%s</select>';
$optionTag = array(); $optionTag = array();
if($extendForm->default_value){ if($extendForm->default_value){
foreach($extendForm->default_value as $v){ foreach($extendForm->default_value as $v){
@ -418,7 +423,7 @@
<script>jQuery(function($){ $.krzip('%column_name%') });</script> <script>jQuery(function($){ $.krzip('%column_name%') });</script>
EOD; EOD;
}elseif($extendForm->column_type == 'jp_zip'){ }elseif($extendForm->column_type == 'jp_zip'){
$template = '<input type="text" name="%column_name%" value="%value%" />'; $template = '<input type="text" name="%column_name%" id="%column_name%" value="%value%" />';
}elseif($extendForm->column_type == 'date'){ }elseif($extendForm->column_type == 'date'){
$extentionReplace = array('date' => zdate($extendForm->value, 'Y-m-d'), $extentionReplace = array('date' => zdate($extendForm->value, 'Y-m-d'),
'cmd_delete' => $lang->cmd_delete); 'cmd_delete' => $lang->cmd_delete);

1
modules/member/member.mobile.php
View file

@ -49,6 +49,7 @@ class memberMobile extends memberView
$layout_info = $oLayoutModel->getLayout($this->member_config->mlayout_srl); $layout_info = $oLayoutModel->getLayout($this->member_config->mlayout_srl);
if($layout_info) if($layout_info)
{ {
$this->module_info->mlayout_srl = $this->member_config->mlayout_srl;
$this->setLayoutPath($layout_info->path); $this->setLayoutPath($layout_info->path);
} }
} }