merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -44,7 +44,7 @@
<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return doLogin(this, openid_login)" id="oForm">
<fieldset>
<div class="openLeft">
<div class="tInBox"><img src="images/bullet_input_id.gif" width="10" height="12" alt="" /><input type="text" name="openid" class="inputText" title="Open ID" value="" /></div>
<div class="tInBox"><img src="images/bullet_input_id.gif" width="10" height="12" alt="" /><input type="text" name="openid" class="iText" title="Open ID" value="" /></div>
</div>
<div class="right">