merge from 1.5.3.2 (~r11225)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@11226 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-13 06:14:45 +00:00
parent 54e3a72065
commit 77f5aa2671
313 changed files with 8058 additions and 14251 deletions

View file

@ -22,10 +22,6 @@
<!--%import("../skins/default/filter/delete_image_mark.xml")-->
<!--@end-->
<!--@if($member_config->enable_openid=="Y")-->
<!--%import("../skins/default/filter/add_openid_to_member.xml")-->
<!--%import("../skins/default/filter/delete_openid_from_member.xml")-->
<!--@end-->
<div class="bd">
<h2 class="h2">{$lang->msg_update_member}</h2>
<h3 class="h3">{$lang->member_default_info}</h3>
@ -181,22 +177,6 @@
</ul>
</fieldset>
<!--@end-->
<!--@if($member_config->enable_openid=="Y")-->
<h3 class="h3">{$lang->openid}</h3>
<fieldset class="sn">
<ul>
<!--@foreach($openids as $openid)-->
<li><a href="{$openid->bookmarklet}">{$openid->openid}</a> <a onclick="doDeleteOpenIDFromMember('{$openid->openid}')" class="bn"><span>{$lang->cmd_delete}</span></a></li>
<!--@end-->
<li>
<input name="openid" type="text" class="itx" />
<input name="openid_to_delete" type="hidden" />
<a onclick="doAddOpenIDToMember()" class="bn"><span>{$lang->cmd_insert}</span></a>
</li>
</ul>
</fieldset>
<!--@end-->
<div class="cm">
<input type="submit" value="{$lang->cmd_registration}" class="bn"/>
<a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_cancel}</span></a>