Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[livejournal] r19823: LJSUP-8857: Updating commenting form

Committer: esavintcev
LJSUP-8857: Updating commenting form
U   trunk/templates/CommentForm/Author-Anonymous.tmpl
U   trunk/templates/CommentForm/Author-OpenID.tmpl
U   trunk/templates/CommentForm/Author-User.tmpl
U   trunk/templates/CommentForm/AuthorDisabled-Anonymous.tmpl
U   trunk/templates/CommentForm/AuthorDisabled-Facebook.tmpl
U   trunk/templates/CommentForm/AuthorDisabled-MailRU.tmpl
U   trunk/templates/CommentForm/AuthorDisabled-OpenID.tmpl
U   trunk/templates/CommentForm/AuthorDisabled-Twitter.tmpl
U   trunk/templates/CommentForm/AuthorDisabled-User.tmpl
U   trunk/templates/CommentForm/AuthorTitle-Anonymous.tmpl
U   trunk/templates/CommentForm/AuthorTitle-Facebook.tmpl
U   trunk/templates/CommentForm/AuthorTitle-MailRU.tmpl
U   trunk/templates/CommentForm/AuthorTitle-OpenID.tmpl
U   trunk/templates/CommentForm/AuthorTitle-Twitter.tmpl
U   trunk/templates/CommentForm/AuthorTitle-User.tmpl
U   trunk/templates/CommentForm/Form.tmpl
Modified: trunk/templates/CommentForm/Author-Anonymous.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Anonymous.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/Author-Anonymous.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,33 +1,35 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_UNLESS is_public>
         <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>
+            <input type="radio" name="usertype" value="anonymous" data-value="anonymous" id="talkpostfromanon" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_anonymous>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromanon" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></label>
             <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.nonpublic')"></span>
+                <strong><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></strong>
             </div>
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-anonymous">
-            <input type="radio" name="usertype" value="anonymous" id="talkpostfromanon" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_anonymous>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="anonymous" data-value="anonymous" id="talkpostfromanon" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_anonymous>checked="checked"</TMPL_IF> />
             <label for="talkpostfromanon" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></label>
             <div class="b-postform-login-opts b-postform-login-opts-anonymous">
                 <strong><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></strong>
-                <TMPL_VAR ml_willscreen>
             </div>
         </div>
     </TMPL_IF>
 <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>
+        <input type="radio" name="usertype" value="anonymous" data-value="anonymous" id="talkpostfromanon" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_anonymous>checked="checked"</TMPL_IF> />
+        <label for="talkpostfromanon" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></label>
         <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>
+            <strong><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></strong>
         </div>
     </div>
 <TMPL_ELSIF friends_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>
+        <input type="radio" name="usertype" value="anonymous" data-value="anonymous" id="talkpostfromanon" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_anonymous>checked="checked"</TMPL_IF> />
+        <label for="talkpostfromanon" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></label>
         <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 ml_friendsonly></span>
+            <strong><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></strong>
         </div>
     </div>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/Author-OpenID.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-OpenID.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/Author-OpenID.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -2,20 +2,18 @@
     <TMPL_IF everyone_can_comment>
         <TMPL_IF is_identity>
             <div class="b-postform-login-item b-postform-login-openid">
-                <input type="radio" name="usertype" value="openid_cookie" id="talkpostfromoidli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="openid_cookie" data-value="openid" id="talkpostfromoidli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid_cookie>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromoid" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
                 <div class="b-postform-login-opts">
                     <strong><TMPL_VAR remote_display_name></strong>
-                    <TMPL_VAR ml_willscreen>
                 </div>
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-openid">
-                <input type="radio" name="usertype" value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="openid" data-value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromoidlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></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><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class="textbox" name="openid:url" maxlength="60" size="42" id="openid:url" value="<TMPL_VAR openid_url_default>" tabindex="15" /><TMPL_VAR helpicon_openid><input type="hidden" name="oiddo_login" id="oidlogincheck" <TMPL_VAR oiddo_login_checked> /></span>
-                    <TMPL_VAR ml_willscreen>
+                    <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><input class="textbox" name="openid:url" maxlength="60" size="42" id="openid:url" value="<TMPL_VAR openid_url_default>" tabindex="15" placeholder="<TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">" /><TMPL_VAR helpicon_openid><input type="hidden" name="oiddo_login" id="oidlogincheck" <TMPL_VAR oiddo_login_checked> /></span>
                 </div>
             </div>
         </TMPL_IF>
@@ -23,22 +21,23 @@
         <TMPL_IF is_trusted_identity>
             <div class="b-postform-login-item b-postform-login-openid">
                 <TMPL_IF remote_banned>
+                    <input type="radio" name="usertype" value="openid_cookie" data-value="openid" id="talkpostfromoidli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> />
+                    <label for="talkpostfromoidli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
                     <div class="b-postform-login-opts">
                         <TMPL_VAR ml_loggedin>
-                        <TMPL_VAR ml_banned>
                     </div>
                 <TMPL_ELSE>
-                    <input type="radio" name="usertype" value="openid_cookie" id="talkpostfromoidli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> />
+                    <input type="radio" name="usertype" value="openid_cookie" data-value="openid" id="talkpostfromoidli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> />
                     <label for="talkpostfromoidli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
                     <div class="b-postform-login-opts">
                         <strong><TMPL_VAR remote_display_name></strong>
-                        <TMPL_VAR ml_willscreen>
                     </div>
                 </TMPL_IF>
             </div>
         <TMPL_ELSIF is_identity>
             <div class="b-postform-login-item b-postform-login-openid b-postform-login-disabled">
-                <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></span>
+                <input type="radio" name="usertype" value="openid" data-value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromoidlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
                 <div class="b-postform-login-opts">
                     <TMPL_IF is_identity><TMPL_VAR ml_noopenidpost></TMPL_IF>
                     <TMPL_VAR helpicon_openid>
@@ -46,11 +45,10 @@
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-openid">
-                <input type="radio" name="usertype" value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="openid" data-value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromoidlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></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><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class="textbox" name="openid:url" maxlength="60" size="42" id="openid:url" value="<TMPL_VAR openid_url_default>" tabindex="15" /><TMPL_VAR helpicon_openid><input type="hidden" name="oiddo_login" id="oidlogincheck" <TMPL_VAR oiddo_login_checked> /></span>
-                    <TMPL_VAR ml_willscreen>
+                    <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><input class="textbox" name="openid:url" maxlength="60" size="42" id="openid:url" value="<TMPL_VAR openid_url_default>" tabindex="15" placeholder="<TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">" /><TMPL_VAR helpicon_openid><input type="hidden" name="oiddo_login" id="oidlogincheck" <TMPL_VAR oiddo_login_checked> /></span>
                 </div>
             </div>
         </TMPL_IF>
@@ -58,30 +56,28 @@
         <TMPL_IF is_identity>
             <TMPL_IF remote_can_comment>
                 <div class="b-postform-login-item b-postform-login-openid">
-                    <input type="radio" name="usertype" value="openid_cookie" id="talkpostfromoidli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid_cookie>checked="checked"</TMPL_IF> />
-                    <label for="talkpostfromoidli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
+                    <input type="radio" name="usertype" value="openid" data-value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
+                    <label for="talkpostfromoidlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
                     <div class="b-postform-login-opts">
                         <strong><TMPL_VAR remote_display_name></strong>
-                        <TMPL_VAR ml_willscreen>
                     </div>
                 </div>
             <TMPL_ELSE>
                 <div class="b-postform-login-item b-postform-login-openid b-postform-login-disabled">
-                    <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></span>
+                    <input type="radio" name="usertype" value="openid" data-value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
+                    <label for="talkpostfromoidlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
                     <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>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-openid">
-                <input type="radio" name="usertype" value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="openid" data-value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromoidlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></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><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class="textbox" name="openid:url" maxlength="60" size="42" id="openid:url" value="<TMPL_VAR openid_url_default>" tabindex="15" /><TMPL_VAR helpicon_openid><input type="hidden" name="oiddo_login" id="oidlogincheck" <TMPL_VAR oiddo_login_checked> /></span>
-                    <TMPL_VAR ml_willscreen>
+                    <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><input class="textbox" name="openid:url" maxlength="60" size="42" id="openid:url" value="<TMPL_VAR openid_url_default>" tabindex="15" placeholder="<TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">" /><TMPL_VAR helpicon_openid><input type="hidden" name="oiddo_login" id="oidlogincheck" <TMPL_VAR oiddo_login_checked> /></span>
                 </div>
             </div>
         </TMPL_IF>

Modified: trunk/templates/CommentForm/Author-User.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-User.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/Author-User.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,56 +1,45 @@
 <TMPL_IF is_person>
     <TMPL_IF remote_banned>
         <div class="b-postform-login-item b-postform-login-user">
+            <input type="radio" name="usertype" value="cookieuser" data-value="cookieuser" id="talkpostfromremote" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_remote>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromremote" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></label>
             <div class="b-postform-login-opts">
                 <TMPL_VAR ml_loggedin>
                 <span class="b-postform-login-opts-lj"><a href="#livejournal" class="b-postform-notselect"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
-                <TMPL_VAR ml_banned>
             </div>
         </div>
     <TMPL_ELSE>
         <TMPL_IF remote_can_comment>
             <div class="b-postform-login-item b-postform-login-user">
-                <input type="radio" name="usertype" value="cookieuser" id="talkpostfromremote" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_remote>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="cookieuser" data-value="cookieuser" id="talkpostfromremote" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_remote>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromremote" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></label>
                 <div class="b-postform-login-opts">
                     <TMPL_VAR ml_loggedin>
                     <span class="b-postform-login-opts-lj"><a href="#livejournal" class="b-postform-notselect"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
                     <input type='hidden' name='cookieuser' value='<TMPL_VAR remote_username>' id='cookieuser' />
-                    <TMPL_VAR ml_willscreen>
                 </div>
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-user b-postform-login-disabled">
-                <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span>
+                <input type="radio" name="usertype" value="cookieuser" data-value="cookieuser" id="talkpostfromremote" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_remote>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromremote" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></label>
                 <div class="b-postform-login-opts">
                     <TMPL_VAR ml_loggedin>
                     <span class="b-postform-login-opts-lj"><a href="#livejournal" class="b-postform-notselect"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
-                    <TMPL_VAR ml_notafriend>
                     <input type="hidden" name="cookieuser" value="<TMPL_VAR remote_username>" id="cookieuser" />
-                    <TMPL_VAR ml_willscreen>
                 </div>
             </div>
         </TMPL_IF>
     </TMPL_IF>
 </TMPL_IF>
 <div class="b-postform-login-item b-postform-login-livejournal">
-    <input type="radio" name="usertype" value="user" id="talkpostfromlj" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_ljuser>checked="checked"</TMPL_IF> />
+    <input type="radio" name="usertype" value="user" data-value="user" id="talkpostfromlj" class="b-postform-login-radio" tabindex="11" <TMPL_IF whocheck_ljuser>checked="checked"</TMPL_IF> />
     <label for="talkpostfromlj" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></label>
     <div class="b-postform-login-opts">
-        <input class="textbox" name="userpost" size="13" maxlength="15" id="username" value="<TMPL_VAR username_default>" placeholder="<TMPL_VAR expr="ml('Username')">" tabindex="12" />
-        <input class="textbox" name="password" type="password" maxlength="30" size="18" id="password" placeholder="<TMPL_VAR expr="ml('Password')">" tabindex="13" />
-        <TMPL_IF is_person><span class="b-postform-login-opts-lj"><a href="#user" class="b-postform-notselect"><TMPL_VAR expr="ml('/talkpost.bml.back.to')">&nbsp;<em><TMPL_VAR username_default></em></a></span></TMPL_IF>
-        <TMPL_VAR ml_willscreen>
-        <TMPL_VAR ml_willscreenfriend>
-        <input type="hidden" name="do_login" id="logincheck" />
-        <TMPL_UNLESS create_link>
-            <TMPL_UNLESS is_person>
-                <TMPL_VAR ml_noaccount>
-            </TMPL_UNLESS>
-        </TMPL_UNLESS>
+        <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><input class="textbox" name="userpost" size="13" maxlength="15" id="username" value="<TMPL_VAR username_default>" placeholder="<TMPL_VAR expr="ml('Username')">" tabindex="12" /> <input class="textbox" name="password" type="password" maxlength="30" size="18" id="password" placeholder="<TMPL_VAR expr="ml('Password')">" tabindex="13" /><TMPL_IF is_person>&nbsp;<span class="b-postform-login-opts-lj"><a href="#cookieuser" class="b-postform-notselect"><TMPL_VAR expr="ml('/talkpost.bml.back.to')">&nbsp;<em><TMPL_VAR username_default></em></a></span></TMPL_IF><TMPL_VAR ml_willscreenfriend><input type="hidden" name="do_login" id="logincheck" /><TMPL_UNLESS create_link><TMPL_UNLESS is_person>&nbsp;<TMPL_VAR ml_noaccount></TMPL_UNLESS></TMPL_UNLESS></span>
     </div>
 </div>
 
 <script type="text/javascript">
-	jQuery('#username').placeholder();
+    jQuery('#username').placeholder();
 </script>

Modified: trunk/templates/CommentForm/AuthorDisabled-Anonymous.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorDisabled-Anonymous.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorDisabled-Anonymous.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,9 +1,9 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_UNLESS is_public>
-        b-postform-ability-disabled-anonymous
+        b-postform-disabled-anonymous
     </TMPL_UNLESS>
 <TMPL_ELSIF registered_can_comment>
-    b-postform-ability-disabled-anonymous
+    b-postform-disabled-anonymous
 <TMPL_ELSIF friends_can_comment>
-    b-postform-ability-disabled-anonymous
+    b-postform-disabled-anonymous
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorDisabled-Facebook.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorDisabled-Facebook.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorDisabled-Facebook.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -3,7 +3,7 @@
 <TMPL_ELSIF friends_can_comment>
     <TMPL_IF is_identity>
         <TMPL_UNLESS remote_can_comment>
-            b-postform-ability-disabled-facebook
+            b-postform-disabled-facebook
         </TMPL_UNLESS>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorDisabled-MailRU.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorDisabled-MailRU.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorDisabled-MailRU.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -3,7 +3,7 @@
 <TMPL_ELSIF friends_can_comment>
     <TMPL_IF is_identity>
         <TMPL_UNLESS remote_can_comment>
-            b-postform-ability-disabled-mailru
+            b-postform-disabled-mailru
         </TMPL_UNLESS>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorDisabled-OpenID.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorDisabled-OpenID.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorDisabled-OpenID.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -3,12 +3,12 @@
     <TMPL_ELSIF registered_can_comment>
         <TMPL_IF is_trusted_identity>
         <TMPL_ELSIF is_identity>
-            b-postform-ability-disabled-openid
+            b-postform-disabled-openid
         </TMPL_IF>
     <TMPL_ELSIF friends_can_comment>
         <TMPL_IF is_identity>
             <TMPL_UNLESS remote_can_comment>
-                b-postform-ability-disabled-openid
+                b-postform-disabled-openid
             </TMPL_UNLESS>
         </TMPL_IF>
     </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorDisabled-Twitter.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorDisabled-Twitter.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorDisabled-Twitter.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -2,12 +2,12 @@
 <TMPL_ELSIF registered_can_comment>
     <TMPL_IF is_trusted_identity>
     <TMPL_ELSIF is_identity>
-        b-postform-ability-disabled-twitter
+        b-postform-disabled-twitter
     </TMPL_IF>
 <TMPL_ELSIF friends_can_comment>
     <TMPL_IF is_identity>
         <TMPL_UNLESS remote_can_comment>
-            b-postform-ability-disabled-twitter
+            b-postform-disabled-twitter
         </TMPL_UNLESS>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorDisabled-User.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorDisabled-User.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorDisabled-User.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,7 +1,7 @@
 <TMPL_IF is_person>
     <TMPL_UNLESS remote_banned>
         <TMPL_UNLESS remote_can_comment>
-            b-postform-ability-disabled-user
+            b-postform-disabled-user
         </TMPL_UNLESS>
     </TMPL_UNLESS>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-Anonymous.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-Anonymous.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorTitle-Anonymous.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,11 +1,11 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_UNLESS is_public>
-        <span class="b-postform-login-services-item b-postform-login-services-anonymous"><a href="#anonymous" title="<TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost.nonpublic')">" class="b-postform-login-services-disabled"><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" tabindex="11"><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>
     <TMPL_ELSE>
         <span class="b-postform-login-services-item b-postform-login-services-anonymous"><a href="#anonymous" tabindex="11"><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>
     </TMPL_IF>
 <TMPL_ELSIF registered_can_comment>
-    <span class="b-postform-login-services-item b-postform-login-services-anonymous"><a href="#anonymous" title="<TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')">" class="b-postform-login-services-disabled"><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" tabindex="11"><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>
 <TMPL_ELSIF friends_can_comment>
-    <span class="b-postform-login-services-item b-postform-login-services-anonymous"><a href="#anonymous" title="<TMPL_VAR ml_friendsonly>" class="b-postform-login-services-disabled"><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" tabindex="11"><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>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-Facebook.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-Facebook.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorTitle-Facebook.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,15 +1,15 @@
 <TMPL_IF everyone_can_comment>
-    <span class="b-postform-login-services-item b-postform-login-services-facebook"><a href="#facebook" tabindex="11"><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-facebook"><a href="#facebook_cookie" tabindex="11"><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>
 <TMPL_ELSIF registered_can_comment>
-    <span class="b-postform-login-services-item b-postform-login-services-facebook"><a href="#facebook" tabindex="11"><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-facebook"><a href="#facebook_cookie" tabindex="11"><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>
 <TMPL_ELSIF friends_can_comment>
     <TMPL_IF is_identity>
         <TMPL_IF remote_can_comment>
-            <span class="b-postform-login-services-item b-postform-login-services-facebook"><a href="#facebook" tabindex="11"><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-facebook"><a href="#facebook_cookie" tabindex="11"><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>
         <TMPL_ELSE>
-            <span class="b-postform-login-services-item b-postform-login-services-facebook"><a href="#facebook" title="<TMPL_VAR remote_display_name> <TMPL_VAR ml_notafriend> <TMPL_VAR ml_willscreen>" class="b-postform-login-services-disabled"><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-facebook"><a href="#facebook_cookie" tabindex="11"><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>
         </TMPL_IF>
     <TMPL_ELSE>
-        <span class="b-postform-login-services-item b-postform-login-services-facebook"><a href="#facebook" tabindex="11"><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-facebook"><a href="#facebook_cookie" tabindex="11"><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>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-MailRU.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-MailRU.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorTitle-MailRU.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,15 +1,15 @@
 <TMPL_IF everyone_can_comment>
-    <span class="b-postform-login-services-item b-postform-login-services-mailru"><a href="#mailru" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><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-mailru"><a href="#mailru_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span></a></span>
 <TMPL_ELSIF registered_can_comment>
-    <span class="b-postform-login-services-item b-postform-login-services-mailru"><a href="#mailru" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><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-mailru"><a href="#mailru_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span></a></span>
 <TMPL_ELSIF friends_can_comment>
     <TMPL_IF is_identity>
         <TMPL_IF remote_can_comment>
-            <span class="b-postform-login-services-item b-postform-login-services-mailru"><a href="#mailru" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><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-mailru"><a href="#mailru_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span></a></span>
         <TMPL_ELSE>
-            <span class="b-postform-login-services-item b-postform-login-services-mailru"><a href="#mailru" title="<TMPL_VAR remote_display_name> <TMPL_VAR ml_notafriend> <TMPL_VAR ml_willscreen>" class="b-postform-login-services-disabled"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><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-mailru"><a href="#mailru_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span></a></span>
         </TMPL_IF>
     <TMPL_ELSE>
-        <span class="b-postform-login-services-item b-postform-login-services-mailru"><a href="#mailru" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><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-mailru"><a href="#mailru_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif?v=3" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span></a></span>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-OpenID.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-OpenID.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorTitle-OpenID.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,23 +1,23 @@
 <TMPL_IF openid_enabled>
     <TMPL_IF everyone_can_comment>
-        <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#openid" tabindex="11"><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-openid"><a href="#openid_cookie" tabindex="11"><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>
     <TMPL_ELSIF registered_can_comment>
         <TMPL_IF is_trusted_identity>
-            <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#openid" tabindex="11"><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-openid"><a href="#openid_cookie" tabindex="11"><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>
         <TMPL_ELSIF is_identity>
-            <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#openid" title="<TMPL_IF is_identity><TMPL_VAR ml_noopenidpost></TMPL_IF>" class="b-postform-login-services-disabled"><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-openid"><a href="#openid_cookie" tabindex="11"><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>
         <TMPL_ELSE>
-            <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#openid" tabindex="11"><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-openid"><a href="#openid_cookie" tabindex="11"><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>
         </TMPL_IF>
     <TMPL_ELSIF friends_can_comment>
         <TMPL_IF is_identity>
             <TMPL_IF remote_can_comment>
-                <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#openid" tabindex="11"><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-openid"><a href="#openid_cookie" tabindex="11"><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>
             <TMPL_ELSE>
-                <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#openid" title="<TMPL_VAR remote_display_name> <TMPL_VAR ml_notafriend> <TMPL_VAR ml_willscreen>" class="b-postform-login-services-disabled"><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-openid"><a href="#openid_cookie" tabindex="11"><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>
             </TMPL_IF>
         <TMPL_ELSE>
-            <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#openid" tabindex="11"><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-openid"><a href="#openid_cookie" tabindex="11"><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>
         </TMPL_IF>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-Twitter.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-Twitter.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorTitle-Twitter.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,21 +1,21 @@
 <TMPL_IF everyone_can_comment>
-    <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#twitter" tabindex="11"><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-twitter"><a href="#twitter_cookie" tabindex="11"><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>
 <TMPL_ELSIF registered_can_comment>
     <TMPL_IF is_trusted_identity>
-        <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#twitter" tabindex="11"><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-twitter"><a href="#twitter_cookie" tabindex="11"><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>
     <TMPL_ELSIF is_identity>
-        <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#twitter" title="<TMPL_VAR ml_noopenidpost>" class="b-postform-login-services-disabled"><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-twitter"><a href="#twitter_cookie" tabindex="11"><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>
     <TMPL_ELSE>
-        <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#twitter" tabindex="11"><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-twitter"><a href="#twitter_cookie" tabindex="11"><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>
     </TMPL_IF>
 <TMPL_ELSIF friends_can_comment>
     <TMPL_IF is_identity>
         <TMPL_IF remote_can_comment>
-            <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#twitter" tabindex="11"><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-twitter"><a href="#twitter_cookie" tabindex="11"><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>
         <TMPL_ELSE>
-            <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#twitter" title="<TMPL_VAR remote_display_name> <TMPL_VAR ml_notafriend> <TMPL_VAR ml_willscreen>" class="b-postform-login-services-disabled"><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-twitter"><a href="#twitter_cookie" tabindex="11"><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>
         </TMPL_IF>
     <TMPL_ELSE>
-        <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#twitter" tabindex="11"><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-twitter"><a href="#twitter_cookie" tabindex="11"><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>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-User.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-User.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/AuthorTitle-User.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,12 +1,12 @@
 <TMPL_IF is_person>
     <TMPL_IF remote_banned>
-        <span class="b-postform-login-services-item b-postform-login-services-user"><a href="#user" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" /><span class="b-postform-login-services-name"><TMPL_VAR remote_username></span></a></span>
+        <span class="b-postform-login-services-item b-postform-login-services-user"><a href="#cookieuser" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" /><span class="b-postform-login-services-name"><TMPL_VAR remote_username></span></a></span>
     <TMPL_ELSE>
         <TMPL_IF remote_can_comment>
-            <span class="b-postform-login-services-item b-postform-login-services-user"><a href="#user" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" /><span class="b-postform-login-services-name"><TMPL_VAR remote_username></span></a></span>
+            <span class="b-postform-login-services-item b-postform-login-services-user"><a href="#cookieuser" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" /><span class="b-postform-login-services-name"><TMPL_VAR remote_username></span></a></span>
         <TMPL_ELSE>
-            <span class="b-postform-login-services-item b-postform-login-services-user"><a href="#user" title="<TMPL_VAR ml_loggedin> <TMPL_VAR ml_notafriend> <TMPL_VAR ml_willscreen>" class="b-postform-login-services-disabled"><img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" /><span class="b-postform-login-services-name"><TMPL_VAR remote_username></span></a></span>
+            <span class="b-postform-login-services-item b-postform-login-services-user"><a href="#cookieuser" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" /><span class="b-postform-login-services-name"><TMPL_VAR remote_username></span></a></span>
         </TMPL_IF>
     </TMPL_IF>
 </TMPL_IF>
-<span class="b-postform-login-services-item b-postform-login-services-livejournal"><a class="<TMPL_IF is_person><TMPL_IF remote_can_comment>b-postform-login-invisible</TMPL_IF></TMPL_IF>" href="#livejournal" tabindex="11"><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-livejournal"><a href="#livejournal" tabindex="11"><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>

Modified: trunk/templates/CommentForm/Form.tmpl
===================================================================
--- trunk/templates/CommentForm/Form.tmpl	2011-08-24 10:57:27 UTC (rev 19822)
+++ trunk/templates/CommentForm/Form.tmpl	2011-08-24 11:01:55 UTC (rev 19823)
@@ -1,231 +1,189 @@
-<TMPL_IF warnscreened>
-    <div class='ljwarnscreened'><TMPL_VAR expr="ml('/talkpost.bml.warnscreened')"></div>
-</TMPL_IF>
-
-<form method='post' action='<TMPL_VAR lj_siteroot>/talkpost_do.bml' id='postform'>
-<TMPL_VAR form_intro>
-
-<TMPL_IF errors>
-    <ul>
-        <TMPL_LOOP errors>
-            <li><TMPL_VAR error></li>
-        </TMPL_LOOP>
-    </ul>
-    <hr/>
-</TMPL_IF>
-
-<TMPL_VAR tosagree>
-
-<TMPL_VAR create_link>
-
-<table>
-<tr>
-    <td align='right' valign='top' class="b-postform-login-label"><TMPL_VAR expr="ml('/talkpost.bml.opt.from')"></td>
-    <td class="b-postform-login-wrapper">
-        <TMPL_IF 0> Internal for "From" options </TMPL_IF>
-        <TMPL_IF editid>
-            <div class="b-postform-login b-postform-ljedit">
-                    <div class="b-postform-login-item b-postform-login-ljedit">
+<TMPL_IF EXPR="nocomments eq 'Y'">
+    <form method="post" action="<TMPL_VAR lj_siteroot>/talkpost_do.bml" id="postform" class="b-postform
+        <TMPL_IF suspended>b-postform-user-suspended</TMPL_IF>
+        <TMPL_IF deleted>b-postform-user-deleted</TMPL_IF>
+        <TMPL_IF EXPR="remote_banned && (whocanreply eq 'reg' && !email_active)">b-postform-user-banned</TMPL_IF>
+        <TMPL_IF EXPR="whocanreply eq 'friends' && !is_friend">b-postform-user-notafriend</TMPL_IF>
+        <TMPL_IF EXPR="whocanreply eq 'reg' && !email_active && usertype_default ne 'anonymous'">b-postform-user-regonly</TMPL_IF>
+        <TMPL_IF EXPR="whocanreply eq 'reg' && usertype_default eq 'anonymous'">b-postform-user-notanon</TMPL_IF>
+        <TMPL_IF EXPR="show_logips && ml_logcommentips">b-postform-user-logips</TMPL_IF>
+        <TMPL_IF EXPR="(will_be_screened eq 'A') || (will_be_screened eq 'F' && !is_friend) || (will_be_screened eq 'R' and !email_active)">b-postform-user-screened</TMPL_IF>
+        b-postform-realauth-<TMPL_VAR usertype_default>
+        b-postform-authtype-<TMPL_VAR usertype_default>
+        ">
+        <TMPL_VAR form_intro>
+        <TMPL_VAR tosagree>
+        <TMPL_VAR create_link>
+        <table>
+            <tr class="b-postform-loginbox">
+                <td align="right" valign="top" class="b-postform-login-label"><label for="login-current"><TMPL_VAR expr="ml('/talkpost.bml.opt.from')"></label></td>
+                <td class="b-postform-login-wrapper">
+                    <TMPL_IF editid>
                         <TMPL_IF remote_banned>
-                            <div class="b-postform-login-opts">
-                                <img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" class="b-postform-login-img" />
                                 <TMPL_VAR ml_loggedin>
                                 <TMPL_VAR ml_banned>
                             </div>
                         <TMPL_ELSE>
-                            <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span>
-                            <div class="b-postform-login-opts">
-                                <img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" class="b-postform-login-img" />
                                 <TMPL_VAR ml_loggedin>
                                 <input type="hidden" name="usertype" value="cookieuser" />
                                 <input type="hidden" name="cookieuser" value="<TMPL_VAR remote_username>" id="cookieuser" />
-                            </div>
                         </TMPL_IF>
-                </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_IF is_person> b-postform-useranonymous-cookie</TMPL_IF><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 'google_cookie'">google b-postform-google-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_ELSIF expr="usertype_default eq 'vkontakte_cookie'">vkontakte b-postform-vkontakte-cookie</TMPL_IF>
-                <TMPL_LOOP author_options>
-                    <TMPL_INCLUDE expr="sprintf('templates/CommentForm/AuthorDisabled-%s.tmpl', short_code)">
-                </TMPL_LOOP>'>
-                <div class="b-postform-login-services">
-                    <a href="#" class="b-postform-login-services-current" tabindex="10"><i class="b-postform-login-services-current-pic"></i></a>
-                    <div class="b-postform-login-services-items">
-                        <TMPL_LOOP author_options>
-                            <TMPL_INCLUDE expr="sprintf('templates/CommentForm/AuthorTitle-%s.tmpl', short_code)">
-                        </TMPL_LOOP>
+                    <TMPL_ELSE>
+                        <div class="b-postform-login">
+...
 (truncated)
Tags: livejournal, savintsev_egor, tmpl
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments