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

merge from 1.5.3 (~r10943)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/message/m.skins/default/message.css
View file

@ -58,3 +58,4 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
.bn[href]{height:26px}
.bn.dark{border-color:#666;background:#777 -webkit-gradient(linear,0% 0%,0% 100%,from(#7e7c78),to(#5c5b58));background:#777 -moz-linear-gradient(top,#7e7c78,#5c5b58);background-color:#777;color:#fff;box-shadow:0 0 1px #fff inset;-moz-box-shadow:0 0 1px #fff inset;-webkit-box-shadow:0 0 1px #fff inset}
.bn.white{border-color:#b5b5b5;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#f6f6f6),color-stop(0.5,#f0f0f0),color-stop(0.5,#e4e4e4));background:#1b1b1b -moz-linear-gradient(top,#fff,#e4e4e4);background-color:#fff;color:#000}
.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}.message p{margin:1em 0!important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#e0e8ec;background:#edf9ff url(../../../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#efdcdc;background:#ffecec url(../../../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#eae9dc;background:#fffdef url(../../../../common/img/msg.update.png) no-repeat 1em .5em}

26
modules/message/m.skins/default/system_message.html
View file

@ -3,6 +3,9 @@
<div class="hx h2">
<h2>{$system_message}</h2>
</div>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="co">
<!--@if(!$is_logged)-->
{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
@ -13,18 +16,21 @@
{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
<!--%import("./filter/openid_login.xml")-->
<div class="mLogin" id="gLogin">
<form action="./" method="post" ruleset="@login" id="gForm" class="ff">
<form action="{getUrl('','act','procMemberLogin')}" method="post" ruleset="@login" id="gForm" class="ff">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<fieldset>
<ul>
<li><label for="uid">{$lang->user_id}</label><input type="text" name="user_id" id="uid" value="" /></li>
<li><label for="uid"><!--@if($member_config->identifier == 'user_id')-->{$lang->user_id}<!--@else-->{$lang->email_address}<!--@end--></label><input type="text" name="user_id" id="uid" value="" /></li>
<li><label for="upw">{$lang->password}</label><input type="password" name="password" id="upw" value="" /></li>
</ul>
<p>
<input type="checkbox" name="keep_signed" id="keepid" value="Y" />
<input type="checkbox" name="keep_signed" id="keepid" value="Y" />
<label for="keepid">{$lang->keep_signed}</label>
</p>
<div class="message info" id="keep_msg" style="display:none;">
<p>{$lang->about_keep_warning}</p>
</div>
<input type="submit" value="{$lang->cmd_login}" class="bn dark" />
<ul class="hp">
<li><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
@ -62,3 +68,17 @@
<!--@end-->
</div>
</div>
<script type="text/javascript">
jQuery(function($){
var keep_msg = $('#keep_msg');
keep_msg.hide();
$('#keepid').change(function(){
if($(this).is(':checked')){
keep_msg.slideDown(200);
} else {
keep_msg.slideUp(200);
}
});
});
</script>

8
modules/message/message.admin.controller.php
View file

@ -25,11 +25,9 @@
if(!$output->toBool()) return $output;
$this->setMessage('success_updated');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMessageAdminConfig');
header('location:'.$returnUrl);
return;
}
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMessageAdminConfig');
$this->setRedirectUrl($returnUrl);
}
}
?>

2
modules/message/message.view.php
View file

@ -17,8 +17,6 @@
* @brief Display messages
**/
function dispMessage() {
//setcookie for redirect url in case of going to member sign up
setcookie("XE_REDIRECT_URL", $_SERVER['REQUEST_URI']);
// Get configurations (using module model object)
$oModuleModel = &getModel('module');
$this->module_config = $config = $oModuleModel->getModuleConfig('message', $this->module_info->site_srl);

4
modules/message/skins/default/system_message.html
View file

@ -1,4 +1,4 @@
<load target="../../../../common/js/jquery.js" />
<load target="../../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
<load target="./filter/openid_login.xml" />
<load target="./message.css" />
<load target="./message.js" />
@ -8,7 +8,7 @@
<div id="loginAccess" class="gLogin">
<h1>{$system_message}</h1>
<div class="mLogin" id="gLogin" cond="!$is_logged && $module == 'admin'">
<form ruleset="@login" action="./" method="post" id="gForm">
<form ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post" id="gForm">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />