Tadashi Okoshi
slash****@users*****
2005年 12月 20日 (火) 16:52:36 JST
Index: affelio/defaults/af_templates/en_us/body_flist.aftmpl
diff -u affelio/defaults/af_templates/en_us/body_flist.aftmpl:1.8 affelio/defaults/af_templates/en_us/body_flist.aftmpl:1.9
--- affelio/defaults/af_templates/en_us/body_flist.aftmpl:1.8 Sat Dec 10 08:58:09 2005
+++ affelio/defaults/af_templates/en_us/body_flist.aftmpl Tue Dec 20 16:52:36 2005
@@ -6,29 +6,53 @@
<!-- Login Menu -->
<!--==============================================-->
<div class="afPubContentHeading">
-<table border="0" cellspacing="0" width=100%>
-<tr><td align="left">
-Friends of <AF_VAR ESCAPE="HTML" NAME="profile_nickname">
-</td>
-<td align="right">
-<font size="-2">(<AF_VAR ESCAPE="HTML" NAME="client_relationship"> mode)</font>
-<a href="javascript:void(0);" onClick="showHide('c0');">
-<font size="-2">login/logout</font></a></td></tr></table>
-<div class="sidehide" id="c0">
-Current user:: <AF_VAR ESCAPE="HTML" NAME="client_afid"><BR>
-Current mode: <AF_VAR ESCAPE="HTML" NAME="client_relationship"><BR>
+
+<TMPL_IF NAME="client_type_pb"><!--client_type-->
+Welcome to <AF_VAR ESCAPE="HTML" NAME="profile_nickname">'Affelio!
+<FONT SIZE="-2">You're not logged in. Please log in.
+<a href="javascript:void(0);" onClick="showHide('c0');">[?]</a></FONT>
<BR>
-<FORM class="afPubLoginarea" ACTION="./bin/loginexec.cgi" METHOD="POST">
-Username: <INPUT TYPE="text" NAME="username" SIZE="20">
-Password: <INPUT TYPE="password" NAME="password" SIZE="10">
-<INPUT TYPE="submit" NAME="button" VALUE="LOGIN">
- <A HREF="./bin/logoutexec.cgi">LOGOUT</A>
-</FORM>
-</div>
+<FORM class="afPubLoginarea" ACTION="./bin/loginexec.cgi?mode=s0" METHOD="POST">
+Affelio URL: <INPUT TYPE="text" NAME="affelio_url" SIZE="50"> </FORM>
+<!--start SIDEHIDE--><div class="sidehide" id="c0">
+<BR>
+<B>How can I log into this Affelio?</B><BR>
+Please input your "Affelio URL" firstly.
+<ul>
+<li>http://my.affelio.us/don_smith
+<li>my.affelio.us/don_smith (W/o http is okay.)
+<li>don_smith (If your Affelio is in the same Affelio farm, just "dom_smith" works.)
+</ul>
+For Affelio owner, just use your login name.
+<!--end SIDEHIDE--></div>
+</TMPL_IF>
+
+<TMPL_IF NAME="client_type_f1"><!--client_type-->
+<table width="100%"><tr>
+<td align="left" valign="top"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Hi, <A HREF="outgoing.cgi?dest_url=<AF_VAR ESCAPE="HTML" NAME="client_afid">"><AF_VAR ESCAPE="HTML" NAME="client_nickname"></A>! (1 hop from owner)</td>
+<td align="right" valign="top"><form ACTION="bin/logoutexec.cgi" style="padding:0px; margin:0px;"><INPUT TYPE="submit" VALUE="Logout"></form></td>
+</tr></table>
+</TMPL_IF>
+
+<TMPL_IF NAME="client_type_f2"><!--client_type-->
+<table width="100%"><tr>
+<td align="left" valign="top"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Hi, <A HREF="outgoing.cgi?dest_url=<AF_VAR ESCAPE="HTML" NAME="client_afid">"><AF_VAR ESCAPE="HTML" NAME="client_nickname"></A>! (2 hops from owner)</td>
+<td align="right" valign="top"><form ACTION="bin/logoutexec.cgi" style="padding:0px; margin:0px;"><INPUT TYPE="submit" VALUE="Logout"></form></td>
+</tr></table>
+</TMPL_IF>
+
+<TMPL_IF NAME="client_type_self"><!--client_type-->
+<table width="100%"><tr>
+<td align="left" valign="top"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Welcome back, sir!</td>
+<td align="right" valign="top"><form ACTION="bin/logoutexec.cgi" style="padding:0px; margin:0px;"><INPUT TYPE="submit" VALUE="Logout"></form></td>
+</tr></table>
+</TMPL_IF>
+
</div><!--afPubContentHeading-->
+<!--==============================================-->
<div class="afPubModeList">
-<A href="index.cgi">index</A> | <A href="index.cgi?mode=profile">profile</A> | friends<TMPL_IF NAME="client_type_f1"> | <a href="<TMPL_VAR NAME="send_mesg_URL">" target="_blank">send message</A></TMPL_IF><TMPL_IF NAME="client_type_f2"> | <a href="<TMPL_VAR NAME="make_friend_URL">" target="_blank">request link</A></TMPL_IF>
+<A href="index.cgi">Top</A> | <A href="index.cgi?mode=profile">Profile</A> | AffelioLink list<TMPL_IF NAME="client_type_f1"> | <a href="<TMPL_VAR NAME="send_mesg_URL">" target="_blank">send mail</A></TMPL_IF><TMPL_IF NAME="client_type_f2"> | <a href="<TMPL_VAR NAME="make_friend_URL">" target="_blank">request Affelio Link</A></TMPL_IF>
</div>
<!--==============================================-->
@@ -47,8 +71,8 @@
<div class="afPubContentBlock" width=400>
<div class="afPubContentBlockTitle" id="IDMyOverview"><AF_VAR ESCAPE="HTML" NAME="profile_nickname"> <AF_VAR ESCAPE="HTML" NAME="profile_currentstatus"></div>
<BR>
-Friends: <AF_VAR NAME="friend__F1count"><BR>
-Friends of friends: <AF_VAR NAME="friend__F2count">
+<AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s direct AffelioLink: <AF_VAR NAME="friend__F1count"><BR>
+<AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s 2-hop AffelioLink: <AF_VAR NAME="friend__F2count">人
</div>
</td>
</tr>
@@ -56,7 +80,7 @@
<tr><td colspan="2">
<!--==-->
<div class="afPubContentBlock">
-<div class="afPubContentBlockTitle" id="IDMyFriends">Friends of <AF_VAR ESCAPE="HTML" NAME="profile_nickname"></div>
+<div class="afPubContentBlockTitle" id="IDMyFriends"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio Link list</div>
<AF_BLOCK NAME="friendlist_all_IF">
</div>
<!--==-->
Index: affelio/defaults/af_templates/en_us/body_index.aftmpl
diff -u affelio/defaults/af_templates/en_us/body_index.aftmpl:1.9 affelio/defaults/af_templates/en_us/body_index.aftmpl:1.10
--- affelio/defaults/af_templates/en_us/body_index.aftmpl:1.9 Sat Dec 10 08:58:09 2005
+++ affelio/defaults/af_templates/en_us/body_index.aftmpl Tue Dec 20 16:52:36 2005
@@ -6,31 +6,54 @@
<!-- Login Menu -->
<!--==============================================-->
<div class="afPubContentHeading">
-<table border="0" cellspacing="0" width=100%>
-<tr><td align="left">
-<AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Welcom, <A HREF="<AF_VAR ESCAPE="HTML" NAME="client_afid">"><AF_VAR ESCAPE="HTML" NAME="client_nickname"></A>!
-</td>
-<td align="right">
-<font size="-2">(<AF_VAR ESCAPE="HTML" NAME="client_relationship"> mode)</font>
-<a href="javascript:void(0);" onClick="showHide('c0');">
-<font size="-2">login/logout</font></a></td></tr></table>
-<div class="sidehide" id="c0">
-Current user:: <AF_VAR ESCAPE="HTML" NAME="client_afid"><BR>
-Current mode: <AF_VAR ESCAPE="HTML" NAME="client_relationship"><BR>
+
+<TMPL_IF NAME="client_type_pb"><!--client_type-->
+Welcome to <AF_VAR ESCAPE="HTML" NAME="profile_nickname">'Affelio!
+<FONT SIZE="-2">You're not logged in. Please log in.
+<a href="javascript:void(0);" onClick="showHide('c0');">[?]</a></FONT>
<BR>
-<FORM class="afPubLoginarea" ACTION="./bin/loginexec.cgi" METHOD="POST">
-Username: <INPUT TYPE="text" NAME="username" SIZE="20">
-Password: <INPUT TYPE="password" NAME="password" SIZE="10">
-<INPUT TYPE="submit" NAME="button" VALUE="LOGIN">
- <A HREF="./bin/logoutexec.cgi">LOGOUT</A>
-</FORM>
-</div>
+<FORM class="afPubLoginarea" ACTION="./bin/loginexec.cgi?mode=s0" METHOD="POST">
+Affelio URL: <INPUT TYPE="text" NAME="affelio_url" SIZE="50"> </FORM>
+<!--start SIDEHIDE--><div class="sidehide" id="c0">
+<BR>
+<B>How can I log into this Affelio?</B><BR>
+Please input your "Affelio URL" firstly.
+<ul>
+<li>http://my.affelio.us/don_smith
+<li>my.affelio.us/don_smith (W/o http is okay.)
+<li>don_smith (If your Affelio is in the same Affelio farm, just "dom_smith" works.)
+</ul>
+For Affelio owner, just use your login name.
+<!--end SIDEHIDE--></div>
+</TMPL_IF>
+
+<TMPL_IF NAME="client_type_f1"><!--client_type-->
+<table width="100%"><tr>
+<td align="left" valign="top"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Hi, <A HREF="outgoing.cgi?dest_url=<AF_VAR ESCAPE="HTML" NAME="client_afid">"><AF_VAR ESCAPE="HTML" NAME="client_nickname"></A>! (1 hop from owner)</td>
+<td align="right" valign="top"><form ACTION="bin/logoutexec.cgi" style="padding:0px; margin:0px;"><INPUT TYPE="submit" VALUE="Logout"></form></td>
+</tr></table>
+</TMPL_IF>
+
+<TMPL_IF NAME="client_type_f2"><!--client_type-->
+<table width="100%"><tr>
+<td align="left" valign="top"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Hi, <A HREF="outgoing.cgi?dest_url=<AF_VAR ESCAPE="HTML" NAME="client_afid">"><AF_VAR ESCAPE="HTML" NAME="client_nickname"></A>! (2 hops from owner)</td>
+<td align="right" valign="top"><form ACTION="bin/logoutexec.cgi" style="padding:0px; margin:0px;"><INPUT TYPE="submit" VALUE="Logout"></form></td>
+</tr></table>
+</TMPL_IF>
+
+<TMPL_IF NAME="client_type_self"><!--client_type-->
+<table width="100%"><tr>
+<td align="left" valign="top"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Welcome back, sir!</td>
+<td align="right" valign="top"><form ACTION="bin/logoutexec.cgi" style="padding:0px; margin:0px;"><INPUT TYPE="submit" VALUE="Logout"></form></td>
+</tr></table>
+</TMPL_IF>
+
</div><!--afPubContentHeading-->
+<!--==============================================-->
<div class="afPubModeList">
-index | <A href="index.cgi?mode=profile">profile</A> | <A HREF="index.cgi?mode=flist">friends</A><TMPL_IF NAME="client_type_f1"> | <a href="<TMPL_VAR NAME="send_mesg_URL">" target="_blank">send message</A></TMPL_IF><TMPL_IF NAME="client_type_f2"> | <a href="<TMPL_VAR NAME="make_friend_URL">" target="_blank">request link</A></TMPL_IF>
+Top | <A href="index.cgi?mode=profile">Profile</A> | <A HREF="index.cgi?mode=flist">AffelioLink list</A><TMPL_IF NAME="client_type_f1"> | <a href="<TMPL_VAR NAME="send_mesg_URL">" target="_blank">send mail</A></TMPL_IF><TMPL_IF NAME="client_type_f2"> | <a href="<TMPL_VAR NAME="make_friend_URL">" target="_blank">request Affelio Link</A></TMPL_IF>
</div>
-
<!--==============================================-->
<div class="afPubContent">
<!--==============================================-->
@@ -44,11 +67,19 @@
<IMG SRC="./bin/get_content.cgi?module=core&content=/profile/profile_face.jpg" WIDTH="150" BORDER="0">
</td>
<td ALIGN="left" VALIGN="top">
+
+ <div class="afPubContentBlock">
+ <div class="afPubContentBlockTitle" id="IDMyONews">News from <AF_VAR ESCAPE="HTML" NAME="profile_nickname"> - <AF_VAR ESCAPE="HTML" NAME="profile_currentstatus"> to You</div>
+ <AF_BLOCK NAME="newsbox">
+ </div>
+
<div class="afPubContentBlock">
- <div class="afPubContentBlockTitle" id="IDMyOverview"><AF_VAR ESCAPE="HTML" NAME="profile_nickname"> <AF_VAR ESCAPE="HTML" NAME="profile_currentstatus"></div>
+ <div class="afPubContentBlockTitle" id="IDMyOverview"><AF_VAR ESCAPE="HTML" NAME="profile_nickname"></div>
<BR>
<AF_VAR NAME="profile_intromesg1"> (<A HREF="<AF_VAR NAME="site__web_root">/index.cgi?mode=profile">more...</A>)
</div>
+
+
</td>
</tr>
@@ -58,7 +89,7 @@
<tr><td colspan="2">
<!--==-->
<div class="afPubContentBlock">
-<div class="afPubContentBlockTitle" id="IDMyFriends">Friends of <AF_VAR ESCAPE="HTML" NAME="profile_nickname"> (<A HREF="<AF_VAR NAME="site__web_root">/index.cgi?mode=flist">List all...</A>)</div>
+<div class="afPubContentBlockTitle" id="IDMyFriends"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio Link list (<A HREF="<AF_VAR NAME="site__web_root">/index.cgi?mode=flist">see all...</A>)</div>
<AF_BLOCK NAME="friendlist_5_IF">
</div>
<!--==-->
@@ -70,7 +101,7 @@
<!-- <tr><td colspan="2"> -->
<!--==-->
<!-- <div class="afPubContentBlock"> -->
-<!-- <div class="afPubContentBlockTitle" id="IDMyReference">Introduction From Friends (<A HREF="<AF_VAR NAME="site__web_root">/index.cgi?mode=">List all...</A>)</div> -->
+<!-- <div class="afPubContentBlockTitle" id="IDMyReference">åéããã®ç´¹ä» (<A HREF="<AF_VAR NAME="site__web_root">/index.cgi?mode=">å
¨ãªã¹ã...</A>)</div> -->
<!-- </div> -->
<!--==-->
<!-- </td></tr> -->
Index: affelio/defaults/af_templates/en_us/body_profile.aftmpl
diff -u affelio/defaults/af_templates/en_us/body_profile.aftmpl:1.7 affelio/defaults/af_templates/en_us/body_profile.aftmpl:1.8
--- affelio/defaults/af_templates/en_us/body_profile.aftmpl:1.7 Sat Dec 10 08:58:09 2005
+++ affelio/defaults/af_templates/en_us/body_profile.aftmpl Tue Dec 20 16:52:36 2005
@@ -6,32 +6,54 @@
<!-- Login Menu -->
<!--==============================================-->
<div class="afPubContentHeading">
-<table border="0" cellspacing="0" width=100%>
-<tr><td align="left">
-<AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Profile opened to <A HREF="<AF_VAR ESCAPE="HTML" NAME="client_afid">"><AF_VAR ESCAPE="HTML" NAME="client_nickname"></A>
-</td>
-<td align="right">
-<font size="-2">(<AF_VAR ESCAPE="HTML" NAME="client_relationship"> mode)</font>
-<a href="javascript:void(0);" onClick="showHide('c0');">
-<font size="-2">login/logout</font></a></td></tr></table>
-<div class="sidehide" id="c0">
-Current user:: <AF_VAR ESCAPE="HTML" NAME="client_afid"><BR>
-Current mode: <AF_VAR ESCAPE="HTML" NAME="client_relationship"><BR>
+
+<TMPL_IF NAME="client_type_pb"><!--client_type-->
+Welcome to <AF_VAR ESCAPE="HTML" NAME="profile_nickname">'Affelio!
+<FONT SIZE="-2">You're not logged in. Please log in.
+<a href="javascript:void(0);" onClick="showHide('c0');">[?]</a></FONT>
<BR>
-<FORM class="afPubLoginarea" ACTION="./bin/loginexec.cgi" METHOD="POST">
-Username: <INPUT TYPE="text" NAME="username" SIZE="20">
-Password: <INPUT TYPE="password" NAME="password" SIZE="10">
-<INPUT TYPE="submit" NAME="button" VALUE="LOGIN">
- <A HREF="./bin/logoutexec.cgi">LOGOUT</A>
-</FORM>
-</div>
-</div><!--afPubContentHeading-->
+<FORM class="afPubLoginarea" ACTION="./bin/loginexec.cgi?mode=s0" METHOD="POST">
+Affelio URL: <INPUT TYPE="text" NAME="affelio_url" SIZE="50"> </FORM>
+<!--start SIDEHIDE--><div class="sidehide" id="c0">
+<BR>
+<B>How can I log into this Affelio?</B><BR>
+Please input your "Affelio URL" firstly.
+<ul>
+<li>http://my.affelio.us/don_smith
+<li>my.affelio.us/don_smith (W/o http is okay.)
+<li>don_smith (If your Affelio is in the same Affelio farm, just "dom_smith" works.)
+</ul>
+For Affelio owner, just use your login name.
+<!--end SIDEHIDE--></div>
+</TMPL_IF>
+
+<TMPL_IF NAME="client_type_f1"><!--client_type-->
+<table width="100%"><tr>
+<td align="left" valign="top"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Hi, <A HREF="outgoing.cgi?dest_url=<AF_VAR ESCAPE="HTML" NAME="client_afid">"><AF_VAR ESCAPE="HTML" NAME="client_nickname"></A>! (1 hop from owner)</td>
+<td align="right" valign="top"><form ACTION="bin/logoutexec.cgi" style="padding:0px; margin:0px;"><INPUT TYPE="submit" VALUE="Logout"></form></td>
+</tr></table>
+</TMPL_IF>
+
+<TMPL_IF NAME="client_type_f2"><!--client_type-->
+<table width="100%"><tr>
+<td align="left" valign="top"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Hi, <A HREF="outgoing.cgi?dest_url=<AF_VAR ESCAPE="HTML" NAME="client_afid">"><AF_VAR ESCAPE="HTML" NAME="client_nickname"></A>! (2 hops from owner)</td>
+<td align="right" valign="top"><form ACTION="bin/logoutexec.cgi" style="padding:0px; margin:0px;"><INPUT TYPE="submit" VALUE="Logout"></form></td>
+</tr></table>
+</TMPL_IF>
+
+<TMPL_IF NAME="client_type_self"><!--client_type-->
+<table width="100%"><tr>
+<td align="left" valign="top"><AF_VAR ESCAPE="HTML" NAME="profile_nickname">'s Affelio: Welcome back, sir!</td>
+<td align="right" valign="top"><form ACTION="bin/logoutexec.cgi" style="padding:0px; margin:0px;"><INPUT TYPE="submit" VALUE="Logout"></form></td>
+</tr></table>
+</TMPL_IF>
+</div><!--afPubContentHeading-->
+<!--==============================================-->
<div class="afPubModeList">
-<A href="index.cgi">index</A> | profile | <A HREF="index.cgi?mode=flist">friends</A><TMPL_IF NAME="client_type_f1"> | <a href="<TMPL_VAR NAME="send_mesg_URL">" target="_blank">send message</A></TMPL_IF><TMPL_IF NAME="client_type_f2"> | <a href="<TMPL_VAR NAME="make_friend_URL">" target="_blank">request link</A></TMPL_IF>
+<A href="index.cgi">Top</A> | Profile</A> | <A HREF="index.cgi?mode=flist">AffelioLink list</A><TMPL_IF NAME="client_type_f1"> | <a href="<TMPL_VAR NAME="send_mesg_URL">" target="_blank">send mail</A></TMPL_IF><TMPL_IF NAME="client_type_f2"> | <a href="<TMPL_VAR NAME="make_friend_URL">" target="_blank">request AffelioLink</A></TMPL_IF>
</div>
-
<!--==============================================-->
<div class="afPubContent">
<!--==============================================-->