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

merge from luminous (11139-12038)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12040 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-11-02 07:20:00 +00:00
commit 86011ab063
23 changed files with 126 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

47
modules/member/m.skins/default/css/member.css
View file

@ -13,31 +13,22 @@
.xm img{border:0}
.xm p{line-height:1.5}
/* Heading */
.xm .h1,
.xm .h2,
.xm .h3,
.xm .h4{position:relative;zoom:1}
.xm .h1{font-size:24px}
.xm .h2{font-size:20px}
.xm .h3{font-size:16px}
.xm .h4{font-size:12px}
/* Table */
.xm .table{margin:1em 0}
.xm .table table{width:100%;border:0;border-collapse:collapse;border-top:2px solid #ccc}
.xm .table caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0}
.xm .table caption:after{content:"";display:block;clear:both}
.xm .table caption a{font-weight:normal}
.xm .table caption em{float:right;margin-left:1em}
.xm .table caption strong{color:#e00}
.xm .table caption .side{float:right;font-weight:normal;margin-left:1em}
.xm .table th,
.xm .table td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap}
.xm .table th{background:#f8f8f8}
.xm .table thead th{border-bottom:1px solid #999}
.xm .table tfoot td{font-weight:bold;background:#f8f8f8}
.xm .table.even tbody tr:nth-of-type(even) td{background-color:#fafafa}
.xm .table td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle}
.xm .table img{vertical-align:middle}
.xm .table em{font-style:normal;font-weight:normal;color:#e00}
.xm .table .title,
.xm .table .text{white-space:normal}
.xm .hx{position:relative;border-bottom:1px solid #ccc8be;padding:8px 10px;margin:0}
.xm .hx:after{content:"";margin:0 -10px;position:relative;top:10px;display:block;clear:both;height:1px;background:#fff}
.xm .hx.h2{background:#e5e5e5;text-shadow:1px 1px 0 #fff;position:relative;zoom:1}
.xm .hx>h2{margin:0 10px 0 0;display:inline;font-size:16px;line-height:1.4}
.xm .hx a{color:#000}
/* Content */
.xm .co{margin: 10px;line-height: 1.4;font-size: 14px;color:#333}
/* DL */
.xm .dl{margin:15px 0}
.xm .dl>dt{font-weight:bold;margin-top:10px}
.xm .dl>dt>em{font-style:normal;color:#e00}
.xm .dl>dd{margin-left:20px}
/* Button Area */
.xm .ba{margin:15px 0;padding:0;list-style:none;border:1px solid #ddd;border-radius:4px}
.xm .ba li{border-top:1px solid #ddd}
.xm .ba li:first-child{border:0}
.xm .ba li>a,
.xm .ba li>button,
.xm .ba li>input{display:block;white-space:nowrap;padding:7px 10px;text-decoration:none;color:#000;background:#f4f4f4;text-shadow:0 1px 0 #fff;overflow:hidden;text-overflow:ellipsis}

2
modules/member/m.skins/default/modify_info.html
View file

@ -35,7 +35,7 @@
<label for="{$formTag->name}">{$formTag->title}</label>
<div id="{$formTag->name}" cond="$formTag->name != 'signature' && $formTag->type != 'date'" class="tel"|cond="$formTag->type == 'tel'">{$formTag->inputTag}</div>
<textarea id="{$formTag->name}" cond="$formTag->name == 'signature'" name="signature" rows="8" cols="42" class="itxx">{$member_info->signature}</textarea>
<input id="{$formTag->name}" class="inputText" type="date" value="{$oMemberInfo[$formTag->name]}" cond="$formTag->type == 'date'" />
<input id="{$formTag->name}" class="inputText" type="date" name="{$formTag->name}" value="{$oMemberInfo[$formTag->name]}" cond="$formTag->type == 'date'" />
</li>
<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>
</ul>

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

@ -153,6 +153,9 @@
$args = Context::gets(
'enable_confirm',
'limit_day',
'agreement',
'redirect_url',
'profile_image', 'profile_image_max_width', 'profile_image_max_height',
@ -187,6 +190,16 @@
$args->signature = $args->signature != 'Y' ? 'N' : 'Y';
$args->identifier = $all_args->identifier;
// set default
$all_args->is_nick_name_public = 'Y';
$all_args->is_find_account_question_public = 'N';
@ -213,6 +226,12 @@
$signupItem->isPublic = ($all_args->{'is_'.$key.'_public'} == 'Y' && $signupItem->isUse) ? 'Y' : 'N';
if ($signupItem->imageType){
$signupItem->max_width = $all_args->{$key.'_max_width'};
$signupItem->max_height = $all_args->{$key.'_max_height'};
@ -227,6 +246,16 @@
$signupItem->title = $extendItem->column_title;
$signupItem->description = $extendItem->description;
// check usable value change, required/option
if ($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y')){
unset($update_args);
@ -236,7 +265,27 @@
$update_output = executeQuery('member.updateJoinForm', $update_args);
}
unset($extendItem);
}
$signupForm[] = $signupItem;
}

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

@ -436,6 +436,7 @@
// Login Information
$logged_info = Context::get('logged_info');
$args->member_srl = $logged_info->member_srl;
$args->birthday = strtr($args->birthday, array('-'=>'', '/'=>'', '.'=>'', ' '=>''));
// Remove some unnecessary variables from all the vars
$all_args = Context::getRequestVars();
unset($all_args->module);

2
modules/member/queries/getScrapDocument.xml
View file

@ -3,7 +3,7 @@
<table name="member_scrap" />
</tables>
<columns>
<column name="count(*)" alias="count" />
<column name="count(document_srl)" alias="count" />
</columns>
<conditions>
<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />

3
modules/member/skins/default/find_member_account.html
View file

@ -1,5 +1,8 @@
<include target="./common_header.html" />
<load target="filter/find_member_account.xml" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<h2 class="h2">{$lang->cmd_find_member_account_with_email}</h2>
<p>{$lang->about_find_member_account}</p>
<form action="./" method="get" onsubmit="return procFilter(this, find_member_account)">