Tom Hayakawa
tom_g3x****@users*****
2006年 2月 2日 (木) 14:34:19 JST
Index: xoops2jp/html/modules/user/templates/user_register_form.html diff -u xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.3 xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.4 --- xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.3 Wed Jan 18 02:26:36 2006 +++ xoops2jp/html/modules/user/templates/user_register_form.html Thu Feb 2 14:34:19 2006 @@ -1,73 +1,69 @@ <{if $actionForm->hasError()}> - <ul> - <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message}></li> - <{/foreach}> - </ul> +<ul> + <{foreach item=message from=$actionForm->getErrorMessages()}> + <li><{$message}></li> + <{/foreach}> +</ul> <{/if}> + <form action="index.php?action=Register" method="post"> - <{xoops_token form=$actionForm}> - <table class="outer" cellspacing="1" width="100%"> - <tr> - <th colspan="2"><{$smarty.const._US_USERREG}></th> - </tr> - <tr> - <td class="head"><{$smarty.const._US_NICKNAME}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=uname}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_EMAIL}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=email size=30 maxlength=60}><br/> - <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}> - <{$smarty.const._US_ALLOWVIEWEMAIL}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_WEBSITE}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=url size=30 maxlength=100}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td> - <td class="<{cycle values="odd,even"}>"> - <select name="timezone_offset"> - <{foreach item=timezone from=$timezones}> - <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->get('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option> - <{/foreach}> - </select> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_PASSWORD}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input type=password name=pass value=$actionForm->get('pass') size=10 maxlength=32}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_VERIFYPASS}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input type=password name=vpass value=$actionForm->get('vpass') size=10 maxlength=32}> - </td> - </tr> - <{if $enableAgree}> - <tr> - <td class="head"><{$smarty.const._US_DISCLAIMER}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_textarea name=disclaimer rows=8 cols=50 readonly=true value=$disclaimer}> - <br/> - <{xoops_input type=checkbox name=agree value=1 default=$actionForm->get('agree')}><{$smarty.const._US_IAGREE}> - </td> - </tr> - <{/if}> - <tr> - <td class="head"> </td> - <td class="<{cycle values="odd,even"}>"> - <input type="submit" value="<{$smarty.const._US_SUBMIT}>" /> - </td> - </tr> - </table> +<{xoops_token form=$actionForm}> +<table class="outer" width="100%"> + <tr> + <th colspan="2" style="text-align:center;"><{$smarty.const._US_USERREG}></th> + </tr> + <tr> + <td class="head"><{$smarty.const._US_NICKNAME}></td> + <td class="<{cycle values="odd,even"}>"><{xoops_input name=uname}></td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_EMAIL}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=email size=30 maxlength=60}><br /> + <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}> + <{$smarty.const._US_ALLOWVIEWEMAIL}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_WEBSITE}></td> + <td class="<{cycle values="odd,even"}>"><{xoops_input name=url size=30 maxlength=100}></td> + </tr> + <tr> + <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td> + <td class="<{cycle values="odd,even"}>"> + <select name="timezone_offset"> + <{foreach item=timezone from=$timezones}> + <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->get('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option> + <{/foreach}> + </select> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_PASSWORD}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input type=password name=pass value=$actionForm->get('pass') size=10 maxlength=32}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_VERIFYPASS}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input type=password name=vpass value=$actionForm->get('vpass') size=10 maxlength=32}> + </td> + </tr> + <{if $enableAgree}> + <tr> + <td class="head"><{$smarty.const._US_DISCLAIMER}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_textarea name=disclaimer rows=8 cols=50 readonly=true value=$disclaimer}><br /> + <{xoops_input type=checkbox name=agree value=1 default=$actionForm->get('agree')}> + <{$smarty.const._US_IAGREE}> + </td> + </tr> + <{/if}> + <tr> + <td colsapn="2" class="foot" style="text-align:center;"> + <input type="submit" value="<{$smarty.const._US_SUBMIT}>" /> + </td> + </tr> +</table> </form> Index: xoops2jp/html/modules/user/templates/user_edituser.html diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.5 --- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.4 Thu Jan 19 21:10:01 2006 +++ xoops2jp/html/modules/user/templates/user_edituser.html Thu Feb 2 14:34:19 2006 @@ -1,116 +1,122 @@ -<a href="./index.php?action=UserInfo&uid=<{$actionForm->get('uid')}>"><{$smarty.const._US_PROFILE}></a> <span style="font-weight:bold;">»»</span> <{$smarty.const._US_EDITPROFILE}><br /><br /> +<div> +<a href="./index.php?action=UserInfo&uid=<{$actionForm->get('uid')}>"><{$smarty.const._US_PROFILE}></a> + <span style="font-weight:bold;">»»</span> <{$smarty.const._US_EDITPROFILE}> +</div> + <{if $actionForm->hasError()}> - <ul> - <{foreach item=message from=$actionForm->getErrorMessages()}> - <li><{$message}></li> - <{/foreach}> - </ul> +<ul> + <{foreach item=message from=$actionForm->getErrorMessages()}> + <li><{$message}></li> + <{/foreach}> +</ul> <{/if}> + <form action="./index.php?action=EditUser" method="post"> - <{xoops_token form=$actionForm}> - <{xoops_input name=uid type=hidden value=$actionForm->get('uid')}> - <table class="outer" cellspacing="1" width="100%"> - <tr><th colspan="2"><{$smarty.const._US_EDITPROFILE}></th></tr> - <tr> - <td class="head"><{$smarty.const._US_NICKNAME}></td> - <td class="<{cycle values="odd,even"}>"><{$thisUser->getVar('uname')}></td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_REALNAME}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=name size=30 maxlength=60 value=$actionForm->getVar('name')}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_EMAIL}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=email size=30 maxlength=60 value=$actionForm->getVar('email')}><br/> - <input type="checkbox" name="user_viewemail" value="1" <{if $actionForm->getVar('user_viewemail')}>checked<{/if}> /> - <{$smarty.const._US_ALLOWVIEWEMAIL}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_WEBSITE}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=url size=30 maxlength=100 value=$actionForm->getVar('url')}> - </td> - </tr> - <!--- // TODO TIMEZONE ---> - <tr> - <td class="head"><{$smarty.const._US_ICQ}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=user_icq size=15 maxlength=15 value=$actionForm->getVar('user_icq')}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_AIM}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=user_aim size=18 maxlength=18 value=$actionForm->getVar('user_aim')}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_YIM}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=user_yim size=25 maxlength=25 value=$actionForm->getVar('user_yim')}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_MSNM}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=user_msnm size=30 maxlength=100 value=$actionForm->getVar('user_msnm')}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_LOCATION}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=user_from size=30 maxlength=100 value=$actionForm->getVar('user_from')}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_OCCUPATION}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=user_occ size=30 maxlength=100 value=$actionForm->getVar('user_occ')}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_INTEREST}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input name=user_intrest size=30 maxlength=150 value=$actionForm->getVar('user_intrest')}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_SIGNATURE}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_dhtmltarea name=user_sig value=$actionForm->getVar('user_sig')}><br/> - <input type="checkbox" name="attachsig" value="1" <{if $actionForm->getVar('attachsig')}>checked<{/if}> /> - <{$smarty.const._US_SHOWSIG}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_EXTRAINFO}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_textarea name=bio value=$actionForm->getVar('bio') rows=5 cols=50 id=bio}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_PASSWORD}><br/><{$smarty.const._US_TYPEPASSTWICE}></td> - <td class="<{cycle values="odd,even"}>"> - <{xoops_input type=password name=pass size=10 maxlength=32 value=$actionForm->getVar('pass')}> - <{xoops_input type=password name=vpass size=10 maxlength=32 value=$actionForm->getVar('vpass')}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_MAILOK}></td> - <td class="<{cycle values="odd,even"}>"> - <input type="radio" name="user_mailok" value="1" <{if $actionForm->getVar('user_mailok')==1}>checked<{/if}> />YES - <input type="radio" name="user_mailok" value="0" <{if $actionForm->getVar('user_mailok')==0}>checked<{/if}> />NO - </td> - </tr> - <tr> - <td class="head"> </td> - <td class="<{cycle values="odd,even"}>"> - <input type="submit" value="<{$smarty.const._US_SAVECHANGES}>" /> - </td> - </tr> - </table> +<{xoops_token form=$actionForm}> +<{xoops_input name=uid type=hidden value=$actionForm->get('uid')}> +<table class="outer" cellspacing="1" width="100%"> + <tr> + <th colspan="2"><{$smarty.const._US_EDITPROFILE}></th> + </tr> + <tr> + <td class="head"><{$smarty.const._US_NICKNAME}></td> + <td class="<{cycle values="odd,even"}>"><{$thisUser->getVar('uname')}></td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_REALNAME}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=name size=30 maxlength=60 value=$actionForm->getVar('name')}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_EMAIL}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=email size=30 maxlength=60 value=$actionForm->getVar('email')}><br /> + <input type="checkbox" name="user_viewemail" value="1"<{if $actionForm->getVar('user_viewemail')}>checked<{/if}> /><{$smarty.const._US_ALLOWVIEWEMAIL}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_WEBSITE}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=url size=30 maxlength=100 value=$actionForm->getVar('url')}> + </td> + </tr> + <!--- // TODO TIMEZONE ---> + <tr> + <td class="head"><{$smarty.const._US_ICQ}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=user_icq size=15 maxlength=15 value=$actionForm->getVar('user_icq')}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_AIM}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=user_aim size=18 maxlength=18 value=$actionForm->getVar('user_aim')}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_YIM}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=user_yim size=25 maxlength=25 value=$actionForm->getVar('user_yim')}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_MSNM}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=user_msnm size=30 maxlength=100 value=$actionForm->getVar('user_msnm')}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_LOCATION}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=user_from size=30 maxlength=100 value=$actionForm->getVar('user_from')}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_OCCUPATION}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=user_occ size=30 maxlength=100 value=$actionForm->getVar('user_occ')}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_INTEREST}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=user_intrest size=30 maxlength=150 value=$actionForm->getVar('user_intrest')}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_SIGNATURE}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_dhtmltarea name=user_sig value=$actionForm->getVar('user_sig')}><br /> + <input type="checkbox" name="attachsig" value="1"<{if $actionForm->getVar('attachsig')}>checked<{/if}> /><{$smarty.const._US_SHOWSIG}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_EXTRAINFO}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_textarea name=bio value=$actionForm->getVar('bio') rows=5 cols=50 id=bio}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_PASSWORD}><br /> + <{$smarty.const._US_TYPEPASSTWICE}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input type=password name=pass size=10 maxlength=32 value=$actionForm->getVar('pass')}> + <{xoops_input type=password name=vpass size=10 maxlength=32 value=$actionForm->getVar('vpass')}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_MAILOK}></td> + <td class="<{cycle values="odd,even"}>"> + <input type="radio" name="user_mailok" value="1"<{if $actionForm->getVar('user_mailok')==1}>checked<{/if}> /><{$smarty.const._YES}> + <input type="radio" name="user_mailok" value="0"<{if $actionForm->getVar('user_mailok')==0}>checked<{/if}> /><{$smarty.const._NO}> + </td> + </tr> + <tr> + <td class="head"> </td> + <td class="<{cycle values="odd,even"}>"> + <input type="submit" value="<{$smarty.const._US_SAVECHANGES}>" /> + </td> + </tr> +</table> </form> Index: xoops2jp/html/modules/user/templates/user_register_confirm.html diff -u xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.1 xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.2 --- xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.1 Tue Nov 8 21:13:05 2005 +++ xoops2jp/html/modules/user/templates/user_register_confirm.html Thu Feb 2 14:34:19 2006 @@ -1,20 +1,20 @@ -<table width="100%" class="outer" cellspacing="1"> - <tr> - <td class="head"><{$smarty.const._US_NICKNAME}></td> - <td class="<{cycle values="odd,even"}>"> - <{$registForm->getVar('uname')|escape}> - </td> - </tr> - <tr> - <td class="head"><{$smarty.const._US_EMAIL}></td> - <td class="<{cycle values="odd,even"}>"> - <{$registForm->getVar('email')|escape}> - </td> - </tr> - <tr> - <td class="head"> </td> - <td class="<{cycle values="odd,even"}>"> - <input type="submit" value="<{$smarty.const._US_SUBMIT}>" ID="Submit1" NAME="Submit1"/> - </td> - </tr> -</table> \ No newline at end of file + +<table width="100%" class="outer"> + <tr> + <td class="head"><{$smarty.const._US_NICKNAME}></td> + <td class="<{cycle values="odd,even"}>"> + <{$registForm->getVar('uname')|escape}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_EMAIL}></td> + <td class="<{cycle values="odd,even"}>"> + <{$registForm->getVar('email')|escape}> + </td> + </tr> + <tr> + <td colsapn="2" class="foot" style="text-align:center;"> + <input type="submit" value="<{$smarty.const._US_SUBMIT}>" /> + </td> + </tr> +</table> Index: xoops2jp/html/modules/user/templates/user_userinfo.html diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.5 --- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.4 Thu Jan 26 20:18:37 2006 +++ xoops2jp/html/modules/user/templates/user_userinfo.html Thu Feb 2 14:34:19 2006 @@ -1,33 +1,12 @@ - -<{if $user_ownpage == true}> -<form name="usernav" action="user.php" method="post"> -<table width="70%" align="center" border="0"> - <tr align="center"> - <td> - <input type="button" value="<{$smarty.const._US_EDITPROFILE}>" onclick="location='<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=EditUser&uid=<{$thisUser->getVar('uid')}>'" /> - <input type="button" value="<{$smarty.const._US_AVATAR}>" onclick="location='<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=AvatarEdit&uid=<{$thisUser->getVar('uid')}>'" /> - <{if $user_candelete == true}> - <input type="button" value="<{$smarty.const._US_DELACCOUNT}>" onclick="location='<{$smarty.const.XOOPS_URL}>user.php?op=delete'" /> - <{/if}> - <input type="button" value="<{$smarty.const._US_LOGOUT}>" onclick="location='<{$smarty.const.XOOPS_URL}>/user.php?op=logout'" /> - </td> - </tr> -</table> -</form> - -<{elseif $xoops_isadmin != false}> -<br /><br /> -<table width="70%" align="center" border="0"> - <tr align="center"> - <td> - <input type="button" value="<{$smarty.const._US_EDITPROFILE}>" onclick="location='<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=EditUser&uid=<{$thisUser->getVar('uid')}>'" /> - <input type="button" value="<{$smarty.const._US_AVATAR}>" onclick="location='<{$smarty.const.XOOPS_URL}>edituser.php?op=avatarform'" /> - <input type="button" value="<{$smarty.const._US_DELACCOUNT}>" onclick="location='<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserDelete&uid=<{$thisUser->getVar('uid')}>'" /> - </td> - </tr> -</table> -<br /><br /> - +<{if $user_ownpage == true && $user_candelete == true}> + <div style="text-align:right;"> + <a href="<{$smarty.const.XOOPS_URL}>/user.php?op=delete"><{$smarty.const._US_DELACCOUNT}></a> + </div> +<{elseif $xoops_isadmin == true}> + <div style="text-align:right;"> + <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=EditUser&uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_EDITPROFILE}></a> - + <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserDelete&uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_DELACCOUNT}></a> + </div> <{/if}> <table width="100%" border="0" cellspacing="5"> @@ -36,15 +15,33 @@ <table class="outer" cellpadding="4" cellspacing="1" width="100%"> <tr> - <th colspan="2" align="center"><{$smarty.const._US_ALLABOUT|replace:"%s":$thisUser->getVar('uname')}></th> + <th colspan="2" style="text-align:center;"> + <{$smarty.const._US_ALLABOUT|replace:"%s":$thisUser->getVar('uname')}> + </th> + </tr> + <{if $user_ownpage == true}> + <tr> + <td class="head" colspan="2" style="text-align:center;"> + <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=EditUser&uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_EDITPROFILE}></a> + </td> </tr> + <{/if}> <tr valign="top"> <td class="head"><{$smarty.const._US_AVATAR}></td> - <td align="center" class="even"><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$thisUser->getVar('user_avatar')}>" alt="Avatar" /></td> + <td class="even" style="text-align:center;"> + <{if $thisUser->getVar('user_avatar') != "blank.gif" }> + <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$thisUser->getVar('user_avatar')}>" alt="Avatar" /> + <{else}> + <img src="<{$smarty.const.XOOPS_URL}>/modules/user/no_avatar.gif" alt="No Avatar" /> + <{/if}> + <{if $user_ownpage == true}> + <br /><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=AvatarEdit&uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></a> + <{/if}> + </td> </tr> <tr> <td class="head"><{$smarty.const._US_REALNAME}></td> - <td align="center" class="odd"><{$thisUser->getVar('name')}></td> + <td class="odd" style="text-align:center;"><{$thisUser->getVar('name')}></td> </tr> <tr> <td class="head"><{$smarty.const._US_WEBSITE}></td> @@ -53,16 +50,18 @@ <tr valign="top"> <td class="head"><{$smarty.const._US_EMAIL}></td> <td class="odd"> - <{if $thisUser->getVar('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }> - <{mailto address=$thisUser->getVar('email') encode="javascript"}> - <{/if}> + <{if $thisUser->getVar('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }> + <{mailto address=$thisUser->getVar('email') encode="javascript"}> + <{/if}> </td> </tr> <tr valign="top"> <td class="head"><{$smarty.const._US_PM}></td> <td class="even"> - <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&to_userid=<{$thisUser->getVar('uid')}>', 'pmlite', 450, 380);"><img src="<{$smarty.const.XOOPS_URL}>/images/icons/pm.gif" alt="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getVar('uname')}>" /></a> - <{$user_pmlink}></td> + <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&to_userid=<{$thisUser->getVar('uid')}>', 'pmlite', 450, 380);"> + <img src="<{$smarty.const.XOOPS_URL}>/images/icons/pm.gif" alt="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getVar('uname')}>" /></a> + <{$user_pmlink}> + </td> </tr> <tr valign="top"> <td class="head"><{$smarty.const._US_ICQ}></td> @@ -101,30 +100,32 @@ <td width="50%"> <table class="outer" cellpadding="4" cellspacing="1" width="100%"> <tr valign="top"> - <th colspan="2" align="center"><{$smarty.const._US_STATISTICS}></th> + <th colspan="2" style="text-align:center;"><{$smarty.const._US_STATISTICS}></th> </tr> <tr valign="top"> <td class="head"><{$smarty.const._US_MEMBERSINCE}></td> - <td align="center" class="even"><{$thisUser->getVar('user_regdate')|xoops_formattimestamp:l}></td> + <td class="even" style="text-align:center;"><{$thisUser->getVar('user_regdate')|xoops_formattimestamp:l}></td> </tr> <tr valign="top"> <td class="head"><{$smarty.const._US_RANK}></td> - <td align="center" class="odd"><img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$rank->getVar('rank_image')}>" /><br /> - <{$rank->getVar('rank_title')}></td> + <td class="odd" style="text-align:center;"> + <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$rank->getVar('rank_image')}>" /><br /> + <{$rank->getVar('rank_title')}> + </td> </tr> <tr valign="top"> <td class="head"><{$smarty.const._US_POSTS}></td> - <td align="center" class="even"><{$thisUser->getVar('posts')}></td> + <td class="even" style="text-align:center;"><{$thisUser->getVar('posts')}></td> </tr> <tr valign="top"> <td class="head"><{$smarty.const._US_LASTLOGIN}></td> - <td align="center" class="odd"><{$thisUser->getVar('last_login')|xoops_formattimestamp:l}></td> + <td class="odd" style="text-align:center;"><{$thisUser->getVar('last_login')|xoops_formattimestamp:l}></td> </tr> </table> <br /> <table class="outer" cellpadding="4" cellspacing="1" width="100%"> <tr valign="top"> - <th colspan="2" align="center"><{$smarty.const._US_SIGNATURE}></th> + <th colspan="2" style="text-align:center;"><{$smarty.const._US_SIGNATURE}></th> </tr> <tr valign="top"> <td class="even"><{$user_signature}></td> @@ -150,4 +151,4 @@ <{/if}> </p> <{/foreach}> -<!-- end module search results loop --> +<!-- end module search results loop --> \ No newline at end of file Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.1 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.2 --- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.1 Thu Jan 26 20:17:46 2006 +++ xoops2jp/html/modules/user/templates/user_avatar_edit.html Thu Feb 2 14:34:19 2006 @@ -1,3 +1,8 @@ +<div> +<a href="./index.php?action=UserInfo&uid=<{$actionForm->get('uid')}>"><{$smarty.const._US_PROFILE}></a> + <span style="font-weight:bold;">»»</span> <{$smarty.const._MD_USER_LANG_AVATAR_EDIT}> +</div> + <{if $allowUpload}> <{if $actionForm->hasError()}> <ul> @@ -6,37 +11,34 @@ <{/foreach}> </ul> <{/if}> + <form action="?action=AvatarUpload" method="post" enctype="multipart/form-data"> <{xoops_token form=$actionForm}> <{xoops_input type=hidden name=uid value=$actionForm->getVar('uid')}> - <table class="outer" cellspacing="1"> + <table class="outer"> <tr> - <th><{$smarty.const._MD_USER_LANG_AVATAR_WIDTH}></th> - <td class="odd"> - <{$avatarWidth}> - </td> + <th colspan="2" style="text-align:center;"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></th> </tr> <tr> - <th><{$smarty.const._MD_USER_LANG_AVATAR_HEIGHT}></th> - <td class="odd"> - <{$avatarHeight}> + <td class="head"><{$smarty.const._MD_USER_LANG_AVATAR_WIDTH_HIGHT}></td> + <td class="<{cycle values="odd,even"}>"> + <{$avatarWidth}> x <{$avatarHeight}> (px) </td> </tr> <tr> - <th><{$smarty.const._MD_USER_LANG_AVATAR_MAXFILESIZE}></th> - <td class="odd"> - <{$avatarMaxfilesize}> + <td class="head"><{$smarty.const._MD_USER_LANG_AVATAR_MAXFILESIZE}></td> + <td class="<{cycle values="odd,even"}>"> + <{$avatarMaxfilesize|number_format}> (bytes) </td> </tr> <tr> - <th><{$smarty.const._MD_USER_LANG_AVATAR}></th> - <td class="odd"> - <input type="file" name="uploadavatar" /> + <td class="head"><{$smarty.const._MD_USER_LANG_AVATAR}></td> + <td class="<{cycle values="odd,even"}>"> + <input type="file" name="uploadavatar" size="30" /> </td> </tr> <tr> - <th><{$smarty.const._MD_USER_LANG_CONTROL}></th> - <td class="foot"> + <td colspan="2" class="foot" style="text-align:center;"> <input type="submit" value="<{$smarty.const._SUBMIT}>" class="formButton" /> </td> </tr> @@ -47,22 +49,20 @@ <form action="index.php?action=AvatarSelect" method="POST"> <{xoops_token form=$avatarSelectForm}> <{xoops_input type=hidden name=uid value=$avatarSelectForm->get('uid')}> - <table class="outer" cellspacing="1"> - <{foreach item=obj from=$systemAvatars}> - <tr class="<{cycle values='odd,even'}>"> - <td> - <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('avatar_file')}>" /> - </td> - <td> - <{$obj->getVar('avatar_name')}> - </td> - <td> + <table class="outer" style="text-align:center;"> + <tr> + <th colspan="5"><{$smarty.const._MD_USER_LANG_AVATAR_LIST}></th> + </tr> + <tr> + <{foreach item=obj from=$systemAvatars}> + <td class="<{cycle values="odd,even" name="class"}>" style="text-align:center;"> + <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('avatar_file')}>" /><br /> + <{$obj->getVar('avatar_name')}><br /> <input name="avatar_id[<{$obj->getVar('avatar_id')}>]" type="submit" value="<{$smarty.const._MD_USER_LANG_SELECT}>" /> - </td> - </tr> - <{/foreach}> + <{cycle name="table" values="</td>,</td>,</td>,</td>,</td></tr><tr>"}> + <{/foreach}> + </tr> </table> </form> -<br /> -<div style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div> +<div class="pagenavi" style="text-align:center;"><{xoops_pagenavi pagenavi=$pageNavi}></div> \ No newline at end of file Index: xoops2jp/html/modules/user/templates/user_userform.html diff -u xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.2 xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.3 --- xoops2jp/html/modules/user/templates/user_userform.html:1.1.2.2 Wed Oct 26 01:47:15 2005 +++ xoops2jp/html/modules/user/templates/user_userform.html Thu Feb 2 14:34:19 2006 @@ -1,11 +1,11 @@ <fieldset style="padding: 10px;"> <legend style="font-weight: bold;"><{$smarty.const._LOGIN}></legend> - <form action="<{$smarty.const.XOOPS_URL}>/user.php" method="post" ID="Form1"> - <{$smarty.const._USERNAME}> <input type="text" name="uname" size="26" maxlength="25" value="<{$usercookie}>" ID="Text1"/><br /> - <{$smarty.const._PASSWORD}> <input type="password" name="pass" size="21" maxlength="32" ID="Password1"/><br /> - <input type="hidden" name="op" value="login" ID="Hidden1"/> - <input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" ID="Hidden2"/> - <input type="submit" value="<{$smarty.const._LOGIN}>" ID="Submit1" NAME="Submit1"/> + <form action="<{$smarty.const.XOOPS_URL}>/user.php" method="post" > + <{$smarty.const._USERNAME}> <input type="text" name="uname" size="26" maxlength="25" value="<{$usercookie}>" /><br /> + <{$smarty.const._PASSWORD}> <input type="password" name="pass" size="21" maxlength="32" /><br /> + <input type="hidden" name="op" value="login" /> + <input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" /> + <input type="submit" value="<{$smarty.const._LOGIN}>" /> </form> <a name="lost"></a> <div><{$smarty.const._US_NOTREGISTERED}><br /></div> @@ -16,7 +16,10 @@ <fieldset style="padding: 10px;"> <legend style="font-weight: bold;"><{$smarty.const._US_LOSTPASSWORD}></legend> <div><br /><{$smarty.const._US_NOPROBLEM}></div> - <form action="lostpass.php" method="post" ID="Form2"> - <{$smarty.const._US_YOUREMAIL}> <input type="text" name="email" size="26" maxlength="60" ID="Text2"/> <input type="hidden" name="op" value="mailpasswd" ID="Hidden3"/><input type="submit" value="<{$smarty.const._US_SENDPASSWORD}>" ID="Submit2" NAME="Submit2"/> + <form action="lostpass.php" method="post"> + <{$smarty.const._US_YOUREMAIL}> + <input type="text" name="email" size="26" maxlength="60" /> + <input type="hidden" name="op" value="mailpasswd" /> + <input type="submit" value="<{$smarty.const._US_SENDPASSWORD}>" /> </form> -</fieldset> \ No newline at end of file +</fieldset> Index: xoops2jp/html/modules/user/templates/user_default.html diff -u xoops2jp/html/modules/user/templates/user_default.html:1.1.2.2 xoops2jp/html/modules/user/templates/user_default.html:1.1.2.3 --- xoops2jp/html/modules/user/templates/user_default.html:1.1.2.2 Thu Jan 19 21:10:01 2006 +++ xoops2jp/html/modules/user/templates/user_default.html Thu Feb 2 14:34:19 2006 @@ -1,11 +1,29 @@ -<fieldset style="padding: 10px;"> - <legend style="font-weight: bold;"><{$smarty.const._LOGIN}></legend> - <form action="index.php" method="post"> - <{xoops_token form=$actionForm}> - <{$smarty.const._US_USERNAME}> : <{xoops_input name=uname size=26 maxlength=25 value="" }> - <{$smarty.const._US_PASSWORD}> : <{xoops_input type=password name=pass size=21 maxlength=32 value="" }> - <input type="submit" value="<{$smarty.const._LOGIN}>" /> - </form> - <div><{$smarty.const._US_NOTREGISTERED}></div> +<form action="<{$smarty.const.XOOPS_URL}>/user.php" method="post"> +<input type="hidden" name="op" value="login" /> +<input type="hidden" name="xoops_redirect" value="<{$redirect_page}>" /> +<table class="outer"> + <tr> + <th colspan="2" style="text-align:center;"><{$smarty.const._LOGIN}></th> + </tr> + <tr> + <td class="head"><{$smarty.const._USERNAME}></td> + <td class="<{cycle values="odd,even"}>"> + <input type="text" name="uname" size="25" maxlength="25" value="<{$usercookie}>" /> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._PASSWORD}></td> + <td class="<{cycle values="odd,even"}>"> + <input type="password" name="pass" size="30" maxlength="32" /> + </td> + </tr> + <tr> + <td colspan="2" class="foot" style="text-align:center;"> + <input type="submit" value="<{$smarty.const._LOGIN}>" /> + </td> + </tr> +</table> +</form> + +<div style="text-align:center;"><{$smarty.const._US_NOTREGISTERED}></div> -</fieldset> Index: xoops2jp/html/modules/user/templates/user_lostpass.html diff -u xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.2 xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.3 --- xoops2jp/html/modules/user/templates/user_lostpass.html:1.1.2.2 Thu Jan 19 21:10:01 2006 +++ xoops2jp/html/modules/user/templates/user_lostpass.html Thu Feb 2 14:34:19 2006 @@ -6,12 +6,28 @@ </ul> <{/if}> -<fieldset style="padding: 10px;"> - <legend style="font-weight: bold;"><{$smarty.const._US_LOSTPASSWORD}></legend> - <div><{$smarty.const._US_NOPROBLEM}></div> - <form action="index.php?action=Lostpass" method="post"> - <{xoops_token form=$actionForm}> - <{xoops_input name=email value=$actionForm->get('email') size=34 maxlength=34}> - <input type="submit" value="<{$smarty.const._SEND}>" /> - </form> -</fieldset> \ No newline at end of file +<form action="index.php?action=Lostpass" method="post"> +<{xoops_token form=$actionForm}> +<table class="outer"> + <tr> + <th colspan="2" style="text-align:center;"><{$smarty.const._US_LOSTPASSWORD}></th> + </tr> + <tr> + <td colspan="2" class="<{cycle values="odd,even"}>"> + <{$smarty.const._US_NOPROBLEM}> + </td> + </tr> + <tr> + <td class="head"><{$smarty.const._US_EMAIL}></td> + <td class="<{cycle values="odd,even"}>"> + <{xoops_input name=email value=$actionForm->get('email') size=34 maxlength=34}> + </td> + </tr> + </tr> + <tr> + <td colspan="2" class="foot" style="text-align:center;"> + <input type="submit" value="<{$smarty.const._SEND}>" /> + </td> + </tr> +</table> +</form>