Tatsuki SUGIURA
sugi****@users*****
2006年 7月 12日 (水) 20:41:50 JST
スラドIndex: slashjp/plugins/Login/templates/changePasswd;login;default
diff -u slashjp/plugins/Login/templates/changePasswd;login;default:1.2 slashjp/plugins/Login/templates/changePasswd;login;default:1.3
--- slashjp/plugins/Login/templates/changePasswd;login;default:1.2 Fri Dec 31 21:36:50 2004
+++ slashjp/plugins/Login/templates/changePasswd;login;default Wed Jul 12 20:41:50 2006
@@ -12,26 +12,30 @@
__name__
changePasswd
__template__
-<h2>[% IF form.note == "Please change your password now!";
- "Please change your password now! ";
-END; note %]</h2>
-
-[% title = "Change password for $user.nickname ($user.uid)" %]
-[% PROCESS prefs_titlebar tab_selected='password' %]
-
-<table align="CENTER" width="100%" bgcolor="[% user.colors.bg_5 %]">
- <tr>
- <td>
+<div id="slashboxes">
+ [% PROCESS userboxes %]
+</div>
+[% thisnickname = user.nickname | strip_literal;
+ title = "Change password for $thisnickname ($user.uid)" %]
+<div id="users-blocks">
+ [% PROCESS prefs_titlebar tab_selected='password' %]
+ <div class="generalbody">
+[% IF form.note == "Please change your password now!";
+ "Please change your password now! ";
+END; note %]
+
[% IF constants.offer_insecure_login_link -%]
<p>You can automatically log in by clicking
- <a href="[% constants.real_rootdir %]/index.pl?op=userlogin&logtoken=[% user.logtoken | fixparam %]">This Link</a> and Bookmarking the resulting page.
+ <a href="[% constants.real_rootdir %]/index.pl?op=userlogin&logtoken=[% user.logtoken | strip_paramattr %]">This Link</a> and Bookmarking the resulting page.
This is totally insecure, but very convenient.
</p>
[%- END %]
- <form action="[% constants.real_rootdir %]/login.pl" method="POST">
+ <form action="[% constants.real_rootdir %]/login.pl" method="post">
+ <fieldset>
+ <legend></legend>
[% PROCESS formkey_tag %]
- <input type="HIDDEN" name="uid" value="[% user.uid %]">
+ <input type="hidden" name="uid" value="[% user.uid %]">
[%- session = Slash.db.getDescriptions('session_login');
session_sel = Slash.createSelect('session_login', session, user.session_login, 1);
@@ -50,22 +54,32 @@
other cookies for this account, requiring all other browsers using this account
to reauthenticate.</p>
- [% PROCESS formLabel value => "Current Password" comment => "To change your password, enter your current password" %]
- <input type="PASSWORD" name="oldpass" size="20" maxlength="20" value=""><br>
-
- [% PROCESS formLabel value => "New Password" comment => "Enter your new password twice, must be 6-20 chars long" %]
- <input type="PASSWORD" name="pass1" size="20" maxlength="20">
- <input type="PASSWORD" name="pass2" size="20" maxlength="20">
-
- </td>
- </tr>
-</table>
-
-<input type="HIDDEN" name="op" value="saveprefs">
-<input type="SUBMIT" value="Change Login Prefs">
-</form>
-
+ <label>
+ Current Password
+ </label>
+ <div class="note">
+ To change your password, enter your current password.
+ </div>
+
+ <input type="password" name="oldpass" size="20" maxlength="20" value=""><br>
+
+ <label>
+ New Password
+ </label>
+ <div class="note">
+ Enter your new password twice, must be 6-20 chars long.
+ </div>
+ <input type="password" name="pass1" size="20" maxlength="20">
+ <input type="password" name="pass2" size="20" maxlength="20">
+
+
+ <input type="hidden" name="op" value="saveprefs">
+ <input type="submit" value="Change Login Prefs" class="button">
+ </fieldset>
+ </form>
+ </div>
+</div>
__seclev__
500
__version__
-$Id: changePasswd;login;default,v 1.2 2004/12/31 12:36:50 oliver Exp $
+$Id: changePasswd;login;default,v 1.3 2006/07/12 11:41:50 sugi Exp $
Index: slashjp/plugins/Login/templates/data;login;default
diff -u slashjp/plugins/Login/templates/data;login;default:1.2 slashjp/plugins/Login/templates/data;login;default:1.3
--- slashjp/plugins/Login/templates/data;login;default:1.2 Fri Dec 31 21:36:50 2004
+++ slashjp/plugins/Login/templates/data;login;default Wed Jul 12 20:41:50 2006
@@ -156,4 +156,4 @@
__seclev__
10000
__version__
-$Id: data;login;default,v 1.2 2004/12/31 12:36:50 oliver Exp $
+$Id: data;login;default,v 1.3 2006/07/12 11:41:50 sugi Exp $
Index: slashjp/plugins/Login/templates/loginForm;login;default
diff -u slashjp/plugins/Login/templates/loginForm;login;default:1.2 slashjp/plugins/Login/templates/loginForm;login;default:1.3
--- slashjp/plugins/Login/templates/loginForm;login;default:1.2 Fri Dec 31 21:36:50 2004
+++ slashjp/plugins/Login/templates/loginForm;login;default Wed Jul 12 20:41:50 2006
@@ -12,89 +12,71 @@
__name__
loginForm
__template__
+<div id="users" class="wide">
[% title = form.unickname ? 'Error Logging In' : 'Log In' %]
+ [% PROCESS titlebar %]
+ <div class="generalbody">
+ <form action="[% constants.real_rootdir %]/login.pl" method="post">
+ <fieldset>
+ <legend>Login</legend>
+ <input type="hidden" name="op" value="userlogin">
+ [% IF form.unickname %]
+ [% user_uid = Slash.db.getUserUID(form.unickname) %]
+ <p class="message">
+ [% IF user.state.login_failed_reason == 'nopost' %]
+ This IP address or network has been used to abuse the system and logins from it have been disabled. If you feel that this is unwarranted, feel free to include your IP address (<b>[% env.remote_addr %]</b>) in the subject of an email to <a href="mailto:[% constants.adminmail_ban | strip_attribute %]">[% constants.adminmail_ban %]</a>, and we will examine why there is a ban. If you fail to include the IP address (again, <em>in the subject!</em>), then your message will be deleted and ignored. I mean come on, we're good, we're not psychic.
+ [% ELSE %]
+ Danger, Will Robinson! You didn't log in! You apparently put in the wrong password, or the wrong nickname. Either try again, or <a href="[% constants.real_rootdir %]/login.pl?op=mailpasswdform">have your password mailed to you</a> if you forgot your password.
+ [% END %]
+ </p>
+ [% IF user_uid and Slash.db.getUser(user_uid, "waiting_for_account_verify") %]
+ <p class="message">
+ A request to verify your account information has been sent to the e-mail associated with this account. Your password has been reset. This is likely the reason you're having difficult logging in at the moment.
+ <br>
+ <br>
+ Please check your e-mail for your updated login information or <a href="[% constants.real_rootdir %]/login.pl?op=mailpasswdform">have the updated password mailed to you</a>.
+ </p>
+ [% END %]
+ [% IF constants.allow_anonymous %]
+ <p class="message">
+ Logging in will allow you to post comments as yourself. If you don't log in, you will only be able to post as [% Slash.getCurrentAnonymousCoward("nickname") %].
+ </p>
+
+ [% ELSE %]
+ <p class="message">
+ You can only post comments if you have a valid account.
+ </p>
+ [% END %]
+ [% END %]
+ <label>
+ Nickname
+ </label>
+ <input type="text" name="unickname" size="20" value="[% form.unickname | strip_attribute %]">
+ <label>
+ Password
+ </label>
+ <input type="password" name="upasswd" size="20" maxlength="20">
+ <div class="note">
+ (6-20 characters long)
+ </div>
+ <label class="checkbox">
+ <input type="checkbox" name="login_temp" value="yes" class="checkbox">
+ Public Terminal
+ </label>
+ <input type="submit" name="userlogin" value="Log in" class="button">
+ </fieldset>
+ </form>
-[% PROCESS titlebar width="75%" %]
-
-<form action="[% constants.real_rootdir %]/login.pl" method="POST">
-<input type="HIDDEN" name="op" value="userlogin">
-<table width="75%">
-[% IF form.unickname %]
- [% user_uid = Slash.db.getUserUID(form.unickname) %]
- <tr><td colspan="2">
- <p>
- [% IF user.state.login_failed_reason == 'nopost' %]
- This IP address or network has been used to abuse the system and
- logins from it have been disabled. If you feel that this is
- unwarranted, feel free to include your IP address
- (<b>[% env.remote_addr %]</b>) in the subject of an email to
- <a href="mailto:[% constants.adminmail_ban | strip_attribute %]">[% constants.adminmail_ban %]</a>,
- and we will examine why there is a ban. If you fail to include
- the IP address (again, <em>in the subject!</em>), then your
- message will be deleted and ignored. I mean come on, we're good,
- we're not psychic.
- [% ELSE %]
- Danger, Will Robinson! You didn't log in! You apparently put
- in the wrong password, or the wrong nickname. Either try again,
- or <a href="[% constants.real_rootdir %]/login.pl?op=mailpasswdform">have
- your password mailed to you</a> if you forgot your password.
- [% END %]
- </p>
- [% IF user_uid and Slash.db.getUser(user_uid, "waiting_for_account_verify") %]
- <p>
- <b>Note:</b> A request to verify your account information has been sent to
- the e-mail associated with this account. Your password has been reset. This
- is likely the reason you're having difficult logging in at the moment.
- </p>
- <p>
- Please check your e-mail for your updated login information or
- <a href="[% constants.real_rootdir %]/login.pl?op=mailpasswdform">have
- the updated password mailed to you</a>.
- </p>
- [% END %]
-
- [% IF constants.allow_anonymous %]
<p>
- Logging in will allow you to post comments as yourself. If you
- don't log in, you will only be able to post as
- [% Slash.getCurrentAnonymousCoward("nickname") %].
+ Forget your password? <a href="[% constants.real_rootdir %]/login.pl?op=mailpasswdform">Have your password mailed to you</a> by entering your nickname, uid, or email address.
</p>
-
- [% ELSE %]
<p>
- You can only post comments if you have a valid account.
+ <a href="[% constants.real_rootdir %]/login.pl?op=newuserform">Create a new account</a> if you don't have one already.
</p>
-
- [% END %]
- </td></tr>
-[% END %]
-
- <tr>
- <td><b>Nickname:</b></td>
- <td><input type="TEXT" name="unickname" size="20" value="[% form.unickname | strip_attribute %]">
- </td>
- </tr>
- <tr>
- <td><b>Password:</b> (6-20 characters long)</td>
- <td><input type="PASSWORD" name="upasswd" size="20" maxlength="20">
- </td>
- </tr>
- <tr>
- <td><input type="CHECKBOX" name="login_temp" value="yes"> Public Terminal</td>
- <td><input type="SUBMIT" name="userlogin" value="Log in"></td>
- </tr>
-</table>
-</form>
-
-<p>
-Forget your password? <a href="[% constants.real_rootdir %]/login.pl?op=mailpasswdform">Have your
-password mailed to you</a> by entering your nickname, uid, or email address.<br>
-<a href="[% constants.real_rootdir %]/login.pl?op=newuserform">Create a new account</a>
-if you don't have one already.<br>
-</p>
-
+ </div>
+</div>
__seclev__
500
__version__
-$Id: loginForm;login;default,v 1.2 2004/12/31 12:36:50 oliver Exp $
+$Id: loginForm;login;default,v 1.3 2006/07/12 11:41:50 sugi Exp $
Index: slashjp/plugins/Login/templates/newUserForm;login;default
diff -u slashjp/plugins/Login/templates/newUserForm;login;default:1.1 slashjp/plugins/Login/templates/newUserForm;login;default:1.2
--- slashjp/plugins/Login/templates/newUserForm;login;default:1.1 Fri Dec 31 21:36:50 2004
+++ slashjp/plugins/Login/templates/newUserForm;login;default Wed Jul 12 20:41:50 2006
@@ -13,48 +13,50 @@
__name__
newUserForm
__template__
-[% IF note %][% note %][% END %]
-
-[% PROCESS titlebar title="Create Account" width="100%" %]
-
-[% chars = constants.nick_chars;
- chars = chars.replace('abcdefghijklmnopqrstuvwxyz', 'a-z');
- chars = chars.replace('ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'A-Z');
- chars = chars.replace('0123456789', '0-9');
-%]
-
-<form action="[% constants.real_rootdir %]/login.pl" method="POST">
-<table align="CENTER" width="95%" bgcolor="[% user.colors.bg_2 %]">
-[% PROCESS formkey_tag %]
- <tr>
- <td><p>(Note: only the characters <tt>[% chars | strip_literal %]</tt>, plus space,
- are allowed in nicknames, and all others will be stripped out.)<br>
- </td>
- </tr>
- <tr>
- <td>
- <b>Nick Name</b><br>
- <input type="TEXT" name="newusernick" value="">
- </td>
- </tr>
- <tr>
- <td>
- <p>Email address to send your registration information to.
- This address will <b>not</b> be displayed on [% constants.sitename %]
- without you setting your preferences to display it.</p>
- </td>
- </tr>
- <tr>
- <td>
- <b>Real Email</b> <br>
- <input type="HIDDEN" name="op" value="newuser">
- <input type="TEXT" name="email" value="" size="40"><br>
- <b>Retype Real Email</b> (these two email addresses must match)<br>
- <input type="TEXT" name="email2" value="" size="40"><br>
- <input type="CHECKBOX" name="comment_reply" value="1" checked> Replies to my comments will be mailed to me<br>
- <input type="CHECKBOX" name="newsletter" value="1"> Send me the newsletter<br>
- <input type="CHECKBOX" name="headlines" value="1"> Send me the daily headlines<br>
- My timezone is [%
+<div id="users" class="wide">
+ [% PROCESS titlebar title="Create Account" %]
+ <div class="generalbody">
+ [% IF note %]
+ [% note %]
+ [% END %]
+ [% chars = constants.nick_chars;
+ chars = chars.replace('abcdefghijklmnopqrstuvwxyz', 'a-z');
+ chars = chars.replace('ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'A-Z');
+ chars = chars.replace('0123456789', '0-9');
+ %]
+ <form action="[% constants.real_rootdir %]/login.pl" method="post">
+ <fieldset>
+ <legend></legend>
+ [% PROCESS formkey_tag %]
+ <label>
+ Nick Name
+ </label>
+ <input type="text" name="newusernick" value="">
+ <div class="note">
+ (Note: only the characters <tt>[% chars | strip_literal %]</tt>, plus space, are allowed in nicknames, and all others will be stripped out.)
+ </div>
+ <label>
+ Email Address
+ </label>
+ <input type="hidden" name="op" value="newuser">
+ <input type="text" name="email" value="" size="40">
+ <input type="text" name="email2" value="" size="40">
+ <div class="note">
+ Enter a valid email address <b>twice</b> to send your registration information to. This address will <b>not</b> be displayed on [% constants.sitename %] without you setting your preferences to display it.
+ </div>
+ <label>
+ <input type="checkbox" name="comment_reply" value="1" checked> Replies to my comments will be mailed to me
+ </label>
+ <label>
+ <input type="checkbox" name="newsletter" value="1"> Send me the newsletter
+ </label>
+ <label>
+ <input type="checkbox" name="headlines" value="1"> Send me the daily headlines
+ </label>
+ <label>
+ My timezone
+ </label>
+ [%
USE this_format = format('%+0.4d %s');
this_tzdescs = Slash.db.getDescriptions('tzdescription');
this_tzcodes = Slash.db.getDescriptions('tzcodes');
@@ -69,36 +71,33 @@
Slash.createSelect('tzcode',
these_tzdescs, this_tzcode, 1, 0, this_tzcodes.nsort
);
- %]<br>
+ %]
+ <div class="note">
+ Select your current local time.
+ </div>
[% IF constants.plugin.HumanConf && constants.hc && constants.hc_sw_newuser && user.state.hc %]
[% IF user.state.hcinvalid %]
[% user.state.hcerror %]
[% ELSE %]
- <table cellspacing=1 border=0><tr valign="MIDDLE">
- <td>[% user.state.hcquestion %]</td>
- <td>[% user.state.hchtml %]</td>
- <td><input type="TEXT" name="hcanswer"
- value=""
- size=8 maxlength=8></td>
- </tr></table>
+ <label>
+ [% user.state.hcquestion %]
+ [% user.state.hchtml %]
+ <input type="text" name="hcanswer" value="" size=8 maxlength=8>
+ </label>
<p>Click the button to create your account and be mailed a password.</p>
- <input type="SUBMIT" name="newuser" value="Create Account">
+ <input type="submit" name="newuser" value="Create Account">
[% END %]
[% ELSE %]
- <input type="SUBMIT" name="newuser" value="Create Account">
+ <input type="submit" name="newuser" value="Create Account">
[% END %]
-
- </td>
- </tr>
-</table>
+</fieldset>
</form>
-
-<p>
-<a href="[% constants.real_rootdir %]/login.pl?op=userlogin">Log in to [% constants.sitename %]</a>.<br>
-Forget your password? <a href="[% constants.real_rootdir %]/login.pl?op=mailpasswdform">Have your
-password mailed to you</a> by entering your nickname, uid, or email address.
-</p>
+ <p>
+ <a href="[% constants.real_rootdir %]/login.pl?op=userlogin">Log in to [% constants.sitename %]</a>.<br> Forget your password? <a href="[% constants.real_rootdir %]/login.pl?op=mailpasswdform">Have your password mailed to you</a> by entering your nickname, uid, or email address.
+ </p>
+ </div>
+</div>
__seclev__
10000
__version__
-$Id: newUserForm;login;default,v 1.1 2004/12/31 12:36:50 oliver Exp $
+$Id: newUserForm;login;default,v 1.2 2006/07/12 11:41:50 sugi Exp $
Index: slashjp/plugins/Login/templates/sendPasswdForm;login;default
diff -u slashjp/plugins/Login/templates/sendPasswdForm;login;default:1.2 slashjp/plugins/Login/templates/sendPasswdForm;login;default:1.3
--- slashjp/plugins/Login/templates/sendPasswdForm;login;default:1.2 Fri Dec 31 21:36:50 2004
+++ slashjp/plugins/Login/templates/sendPasswdForm;login;default Wed Jul 12 20:41:50 2006
@@ -13,27 +13,19 @@
__template__
[% IF note %][% note %][% END %]
-<form action="[% constants.real_rootdir %]/login.pl" method="POST">
-<input type="HIDDEN" name="op" value="mailpasswd">
+[% PROCESS titlebar title="Mail Password" %]
+<div class="generalbody">
+<form action="[% constants.real_rootdir %]/login.pl" method="post">
+<fieldset>
+<legend> </legend>
+<input type="hidden" name="op" value="mailpasswd">
[% PROCESS formkey_tag %]
-
-<table width="75%">
- <tr>
- <td>
-[% PROCESS titlebar title="Mail Password" width="100%" %]
- </td>
- </tr>
- <tr>
- <td>
<p>
Forget your password? Enter your nickname, UID, or email address
here to have the system mail your password to you.
</p>
- </td>
- </tr>
- <tr>
- <td><b>Nickname/UID/Email</b>
- <input type="TEXT" name="unickname" size="20" value="[% form.unickname | strip_attribute %]">
+ <b>Nickname/UID/Email</b>
+ <input type="text" name="unickname" size="20" value="[% form.unickname | strip_attribute %]">
<br>
[% IF constants.plugin.HumanConf && constants.hc && constants.hc_sw_mailpasswd && user.state.hc %]
[% IF user.state.hcinvalid %]
@@ -42,19 +34,16 @@
<table cellspacing=1 border=0><tr valign="MIDDLE">
<td>[% user.state.hcquestion %]</td>
<td>[% user.state.hchtml %]</td>
- <td><input type="TEXT" name="hcanswer"
+ <td><input type="text" name="hcanswer"
value=""
size=8 maxlength=8></td>
</tr></table>
- <input type="SUBMIT" name="mailpasswd" value="Mail Password">
+ <input type="submit" name="mailpasswd" value="Mail Password">
[% END %]
[% ELSE %]
- <input type="SUBMIT" name="mailpasswd" value="Mail Password">
+ <input type="submit" name="mailpasswd" value="Mail Password">
[% END %]
-
- </td>
- </tr>
-</table>
+</fieldset>
</form>
[% IF user.is_anon %]
<p>
@@ -63,9 +52,9 @@
if you don't have one already.
</p>
[% END %]
-
+</div>
__seclev__
500
__version__
-$Id: sendPasswdForm;login;default,v 1.2 2004/12/31 12:36:50 oliver Exp $
+$Id: sendPasswdForm;login;default,v 1.3 2006/07/12 11:41:50 sugi Exp $