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

merge from branch 1.5.3.2 (~r11282)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-19 07:56:40 +00:00
commit 9f5e25a15e
136 changed files with 414 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -401,7 +401,7 @@
<input type="text" name="%column_name%[]" id="krzip_address2_%column_name%" value="%addr_1%" />
</div>
</div>
<script>jQuery(function($){ $.krzip('%column_name%') });</script>
<script type="text/javascript">jQuery(function($){ $.krzip('%column_name%') });</script>
EOD;
}elseif($extendForm->column_type == 'jp_zip'){
$template = '<input type="text" name="%column_name%" value="%value%" />';

12
modules/member/member.model.php
View file

@ -21,7 +21,15 @@
/**
* @brief Return member's configuration
**/
function getMemberConfig() {
function getMemberConfig()
{
static $member_config;
if($member_config)
{
return $member_config;
}
// Get member configuration stored in the DB
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('member');
@ -65,6 +73,8 @@
if (!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'xpresseditor';
if (!$config->sel_editor_colorset) $config->sel_editor_colorset = 'white';
$member_config = $config;
return $config;
}

3
modules/member/member.view.php
View file

@ -47,6 +47,7 @@
$layout_info = $oLayoutModel->getLayout($this->member_config->layout_srl);
if($layout_info)
{
$this->module_info->layout_srl = $this->member_config->layout_srl;
$this->setLayoutPath($layout_info->path);
}
}
@ -558,7 +559,7 @@
$extraList = $oMemberModel->getUsedJoinFormList();
$js_code = array();
$js_code[] = '<script>//<![CDATA[';
$js_code[] = '<script type="text/javascript">//<![CDATA[';
$js_code[] = '(function($){';
$js_code[] = 'var validator = xe.getApp("validator")[0];';
$js_code[] = 'if(!validator) return false;';

2
modules/member/skins/default/login_form.html
View file

@ -32,7 +32,7 @@
</span>
</div>
</form>
<script>
<script type="text/javascript">
jQuery(function($){
var keep_msg = $('#keep_msg');
keep_msg.hide();

4
modules/member/skins/default/modify_info.html
View file

@ -4,7 +4,7 @@
<!--%load_js_plugin("ui")-->
<!--%load_js_plugin("ui.datepicker")-->
<h1 class="h1">{$lang->msg_update_member}</h1>
<script>
<script type="text/javascript" >
xe.lang.deleteProfileImage = '{$lang->msg_delete_extend_form}';
xe.lang.deleteImageMark = '{$lang->msg_delete_extend_form}';
xe.lang.deleteImageName = '{$lang->msg_delete_extend_form}';
@ -52,7 +52,7 @@
<span class="btn"><a href="{getUrl('act','dispMemberInfo','member_srl','')}">{$lang->cmd_cancel}</a></span>
</div>
</form>
<script>
<script type="text/javascript">
(function($){
$(function(){
var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){

1
modules/member/skins/default/rechecked_password.html
View file

@ -22,3 +22,4 @@
<span class="btn"><a href="{getUrl('act','dispMemberInfo','member_srl','')}">{$lang->cmd_cancel}</a></span>
</div>
</form>
<include target="./common_footer.html" />

2
modules/member/skins/default/signup_form.html
View file

@ -63,7 +63,7 @@
<span class="btn"><a href="{getUrl('act','','member_srl','')}">{$lang->cmd_cancel}</a></span>
</div>
</form>
<script>
<script type="text/javascript">
(function($){
$(function(){
var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){

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

@ -1,11 +1,11 @@
<load target="js/member_admin_group.js" usecdn="true" />
<script>
<script type="text/javascript" >
xe.lang.groupDeleteMessage = '{$lang->msg_group_delete}';
xe.lang.multilingual = '{$lang->cmd_set_multilingual}';
xe.lang.modify = '{$lang->cmd_modify}';
xe.lang.deleteMSG = '{$lang->cmd_delete}';
</script>
<style>
<style type="text/css">
._imageMarkButton img { max-height:16px }
.filebox_item { border: 1px solid #ccc!important; padding: 2px; max-height: 16px; }
.x .multiLangEdit input.vLang { width:120px }

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

@ -35,9 +35,9 @@
<input type="hidden" name="image_mark" value="{$selected_group->image_mark}" />
<span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name=image_mark]').get(0), 'jpg,jpeg,gif,png')">{$lang->cmd_select}</button></span>
<span id="filebox_cancel_image_mark" class="button red"<!--@if(!$selected_group->image_mark)--> style="display:none" <!--@endif-->><button type="button" onclick="XE.filebox.cancel('image_mark')">{$lang->cmd_delete}</button></span>
<script>//<![CDATA[
XE.filebox.init('image_mark');
//]]></script>
<script type="text/javascript">//<![CDATA[
XE.filebox.init('image_mark');
//]]></script>
</td>
</tr>
</table>

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

@ -20,7 +20,7 @@
<p class="q multiExample">{$lang->about_multi_type}</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>
<script type="text/javascript">
var $ = jQuery;
var typeSelect = $('.typeSelect');
var multiOption = $('.typeSelect>option[value=checkbox], .typeSelect>option[value=radio], .typeSelect>option[value=selectM], .typeSelect>option[value=select]');

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

@ -1,7 +1,7 @@
<load target="js/member_admin.js" usecdn="true" />
<load target="js/krzip_search.js" usecdn="true" />
<!--%load_js_plugin("ui.datepicker")-->
<script>
<script type="text/javascript" >
xe.lang.deleteProfileImage = '{$lang->msg_delete_extend_form}';
xe.lang.deleteImageMark = '{$lang->msg_delete_extend_form}';
xe.lang.deleteImageName = '{$lang->msg_delete_extend_form}';
@ -110,7 +110,7 @@
</div>
</table>
</form>
<script>
<script type="text/javascript">
(function($){
$(function(){
var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){

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

@ -29,7 +29,7 @@
</form>
</div>
<script>
<script type="text/javascript">
jQuery(function($){
var keep_msg = $('#keep_msg');
keep_msg.hide();

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

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
<!--@if($redirect_url)-->
location.href = "{$redirect_url}";
<!--@else-->

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

@ -1,6 +1,6 @@
<load target="js/member_admin_config.js" usecdn="true" />
<load target="../../editor/tpl/js/editor_module_config.js" usecdn="true" />
<script>
<script type="text/javascript">
xe.lang.msg_delete_extend_form = '{$lang->msg_delete_extend_form}';
xe.lang.confirm_delete = '{$lang->confirm_delete}';
xe.lang.cmd_delete = '{$lang->cmd_delete}';
@ -206,7 +206,7 @@
</select>
<select name="sel_editor_colorset" id="sel_editor_colorset" style="display:none">
</select>
<script>//<![CDATA[
<script type="text/javascript">//<![CDATA[
getEditorSkinColorList('{$config->signature_editor_skin}','{$config->sel_editor_colorset}');
//]]></script>
</div>

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

@ -1,5 +1,5 @@
<load target="js/member_admin_list.js" type="body" usecdn="true" />
<script>
<script type="text/javascript">
xe.lang.msg_select_user = '{$lang->msg_select_user}';
xe.lang.msg_delete_user = '{$lang->msg_delete_user}';
</script>
@ -187,7 +187,7 @@
<a href="{getUrl('search_target', '', 'search_keyword', '')}">{$lang->cmd_cancel}</a>
</form>
</div>
<script>
<script type="text/javascript">
jQuery(function($){
var clickedBTN = '';

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

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
<!--@if ($is_register == 'Y')-->
alert("{$lang->msg_success_confirmed}");
<!--@else-->

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

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
alert("{$lang->msg_success_modify_email_address}");
location.href="{getUrl()}";
</script>

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

@ -1,3 +1,3 @@
<script>
<script type="text/javascript">
location.href = "{$redirect_url}";
</script>

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

@ -61,7 +61,7 @@
</div>
</form>
</div>
<script>
<script type="text/javascript">
(function($){
$(function(){
var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){