fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-20 19:59:54 +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

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

@ -1,43 +1,51 @@
<load target="../../../../common/js/jquery.min.js" usecdn="true" index="-1000000" />
<block cond="!$is_logged && $module == 'admin'">
<load target="../../../../common/css/bootstrap.min.css" index="1" />
</block>
<load target="./filter/openid_login.xml" />
<load target="./message.css" />
<load target="./message.css" index="2" />
<load target="./message.js" />
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div id="loginAccess" class="gLogin">
<h1>{$system_message}</h1>
<div class="mLogin" id="gLogin" cond="!$is_logged && $module == 'admin'">
<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()}" />
<div id="access">
<div class="login-header">
<h1><i class="icon-user"></i> {$system_message}</h1>
</div>
<div class="login-body">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/message/skins/default/system_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form cond="!$is_logged && $module == 'admin'" ruleset="@login" action="{getUrl('','act','procMemberLogin')}" method="post">
<input type="hidden" name="module" value="member" />
<input type="hidden" name="act" value="procMemberLogin" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="xe_validator_id" value="modules/message/skins/default/system_message/1" />
<fieldset>
<ul class="idpw">
<li><input type="text" name="user_id" id="uid" value="" class="iText" title="{$lang->user_id}" /></li>
<li><input type="password" name="password" id="upw" value="" class="iText" title="{$lang->password}" /></li>
</ul>
<div class="buttonArea">
<p class="keeping">
<div class="control-group">
<input type="text" name="user_id" id="uid" title="{$lang->user_id}" placeholder="{$lang->user_id}" required autofocus cond="$member_config->identifier != 'email_address'" />
<input type="email" name="user_id" id="uid" title="{$lang->email_address}" placeholder="{$lang->email_address}" required autofocus cond="$member_config->identifier == 'email_address'" />
<input type="password" name="password" id="upw" title="{$lang->password}" placeholder="{$lang->password}" required />
</div>
<div class="control-group">
<label for="keepid">
<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()>0?'addClass':'removeClass')]('open');" />
<label for="keepid">{$lang->keep_signed}</label>
</p>
<div id="warning" class="">
<p>{$lang->about_keep_warning}</p>
</div>
<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
{$lang->keep_signed}
</label>
<p id="warning">{$lang->about_keep_warning}</p>
<input type="submit" value="{$lang->cmd_login}" class="submit btn btn-inverse" />
</div>
</fieldset>
</form>
<ul class="help">
<li class="first"><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
<li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li>
</ul>
<p cond="$is_logged" style="text-align:center">
<a href="{getUrl('act','dispMemberLogout','module','')}" class="btn">{$lang->cmd_logout}</a>
</p>
<p cond="!$is_logged && $module != 'admin'" style="text-align:center">
<a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}" class="btn">{$lang->cmd_login}</a>
</p>
</div>
<div class="logOut" cond="$is_logged && $module == 'admin'">
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
</div>
<div class="logOut" cond="!$is_logged && $module != 'admin'">
<span class="buttonAccount"><a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}">{$lang->cmd_login}...</a></span>
<div class="login-footer" cond="!$is_logged">
<div class="pull-right">
<a href="{getUrl('','act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a>
|
<a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a>
</div>
</div>
</div>