merge from 1.7.3.5(r13153:r13167)

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

View file

@ -11,7 +11,7 @@
<!--%import("./filter/openid_login.xml")-->
<!--%import("./js/login.js")-->
<script type="text/javascript">
<script>
var keep_signed_msg = "{$lang->about_keep_signed}";
xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
</script>
@ -46,7 +46,6 @@
<ul class="help">
<li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
<li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
</ul>
</fieldset>
</form>
@ -71,6 +70,6 @@
</form>
<!--@end-->
<script type="text/javascript">
<script>
xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
</script>