[livejournal] r18581: LJSUP-7762: Mail.Ru

U   trunk/templates/CommentForm/Author-Anonymous.tmpl
U   trunk/templates/CommentForm/Form.tmpl

Modified: trunk/templates/CommentForm/Author-Anonymous.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Anonymous.tmpl	2011-03-16 08:25:13 UTC (rev 18580)
+++ trunk/templates/CommentForm/Author-Anonymous.tmpl	2011-03-16 08:57:40 UTC (rev 18581)
@@ -19,15 +19,9 @@
 <TMPL_ELSIF registered_can_comment>
     <div class="b-postform-login-item b-postform-login-anonymous b-postform-login-disabled">
         <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span>
-        <TMPL_IF remote_username>
-        	<div class="b-postform-login-opts b-postform-login-opts-anonymous">
-                <strong><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></strong>
-            </div>
-		<TMPL_ELSE>
-            <div class="b-postform-login-opts">
-                <span class="i-bubble b-bubble-alert"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')"></span>
-            </div>
-        </TMPL_IF>
+        <div class="b-postform-login-opts">
+            <span class="i-bubble b-bubble-alert"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')"></span>
+        </div>
     </div>
 <TMPL_ELSIF friends_can_comment>
     <div class="b-postform-login-item b-postform-login-anonymous b-postform-login-disabled">

Modified: trunk/templates/CommentForm/Form.tmpl
===================================================================
--- trunk/templates/CommentForm/Form.tmpl	2011-03-16 08:25:13 UTC (rev 18580)
+++ trunk/templates/CommentForm/Form.tmpl	2011-03-16 08:57:40 UTC (rev 18581)
@@ -44,23 +44,16 @@
                 </div>
             </div>
         <TMPL_ELSE>
-            <div class='b-postform-login
-            b-postform-authtype-<TMPL_IF expr="usertype_default eq 'anonymous'">anonymous b-postform-anonymous-cookie<TMPL_ELSIF expr="usertype_default eq 'cookieuser'">user b-postform-user-cookie<TMPL_ELSIF expr="usertype_default eq 'facebook_cookie'">facebook b-postform-facebook-cookie<TMPL_ELSIF expr="usertype_default eq 'twitter_cookie'">twitter b-postform-twitter-cookie<TMPL_ELSIF expr="usertype_default eq 'openid_cookie'">openid b-postform-openid-cookie<TMPL_ELSIF expr="usertype_default eq 'mailru_cookie'">mailru b-postform-mailru-cookie</TMPL_IF>
-            <TMPL_IF everyone_can_comment><TMPL_UNLESS is_public> b-postform-ability-disabled-anonymous</TMPL_UNLESS><TMPL_ELSIF registered_can_comment> b-postform-ability-disabled-anonymous<TMPL_ELSIF friends_can_comment> b-postform-ability-disabled-anonymous</TMPL_IF>
-            <TMPL_IF is_person><TMPL_UNLESS remote_banned><TMPL_UNLESS remote_can_comment> b-postform-ability-disabled-user</TMPL_UNLESS></TMPL_UNLESS></TMPL_IF>
-            <TMPL_IF everyone_can_comment><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment> b-postform-ability-disabled-facebook</TMPL_UNLESS></TMPL_IF></TMPL_IF>
-            <TMPL_IF everyone_can_comment><TMPL_ELSIF registered_can_comment><TMPL_IF is_identity> b-postform-ability-disabled-twitter</TMPL_IF><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment> b-postform-ability-disabled-twitter</TMPL_UNLESS><TMPL_ELSE></TMPL_IF></TMPL_IF>
-            <TMPL_IF openid_enabled><TMPL_IF everyone_can_comment><TMPL_ELSIF registered_can_comment><TMPL_IF is_identity> b-postform-ability-disabled-openid</TMPL_IF><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment> b-postform-ability-disabled-openid</TMPL_UNLESS></TMPL_IF></TMPL_IF></TMPL_IF>
-            <TMPL_IF everyone_can_comment><TMPL_ELSIF registered_can_comment><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment> b-postform-ability-disabled-mailru</TMPL_UNLESS></TMPL_IF></TMPL_IF>'>
+            <div class='b-postform-login b-postform-authtype-<TMPL_IF expr="usertype_default eq 'anonymous'">anonymous b-postform-anonymous-cookie<TMPL_ELSIF expr="usertype_default eq 'cookieuser'">user b-postform-user-cookie<TMPL_ELSIF expr="usertype_default eq 'facebook_cookie'">facebook b-postform-facebook-cookie<TMPL_ELSIF expr="usertype_default eq 'twitter_cookie'">twitter b-postform-twitter-cookie<TMPL_ELSIF expr="usertype_default eq 'openid_cookie'">openid b-postform-openid-cookie<TMPL_ELSIF expr="usertype_default eq 'mailru_cookie'">mailru b-postform-mailru-cookie</TMPL_IF>'>
                 <div class="b-postform-login-services">
                     <div class="b-postform-login-services-items">
-                        <span class="b-postform-login-services-item b-postform-login-services-anonymous"><a href="#anonymous" title="<TMPL_IF everyone_can_comment><TMPL_UNLESS is_public><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost.nonpublic')"></TMPL_IF><TMPL_ELSIF registered_can_comment><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')"><TMPL_ELSIF friends_can_comment><TMPL_IF is_friend><TMPL_VAR ml_friendsonly></TMPL_IF></TMPL_IF>"><img src="<TMPL_VAR lj_imgprefix>/anonymous.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-anonymous"><a href="#anonymous"><img src="<TMPL_VAR lj_imgprefix>/anonymous.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span></a></span>
                         <span class="b-postform-login-services-item b-postform-login-services-user"><a href="#user"><img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span></a></span>
                         <span class="b-postform-login-services-item b-postform-login-services-livejournal"><a href="#livejournal"><img src="<TMPL_VAR lj_imgprefix>/pencil.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span></a></span>
-                        <span class="b-postform-login-services-item b-postform-login-services-facebook"><a href="#facebook" title="<TMPL_IF everyone_can_comment><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment><TMPL_VAR remote_display_name><TMPL_VAR ml_notafriend><TMPL_VAR ml_willscreen></TMPL_UNLESS></TMPL_IF></TMPL_IF>"><img src="<TMPL_VAR lj_imgprefix>/icons/facebook-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></span></a></span>
-                        <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#twitter" title="<TMPL_IF everyone_can_comment><TMPL_ELSIF registered_can_comment><TMPL_IF is_identity><TMPL_VAR ml_noopenidpost></TMPL_IF><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment><TMPL_VAR remote_display_name><TMPL_VAR ml_notafriend><TMPL_VAR ml_willscreen></TMPL_UNLESS></TMPL_IF></TMPL_IF>"><img src="<TMPL_VAR lj_imgprefix>/icons/twitter-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></span></a></span>
-                        <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#openid" title="<TMPL_IF everyone_can_comment><TMPL_ELSIF registered_can_comment><TMPL_IF is_identity><TMPL_IF is_identity><TMPL_VAR ml_noopenidpost></TMPL_IF></TMPL_IF><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment><TMPL_VAR remote_display_name><TMPL_VAR ml_notafriend><TMPL_VAR ml_willscreen></TMPL_UNLESS><TMPL_ELSE></TMPL_IF></TMPL_IF>"><img src="<TMPL_VAR lj_imgprefix>/icons/openid-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></span></a></span>
-                        <span class="b-postform-login-services-item b-postform-login-services-mailru"><a href="#mailru" title="<TMPL_IF everyone_can_comment><TMPL_ELSIF registered_can_comment><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment><TMPL_VAR remote_display_name><TMPL_VAR ml_notafriend><TMPL_VAR ml_willscreen></TMPL_UNLESS></TMPL_IF></TMPL_IF>"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-facebook"><a href="#facebook"><img src="<TMPL_VAR lj_imgprefix>/icons/facebook-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#twitter"><img src="<TMPL_VAR lj_imgprefix>/icons/twitter-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#openid"><img src="<TMPL_VAR lj_imgprefix>/icons/openid-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-mailru"><a href="#mailru"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span></a></span>
                     </div>
                 </div>
                 <div class="b-postform-login-details">