[ljcom] r10213: LJSUP-7762: Mail.Ru

U   trunk/htdocs/talkpost.bml.text.local
U   trunk/templates/CommentForm/Author-Facebook.tmpl
U   trunk/templates/CommentForm/Author-MailRU.tmpl
U   trunk/templates/CommentForm/Author-Twitter.tmpl

Modified: trunk/htdocs/talkpost.bml.text.local
===================================================================
--- trunk/htdocs/talkpost.bml.text.local	2011-03-10 08:03:15 UTC (rev 10212)
+++ trunk/htdocs/talkpost.bml.text.local	2011-03-10 08:05:44 UTC (rev 10213)
@@ -1,11 +1,27 @@
 ;; -*- coding: utf-8 -*-
+.back.to=Back to
+
 .error.noreply_deleted=This comment has been deleted. You cannot reply to it.
 
+.facebook=Facebook
+
 .facebook.who.you.are=We will figure who you are
 
-.twitter.who.you.are=We will figure who you are
+.livejournal=LiveJournal
 
 .loginq=Log in?
 
+.mailru=Mail.Ru
+
+.mailru.who.you.are=We will figure who you are
+
+.openid=OpenID
+
 .opt.friendsonly=- this user has disabled anonymous and non-friend posting.  You may post here if [[username]] lists you as a friend.
 
+.other.user=Other user
+
+.twitter=Twitter
+
+.twitter.who.you.are=We will figure who you are
+

Modified: trunk/templates/CommentForm/Author-Facebook.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Facebook.tmpl	2011-03-10 08:03:15 UTC (rev 10212)
+++ trunk/templates/CommentForm/Author-Facebook.tmpl	2011-03-10 08:05:44 UTC (rev 10213)
@@ -1,90 +1,79 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_IF is_identity>
-        <tr valign='middle' id='fbli' name='fbli'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(4);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook_cookie' id='talkpostfromfbli' <TMPL_IF whocheck_facebook_cookie>checked='checked'</TMPL_IF> /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfromfb' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook identity:</b></label>
-            <strong><TMPL_VAR remote_display_name></strong>
-            <TMPL_VAR ml_willscreen>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-facebook">
+            <input type="radio" name="usertype" value="facebook_cookie" id="talkpostfromfbli" class="b-postform-login-radio" <TMPL_IF whocheck_facebook_cookie>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromfbli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label>
+            <div class="b-postform-login-opts">
+                <strong><TMPL_VAR remote_display_name></strong>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     <TMPL_ELSE>
-        <tr valign='middle' id='fblo' name='fblo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(3);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook' id='talkpostfromfblo' <TMPL_IF whocheck_facebook>checked='checked'</TMPL_IF> tabindex="9" /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfromfblo' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook</b></label>
-            <TMPL_VAR helpicon_facebook>
-            <TMPL_VAR ml_willscreen>
-            <span id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-facebook">
+            <input type="radio" name="usertype" value="facebook" id="talkpostfromfblo" class="b-postform-login-radio" <TMPL_IF whocheck_facebook>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromfblo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"><TMPL_VAR helpicon_facebook></span>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
-
 <TMPL_ELSIF registered_can_comment>
     <TMPL_IF is_trusted_identity>
-        <tr valign='middle' id='fbli' name='fbli'>
-        <TMPL_IF remote_banned>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' /></td>
-            <td class="b-postform-radio">( )</td>
-            <td class="b-postform-data"><span class='ljdeem'><TMPL_VAR ml_loggedin></font><TMPL_VAR ml_banned></td>
-        <TMPL_ELSE>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(4);' /></td>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook_cookie' id='talkpostfromfbli' <TMPL_IF whocheck_facebook_cookie>checked='checked'</TMPL_IF> /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfromfb' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook identity:</b></label>
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_willscreen>
-            </td>
-        </TMPL_IF>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-facebook">
+            <TMPL_IF remote_banned>
+                <div class="b-postform-login-opts">
+                    <TMPL_VAR ml_loggedin>
+                    <TMPL_VAR ml_banned>
+                </div>
+            <TMPL_ELSE>
+                <input type="radio" name="usertype" value="facebook_cookie" id="talkpostfromfbli" class="b-postform-login-radio" <TMPL_IF whocheck_facebook_cookie>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromfbli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </TMPL_IF>
+        </div>
     <TMPL_ELSE>
-        <tr valign='middle' id='fblo' name='fblo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(3);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook' id='talkpostfromfblo' <TMPL_IF whocheck_facebook>checked='checked'</TMPL_IF> /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfromfblo' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook</b></label>
-            <TMPL_VAR helpicon_facebook>
-            <TMPL_VAR ml_willscreen>
-            <span id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-facebook">
+            <input type="radio" name="usertype" value="facebook" id="talkpostfromfblo" class="b-postform-login-radio" <TMPL_IF whocheck_facebook>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromfblo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"><TMPL_VAR helpicon_facebook></span>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
 <TMPL_ELSIF friends_can_comment>
     <TMPL_IF is_identity>
-        <tr valign='middle' id='fbli' name='fbli'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(4);' /></td>
-
         <TMPL_IF remote_can_comment>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook_cookie' id='talkpostfromfbli' <TMPL_IF whocheck_facebook_cookie>checked='checked'</TMPL_IF> /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfromfb' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook identity:</b></label>
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_willscreen>
-            </td>
+            <div class="b-postform-login-item b-postform-login-facebook">
+                <input type="radio" name="usertype" value="facebook_cookie" id="talkpostfromfbli" class="b-postform-login-radio" <TMPL_IF whocheck_facebook_cookie>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromfbli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         <TMPL_ELSE>
-            <td class="b-postform-radio">( )</td>
-            <td class="b-postform-data">
-                <span class="i-postform-label i-postform-disabled"><b>Facebook identity:</b></span>&nbsp;
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_notafriend>
-                <TMPL_VAR ml_willscreen>
-            </td>
+            <div class="b-postform-login-item b-postform-login-facebook b-postform-login-disabled">
+                <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></span>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_notafriend>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         </TMPL_IF>
-
-        </tr>
     <TMPL_ELSE>
-        <tr valign='middle' id='fblo' name='fblo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(3);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook' id='talkpostfromfblo' <TMPL_IF whocheck_facebook>checked='checked'</TMPL_IF> /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfromfblo' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook</b></label>
-            <TMPL_VAR helpicon_facebook>
-            <TMPL_VAR ml_willscreen>
-            <span id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-facebook">
+            <input type="radio" name="usertype" value="facebook" id="talkpostfromfblo" class="b-postform-login-radio" <TMPL_IF whocheck_facebook>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromfblo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"><TMPL_VAR helpicon_facebook></span>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
-
 </TMPL_IF>

Modified: trunk/templates/CommentForm/Author-MailRU.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-MailRU.tmpl	2011-03-10 08:03:15 UTC (rev 10212)
+++ trunk/templates/CommentForm/Author-MailRU.tmpl	2011-03-10 08:05:44 UTC (rev 10213)
@@ -1,90 +1,79 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_IF is_identity>
-        <tr valign='middle' id='mrli' name='mrli'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/mailru-profile.gif' onclick='handleRadios(4);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='mailru_cookie' id='talkpostfrommrli' <TMPL_IF whocheck_mailru_cookie>checked='checked'</TMPL_IF> /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfrommr' onclick='handleRadios(3);return false;' class="i-postform-label"><b>mailru identity:</b></label>
-            <strong><TMPL_VAR remote_display_name></strong>
-            <TMPL_VAR ml_willscreen>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-mailru">
+            <input type="radio" name="usertype" value="mailru_cookie" id="talkpostfrommrli" class="b-postform-login-radio" <TMPL_IF whocheck_mailru_cookie>checked="checked"</TMPL_IF> />
+            <label for="talkpostfrommrli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></label>
+            <div class="b-postform-login-opts">
+                <strong><TMPL_VAR remote_display_name></strong>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     <TMPL_ELSE>
-        <tr valign='middle' id='mrlo' name='mrlo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/mailru-profile.gif' onclick='handleRadios(3);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='mailru' id='talkpostfrommrlo' <TMPL_IF whocheck_mailru>checked='checked'</TMPL_IF> tabindex="9" /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfrommrlo' onclick='handleRadios(3);return false;' class="i-postform-label"><b>mailru</b></label>
-            <TMPL_VAR helpicon_mailru>
-            <TMPL_VAR ml_willscreen>
-            <span id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.mailru.who.you.are')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-mailru">
+            <input type="radio" name="usertype" value="mailru" id="talkpostfrommrlo" class="b-postform-login-radio" <TMPL_IF whocheck_mailru>checked="checked"</TMPL_IF> />
+            <label for="talkpostfrommrlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></label>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.mailru.who.you.are')"><TMPL_VAR helpicon_mailru></span>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
-
 <TMPL_ELSIF registered_can_comment>
     <TMPL_IF is_trusted_identity>
-        <tr valign='middle' id='mrli' name='mrli'>
-        <TMPL_IF remote_banned>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/mailru-profile.gif' /></td>
-            <td class="b-postform-radio">( )</td>
-            <td class="b-postform-data"><span class='ljdeem'><TMPL_VAR ml_loggedin></font><TMPL_VAR ml_banned></td>
-        <TMPL_ELSE>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/mailru-profile.gif' onclick='handleRadios(4);' /></td>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='mailru_cookie' id='talkpostfrommrli' <TMPL_IF whocheck_mailru_cookie>checked='checked'</TMPL_IF> /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfrommr' onclick='handleRadios(3);return false;' class="i-postform-label"><b>mailru identity:</b></label>
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_willscreen>
-            </td>
-        </TMPL_IF>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-mailru">
+            <TMPL_IF remote_banned>
+                <div class="b-postform-login-opts">
+                    <TMPL_VAR ml_loggedin>
+                    <TMPL_VAR ml_banned>
+                </div>
+            <TMPL_ELSE>
+                <input type="radio" name="usertype" value="mailru_cookie" id="talkpostfrommrli" class="b-postform-login-radio" <TMPL_IF whocheck_mailru_cookie>checked="checked"</TMPL_IF> />
+                <label for="talkpostfrommrli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></label>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </TMPL_IF>
+        </div>
     <TMPL_ELSE>
-        <tr valign='middle' id='mrlo' name='mrlo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/mailru-profile.gif' onclick='handleRadios(3);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='mailru' id='talkpostfrommrlo' <TMPL_IF whocheck_mailru>checked='checked'</TMPL_IF> /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfrommrlo' onclick='handleRadios(3);return false;' class="i-postform-label"><b>mailru</b></label>
-            <TMPL_VAR helpicon_mailru>
-            <TMPL_VAR ml_willscreen>
-            <span id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.mailru.who.you.are')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-mailru">
+            <input type="radio" name="usertype" value="mailru" id="talkpostfrommrlo" class="b-postform-login-radio" <TMPL_IF whocheck_mailru>checked="checked"</TMPL_IF> />
+            <label for="talkpostfrommrlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></label>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.mailru.who.you.are')"><TMPL_VAR helpicon_mailru></span>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
 <TMPL_ELSIF friends_can_comment>
     <TMPL_IF is_identity>
-        <tr valign='middle' id='mrli' name='mrli'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/mailru-profile.gif' onclick='handleRadios(4);' /></td>
-
         <TMPL_IF remote_can_comment>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='mailru_cookie' id='talkpostfrommrli' <TMPL_IF whocheck_mailru_cookie>checked='checked'</TMPL_IF> /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfrommr' onclick='handleRadios(3);return false;' class="i-postform-label"><b>mailru identity:</b></label>
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_willscreen>
-            </td>
+            <div class="b-postform-login-item b-postform-login-mailru">
+                <input type="radio" name="usertype" value="mailru_cookie" id="talkpostfrommrli" class="b-postform-login-radio" <TMPL_IF whocheck_mailru_cookie>checked="checked"</TMPL_IF> />
+                <label for="talkpostfrommrli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></label>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         <TMPL_ELSE>
-            <td class="b-postform-radio">( )</td>
-            <td class="b-postform-data">
-                <span class="i-postform-label i-postform-disabled"><b>mailru identity:</b></span>&nbsp;
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_notafriend>
-                <TMPL_VAR ml_willscreen>
-            </td>
+            <div class="b-postform-login-item b-postform-login-mailru b-postform-login-disabled">
+                <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_notafriend>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         </TMPL_IF>
-
-        </tr>
     <TMPL_ELSE>
-        <tr valign='middle' id='mrlo' name='mrlo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/mailru-profile.gif' onclick='handleRadios(3);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='mailru' id='talkpostfrommrlo' <TMPL_IF whocheck_mailru>checked='checked'</TMPL_IF> /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfrommrlo' onclick='handleRadios(3);return false;' class="i-postform-label"><b>mailru</b></label>
-            <TMPL_VAR helpicon_mailru>
-            <TMPL_VAR ml_willscreen>
-            <span id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.mailru.who.you.are')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-mailru">
+            <input type="radio" name="usertype" value="mailru" id="talkpostfrommrlo" class="b-postform-login-radio" <TMPL_IF whocheck_mailru>checked="checked"</TMPL_IF> />
+            <label for="talkpostfrommrlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></label>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.mailru.who.you.are')"><TMPL_VAR helpicon_mailru></span>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
-
 </TMPL_IF>

Modified: trunk/templates/CommentForm/Author-Twitter.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Twitter.tmpl	2011-03-10 08:03:15 UTC (rev 10212)
+++ trunk/templates/CommentForm/Author-Twitter.tmpl	2011-03-10 08:05:44 UTC (rev 10213)
@@ -1,100 +1,90 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_IF is_identity>
-        <tr valign='middle' id='twli' name='twli'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/twitter-profile.gif' onclick='handleRadios(4);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='twitter_cookie' id='talkpostfromtwli' <TMPL_IF whocheck_twitter_cookie>checked='checked'</TMPL_IF> /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfromfb' onclick='handleRadios(4);return false;' class="i-postform-label"><b>Twitter identity:</b></label>
-            <strong><TMPL_VAR remote_display_name></strong>
-            <TMPL_VAR ml_willscreen>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-twitter">
+            <input type="radio" name="usertype" value="twitter_cookie" id="talkpostfromtwli" class="b-postform-login-radio" <TMPL_IF whocheck_twitter_cookie>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromtwli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></label>
+            <div class="b-postform-login-opts">
+                <strong><TMPL_VAR remote_display_name></strong>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     <TMPL_ELSE>
-        <tr valign='middle' id='twlo' name='twlo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/twitter-profile.gif' onclick='handleRadios(4);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='twitter' id='talkpostfromtwlo' <TMPL_IF whocheck_twitter>checked='checked'</TMPL_IF> tabindex="9" /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfromtwlo' onclick='handleRadios(4);return false;' class="i-postform-label"><b>Twitter</b></label>
-            <TMPL_VAR helpicon_twitter>
-            <TMPL_VAR ml_willscreen>
-            <span id="tw_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.twitter.who.you.are')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-twitter">
+            <input type="radio" name="usertype" value="twitter" id="talkpostfromtwlo" class="b-postform-login-radio" <TMPL_IF whocheck_twitter>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromtwlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></label>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.twitter.who.you.are')"><TMPL_VAR helpicon_twitter></span>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
-
 <TMPL_ELSIF registered_can_comment>
     <TMPL_IF is_trusted_identity>
-        <tr valign='middle' id='twli' name='twli'>
         <TMPL_IF remote_banned>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/twitter-profile.gif' /></td>
-            <td class="b-postform-radio">( )</td>
-            <td class="b-postform-data"><span class='ljdeem'><TMPL_VAR ml_loggedin></font><TMPL_VAR ml_banned></td>
+            <div class="b-postform-login-item b-postform-login-twitter">
+                <div class="b-postform-login-opts">
+                    <TMPL_VAR ml_loggedin>
+                    <TMPL_VAR ml_banned>
+                </div>
+            </div>
         <TMPL_ELSE>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/twitter-profile.gif' onclick='handleRadios(4);' /></td>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='twitter_cookie' id='talkpostfromtwli' <TMPL_IF whocheck_twitter_cookie>checked='checked'</TMPL_IF> /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfromfb' onclick='handleRadios(4);return false;' class="i-postform-label"><b>Twitter identity:</b></label>
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_willscreen>
-            </td>
+            <div class="b-postform-login-item b-postform-login-twitter">
+                <input type="radio" name="usertype" value="twitter_cookie" id="talkpostfromtwli" class="b-postform-login-radio" <TMPL_IF whocheck_twitter_cookie>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromtwli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></label>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         </TMPL_IF>
         </tr>
     <TMPL_ELSIF is_identity>
-        <tr valign='middle' id='twlo' name='twlo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/twitter-profile.gif' onclick='handleRadios(4);' /></td>
-        <td class="b-postform-radio">(  )</td>
-        <td class="b-postform-data" colspan='2'>
-            <span class="i-postform-label i-postform-disabled"><b>Twitter</b></span>
-            <TMPL_VAR ml_noopenidpost>
-            <TMPL_VAR helpicon_twitter>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-twitter b-postform-login-disabled">
+            <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></span>
+            <div class="b-postform-login-opts">
+                <TMPL_VAR ml_noopenidpost>
+                <TMPL_VAR helpicon_twitter>
+            </div>
+        </div>
     <TMPL_ELSE>
-        <tr valign='middle' id='twlo' name='twlo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/twitter-profile.gif' onclick='handleRadios(4);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='twitter' id='talkpostfromtwlo' <TMPL_IF whocheck_twitter>checked='checked'</TMPL_IF> /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfromtwlo' onclick='handleRadios(4);return false;' class="i-postform-label"><b>Twitter</b></label>
-            <TMPL_VAR helpicon_twitter>
-            <TMPL_VAR ml_willscreen>
-            <span id="tw_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.twitter.who.you.are')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-twitter">
+            <input type="radio" name="usertype" value="twitter" id="talkpostfromtwlo" class="b-postform-login-radio" <TMPL_IF whocheck_twitter>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromtwlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></label>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.twitter.who.you.are')"><TMPL_VAR helpicon_twitter></span>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
 <TMPL_ELSIF friends_can_comment>
     <TMPL_IF is_identity>
-        <tr valign='middle' id='twli' name='twli'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/twitter-profile.gif' onclick='handleRadios(4);' /></td>
-
         <TMPL_IF remote_can_comment>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='twitter_cookie' id='talkpostfromtwli' <TMPL_IF whocheck_twitter_cookie>checked='checked'</TMPL_IF> /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfromfb' onclick='handleRadios(4);return false;' class="i-postform-label"><b>Twitter identity:</b></label>
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_willscreen>
-            </td>
+            <div class="b-postform-login-item b-postform-login-twitter">
+                <input type="radio" name="usertype" value="twitter_cookie" id="talkpostfromtwli" class="b-postform-login-radio" <TMPL_IF whocheck_twitter_cookie>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromtwli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></label>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         <TMPL_ELSE>
-            <td class="b-postform-radio">( )</td>
-            <td class="b-postform-data">
-                <span class="i-postform-label i-postform-disabled"><b>Twitter identity:</b></span>&nbsp;
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_notafriend>
-                <TMPL_VAR ml_willscreen>
-            </td>
+            <div class="b-postform-login-item b-postform-login-twitter b-postform-login-disabled">
+                <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></span>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_notafriend>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         </TMPL_IF>
-
-        </tr>
     <TMPL_ELSE>
-        <tr valign='middle' id='twlo' name='twlo'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/twitter-profile.gif' onclick='handleRadios(4);' /></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='twitter' id='talkpostfromtwlo' <TMPL_IF whocheck_twitter>checked='checked'</TMPL_IF> /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfromtwlo' onclick='handleRadios(4);return false;' class="i-postform-label"><b>Twitter</b></label>
-            <TMPL_VAR helpicon_twitter>
-            <TMPL_VAR ml_willscreen>
-            <span id="tw_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.twitter.who.you.are')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-twitter">
+            <input type="radio" name="usertype" value="twitter" id="talkpostfromtwlo" class="b-postform-login-radio" <TMPL_IF whocheck_twitter>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromtwlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></label>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.twitter.who.you.are')"><TMPL_VAR helpicon_twitter></span>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
-
 </TMPL_IF>