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

[ljcom] r10919: LJSUP-8857: Updating commenting form

Committer: esavintcev
LJSUP-8857: Updating commenting form
U   trunk/templates/CommentForm/Author-Facebook.tmpl
U   trunk/templates/CommentForm/Author-Google.tmpl
U   trunk/templates/CommentForm/Author-MailRU.tmpl
U   trunk/templates/CommentForm/Author-Twitter.tmpl
U   trunk/templates/CommentForm/Author-Vkontakte.tmpl
U   trunk/templates/CommentForm/AuthorTitle-Google.tmpl
U   trunk/templates/CommentForm/AuthorTitle-Vkontakte.tmpl
Modified: trunk/templates/CommentForm/Author-Facebook.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Facebook.tmpl	2011-08-25 07:33:55 UTC (rev 10918)
+++ trunk/templates/CommentForm/Author-Facebook.tmpl	2011-08-25 08:05:40 UTC (rev 10919)
@@ -1,7 +1,7 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_IF is_identity>
         <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" tabindex="14" <TMPL_IF whocheck_facebook_cookie>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="facebook_cookie" data-value="facebook_cookie" id="talkpostfromfbli" class="b-postform-login-radio" tabindex="14" <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>
@@ -9,7 +9,7 @@
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-facebook">
-            <input type="radio" name="usertype" value="facebook" id="talkpostfromfblo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_facebook>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="facebook" data-value="facebook_cookie" id="talkpostfromfblo" class="b-postform-login-radio" tabindex="14" <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>
@@ -21,10 +21,10 @@
         <div class="b-postform-login-item b-postform-login-facebook">
             <TMPL_IF remote_banned>
                 <div class="b-postform-login-opts">
-                    <TMPL_VAR ml_loggedin>
+                    <strong><TMPL_VAR remote_display_name></strong>
                 </div>
             <TMPL_ELSE>
-                <input type="radio" name="usertype" value="facebook_cookie" id="talkpostfromfbli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_facebook_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="facebook_cookie" data-value="facebook_cookie" id="talkpostfromfbli" class="b-postform-login-radio" tabindex="14" <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>
@@ -33,7 +33,7 @@
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-facebook">
-            <input type="radio" name="usertype" value="facebook" id="talkpostfromfblo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_facebook>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="facebook" data-value="facebook_cookie" id="talkpostfromfblo" class="b-postform-login-radio" tabindex="14" <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>
@@ -44,7 +44,7 @@
     <TMPL_IF is_identity>
         <TMPL_IF remote_can_comment>
             <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" tabindex="14" <TMPL_IF whocheck_facebook_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="facebook_cookie" data-value="facebook_cookie" id="talkpostfromfbli" class="b-postform-login-radio" tabindex="14" <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>
@@ -55,13 +55,12 @@
                 <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>
                 </div>
             </div>
         </TMPL_IF>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-facebook">
-            <input type="radio" name="usertype" value="facebook" id="talkpostfromfblo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_facebook>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="facebook" data-value="facebook_cookie" id="talkpostfromfblo" class="b-postform-login-radio" tabindex="14" <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>

Modified: trunk/templates/CommentForm/Author-Google.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Google.tmpl	2011-08-25 07:33:55 UTC (rev 10918)
+++ trunk/templates/CommentForm/Author-Google.tmpl	2011-08-25 08:05:40 UTC (rev 10919)
@@ -1,7 +1,7 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_IF is_identity>
         <div class="b-postform-login-item b-postform-login-google">
-            <input type="radio" tabindex="16" name="usertype" value="google_cookie" data-value="google" id="talkpostfromgoogli" class="b-postform-login-radio" <TMPL_IF whocheck_google_cookie>checked="checked"</TMPL_IF> />
+            <input type="radio" tabindex="16" name="usertype" value="google_cookie" data-value="google_cookie" id="talkpostfromgoogli" class="b-postform-login-radio" <TMPL_IF whocheck_google_cookie>checked="checked"</TMPL_IF> />
             <label for="talkpostfromgoogli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></label>
             <div class="b-postform-login-opts">
                 <strong><TMPL_VAR remote_display_name></strong>
@@ -9,7 +9,7 @@
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-google">
-            <input type="radio" tabindex="16" name="usertype" value="google" data-value="google" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
+            <input type="radio" tabindex="16" name="usertype" value="google" data-value="google_cookie" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
             <label for="talkpostfromgooglo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></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.google.who.you.are')"><TMPL_VAR helpicon_google></span>
@@ -21,12 +21,12 @@
         <TMPL_IF remote_banned>
             <div class="b-postform-login-item b-postform-login-google">
                 <div class="b-postform-login-opts">
-                    <TMPL_VAR ml_loggedin>
+                    <strong><TMPL_VAR remote_display_name></strong>
                 </div>
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-google">
-                <input type="radio" tabindex="16" name="usertype" value="google_cookie" data-value="google" id="talkpostfromgoogli" class="b-postform-login-radio" <TMPL_IF whocheck_google_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" tabindex="16" name="usertype" value="google_cookie" data-value="google_cookie" id="talkpostfromgoogli" class="b-postform-login-radio" <TMPL_IF whocheck_google_cookie>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromgoogli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></label>
                 <div class="b-postform-login-opts">
                     <strong><TMPL_VAR remote_display_name></strong>
@@ -35,7 +35,7 @@
         </TMPL_IF>
     <TMPL_ELSIF is_identity>
         <div class="b-postform-login-item b-postform-login-google b-postform-login-disabled">
-            <input type="radio" tabindex="16" name="usertype" value="google" data-value="google" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
+            <input type="radio" tabindex="16" name="usertype" value="google" data-value="google_cookie" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
             <label for="talkpostfromgooglo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></label>
             <div class="b-postform-login-opts">
                  <strong><TMPL_VAR remote_display_name></strong>
@@ -43,7 +43,7 @@
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-google">
-            <input type="radio" tabindex="16" name="usertype" value="google" data-value="google" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
+            <input type="radio" tabindex="16" name="usertype" value="google" data-value="google_cookie" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
             <label for="talkpostfromgooglo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></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.google.who.you.are')"><TMPL_VAR helpicon_google></span>
@@ -54,7 +54,7 @@
     <TMPL_IF is_identity>
         <TMPL_IF remote_can_comment>
             <div class="b-postform-login-item b-postform-login-google">
-                <input type="radio" tabindex="16" name="usertype" value="google_cookie" data-value="google" id="talkpostfromgoogli" class="b-postform-login-radio" <TMPL_IF whocheck_google_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" tabindex="16" name="usertype" value="google_cookie" data-value="google_cookie" id="talkpostfromgoogli" class="b-postform-login-radio" <TMPL_IF whocheck_google_cookie>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromgoogli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></label>
                 <div class="b-postform-login-opts">
                     <strong><TMPL_VAR remote_display_name></strong>
@@ -62,17 +62,16 @@
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-google b-postform-login-disabled">
-                <input type="radio" tabindex="16" name="usertype" value="google" data-value="google" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
+                <input type="radio" tabindex="16" name="usertype" value="google" data-value="google_cookie" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromgooglo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></label>
                 <div class="b-postform-login-opts">
                     <strong><TMPL_VAR remote_display_name></strong>
-                    <TMPL_VAR ml_notafriend>
                 </div>
             </div>
         </TMPL_IF>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-google">
-            <input type="radio" tabindex="16" name="usertype" value="google" data-value="google" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
+            <input type="radio" tabindex="16" name="usertype" value="google" data-value="google_cookie" id="talkpostfromgooglo" class="b-postform-login-radio" <TMPL_IF whocheck_google>checked="checked"</TMPL_IF> />
             <label for="talkpostfromgooglo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></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.google.who.you.are')"><TMPL_VAR helpicon_google></span>

Modified: trunk/templates/CommentForm/Author-MailRU.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-MailRU.tmpl	2011-08-25 07:33:55 UTC (rev 10918)
+++ trunk/templates/CommentForm/Author-MailRU.tmpl	2011-08-25 08:05:40 UTC (rev 10919)
@@ -1,7 +1,7 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_IF is_identity>
         <div class="b-postform-login-item b-postform-login-mailru">
-            <input type="radio" name="usertype" value="mailru_cookie" data-value="mailru" id="talkpostfrommrli" class="b-postform-login-radio" tabindex="16" <TMPL_IF whocheck_mailru_cookie>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="mailru_cookie" data-value="mailru_cookie" id="talkpostfrommrli" class="b-postform-login-radio" tabindex="16" <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>
@@ -9,7 +9,7 @@
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-mailru">
-            <input type="radio" name="usertype" value="mailru" data-value="mailru" id="talkpostfrommrlo" class="b-postform-login-radio" tabindex="16" <TMPL_IF whocheck_mailru>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="mailru" data-value="mailru_cookie" id="talkpostfrommrlo" class="b-postform-login-radio" tabindex="16" <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>
@@ -21,10 +21,10 @@
         <div class="b-postform-login-item b-postform-login-mailru">
             <TMPL_IF remote_banned>
                 <div class="b-postform-login-opts">
-                    <TMPL_VAR ml_loggedin>
+                    <strong><TMPL_VAR remote_display_name></strong>
                 </div>
             <TMPL_ELSE>
-                <input type="radio" name="usertype" value="mailru_cookie" data-value="mailru" id="talkpostfrommrli" class="b-postform-login-radio" tabindex="16" <TMPL_IF whocheck_mailru_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="mailru_cookie" data-value="mailru_cookie" id="talkpostfrommrli" class="b-postform-login-radio" tabindex="16" <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>
@@ -33,7 +33,7 @@
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-mailru">
-            <input type="radio" name="usertype" value="mailru" data-value="mailru" id="talkpostfrommrlo" class="b-postform-login-radio" tabindex="16" <TMPL_IF whocheck_mailru>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="mailru" data-value="mailru_cookie" id="talkpostfrommrlo" class="b-postform-login-radio" tabindex="16" <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>
@@ -44,7 +44,7 @@
     <TMPL_IF is_identity>
         <TMPL_IF remote_can_comment>
             <div class="b-postform-login-item b-postform-login-mailru">
-                <input type="radio" name="usertype" value="mailru_cookie" data-value="mailru" id="talkpostfrommrli" class="b-postform-login-radio" tabindex="16" <TMPL_IF whocheck_mailru_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="mailru_cookie" data-value="mailru_cookie" id="talkpostfrommrli" class="b-postform-login-radio" tabindex="16" <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>
@@ -52,7 +52,7 @@
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-mailru b-postform-login-disabled">
-                <input type="radio" name="usertype" value="mailru" data-value="mailru" id="talkpostfrommrlo" class="b-postform-login-radio" tabindex="16" <TMPL_IF whocheck_mailru>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="mailru" data-value="mailru_cookie" id="talkpostfrommrlo" class="b-postform-login-radio" tabindex="16" <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">
                     <strong><TMPL_VAR remote_display_name></strong>
@@ -61,7 +61,7 @@
         </TMPL_IF>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-mailru">
-            <input type="radio" name="usertype" value="mailru" data-value="mailru" id="talkpostfrommrlo" class="b-postform-login-radio" tabindex="16" <TMPL_IF whocheck_mailru>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="mailru" data-value="mailru_cookie" id="talkpostfrommrlo" class="b-postform-login-radio" tabindex="16" <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>

Modified: trunk/templates/CommentForm/Author-Twitter.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Twitter.tmpl	2011-08-25 07:33:55 UTC (rev 10918)
+++ trunk/templates/CommentForm/Author-Twitter.tmpl	2011-08-25 08:05:40 UTC (rev 10919)
@@ -1,7 +1,7 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_IF is_identity>
         <div class="b-postform-login-item b-postform-login-twitter">
-            <input type="radio" name="usertype" value="twitter_cookie" data-value="twitter" id="talkpostfromtwli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_twitter_cookie>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="twitter_cookie" data-value="twitter_cookie" id="talkpostfromtwli" class="b-postform-login-radio" tabindex="14" <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>
@@ -9,7 +9,7 @@
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-twitter">
-            <input type="radio" name="usertype" value="twitter" data-value="twitter" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_twitter>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="twitter" data-value="twitter_cookie" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <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>
@@ -20,15 +20,15 @@
     <TMPL_IF is_trusted_identity>
         <TMPL_IF remote_banned>
             <div class="b-postform-login-item b-postform-login-twitter">
-                <input type="radio" name="usertype" value="twitter_cookie" data-value="twitter" id="talkpostfromtwli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_twitter_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="twitter_cookie" data-value="twitter_cookie" id="talkpostfromtwli" class="b-postform-login-radio" tabindex="14" <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">
-                    <TMPL_VAR ml_loggedin>
+                    <strong><TMPL_VAR remote_display_name></strong>
                 </div>
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-twitter">
-                <input type="radio" name="usertype" value="twitter_cookie" data-value="twitter" id="talkpostfromtwli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_twitter_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="twitter_cookie" data-value="twitter_cookie" id="talkpostfromtwli" class="b-postform-login-radio" tabindex="14" <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>
@@ -36,16 +36,16 @@
             </div>
         </TMPL_IF>
     <TMPL_ELSIF is_identity>
-        <div class="b-postform-login-item b-postform-login-twitter b-postform-login-disabled">
-            <input type="radio" name="usertype" value="twitter" data-value="twitter" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <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-item b-postform-login-twitter">
+            <input type="radio" name="usertype" value="twitter" data-value="twitter_cookie" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <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">
                 <strong><TMPL_VAR remote_display_name></strong>
             </div>
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-twitter">
-            <input type="radio" name="usertype" value="twitter" data-value="twitter" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_twitter>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="twitter" data-value="twitter_cookie" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <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>
@@ -56,25 +56,24 @@
     <TMPL_IF is_identity>
         <TMPL_IF remote_can_comment>
             <div class="b-postform-login-item b-postform-login-twitter">
-                <input type="radio" name="usertype" value="twitter_cookie" data-value="twitter" id="talkpostfromtwli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_twitter_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" name="usertype" value="twitter_cookie" data-value="twitter_cookie" id="talkpostfromtwli" class="b-postform-login-radio" tabindex="14" <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>
                 </div>
             </div>
         <TMPL_ELSE>
-            <div class="b-postform-login-item b-postform-login-twitter b-postform-login-disabled">
-                <input type="radio" name="usertype" value="twitter" data-value="twitter" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_twitter>checked="checked"</TMPL_IF> />
+            <div class="b-postform-login-item b-postform-login-twitter">
+                <input type="radio" name="usertype" value="twitter" data-value="twitter_cookie" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <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">
                     <strong><TMPL_VAR remote_display_name></strong>
-                    <TMPL_VAR ml_notafriend>
                 </div>
             </div>
         </TMPL_IF>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-twitter">
-            <input type="radio" name="usertype" value="twitter" data-value="twitter" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_twitter>checked="checked"</TMPL_IF> />
+            <input type="radio" name="usertype" value="twitter" data-value="twitter_cookie" id="talkpostfromtwlo" class="b-postform-login-radio" tabindex="14" <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>

Modified: trunk/templates/CommentForm/Author-Vkontakte.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Vkontakte.tmpl	2011-08-25 07:33:55 UTC (rev 10918)
+++ trunk/templates/CommentForm/Author-Vkontakte.tmpl	2011-08-25 08:05:40 UTC (rev 10919)
@@ -1,7 +1,7 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_IF is_identity>
         <div class="b-postform-login-item b-postform-login-vkontakte">
-            <input type="radio" tabindex="16" name="usertype" value="vkontakte_cookie" data-value="vkontakte" id="talkpostfromvkli" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte_cookie>checked="checked"</TMPL_IF> />
+            <input type="radio" tabindex="16" name="usertype" value="vkontakte_cookie" data-value="vkontakte_cookie" id="talkpostfromvkli" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte_cookie>checked="checked"</TMPL_IF> />
             <label for="talkpostfromvkli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></label>
             <div class="b-postform-login-opts">
                 <strong><TMPL_VAR remote_display_name></strong>
@@ -9,7 +9,7 @@
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-vkontakte">
-            <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte" id="talkpostfromvklo" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte>checked="checked"</TMPL_IF> />
+            <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte_cookie" id="talkpostfromvklo" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte>checked="checked"</TMPL_IF> />
             <label for="talkpostfromvklo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></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.vkontakte.who.you.are')"><TMPL_VAR helpicon_vkontakte></span>
@@ -20,15 +20,15 @@
     <TMPL_IF is_trusted_identity>
         <TMPL_IF remote_banned>
             <div class="b-postform-login-item b-postform-login-vkontakte">
-                <input type="radio" tabindex="16" name="usertype" value="vkontakte_cookie" data-value="vkontakte" id="talkpostfromvkli" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" tabindex="16" name="usertype" value="vkontakte_cookie" data-value="vkontakte_cookie" id="talkpostfromvkli" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte_cookie>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromvkli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></label>
                 <div class="b-postform-login-opts">
-                    <TMPL_VAR ml_loggedin>
+                    <strong><TMPL_VAR remote_display_name></strong>
                 </div>
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-vkontakte">
-                <input type="radio" tabindex="16" name="usertype" value="vkontakte_cookie" data-value="vkontakte" id="talkpostfromvkli" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" tabindex="16" name="usertype" value="vkontakte_cookie" data-value="vkontakte_cookie" id="talkpostfromvkli" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte_cookie>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromvkli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></label>
                 <div class="b-postform-login-opts">
                     <strong><TMPL_VAR remote_display_name></strong>
@@ -37,7 +37,7 @@
         </TMPL_IF>
     <TMPL_ELSIF is_identity>
         <div class="b-postform-login-item b-postform-login-vkontakte b-postform-login-disabled">
-            <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte" id="talkpostfromvklo" class="b-postform-login-radio" checked="checked" />
+            <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte_cookie" id="talkpostfromvklo" class="b-postform-login-radio" checked="checked" />
             <label for="talkpostfromvklo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></la
             <div class="b-postform-login-opts">
                 <strong><TMPL_VAR remote_display_name></strong>
@@ -45,7 +45,7 @@
         </div>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-vkontakte">
-            <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte" id="talkpostfromvklo" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte>checked="checked"</TMPL_IF> />
+            <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte_cookie" id="talkpostfromvklo" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte>checked="checked"</TMPL_IF> />
             <label for="talkpostfromvklo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></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.vkontakte.who.you.are')"><TMPL_VAR helpicon_vkontakte></span>
@@ -56,7 +56,7 @@
     <TMPL_IF is_identity>
         <TMPL_IF remote_can_comment>
             <div class="b-postform-login-item b-postform-login-vkontakte">
-                <input type="radio" tabindex="16" name="usertype" value="vkontakte_cookie" data-value="vkontakte" id="talkpostfromvkli" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte_cookie>checked="checked"</TMPL_IF> />
+                <input type="radio" tabindex="16" name="usertype" value="vkontakte_cookie" data-value="vkontakte_cookie" id="talkpostfromvkli" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte_cookie>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromvkli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></label>
                 <div class="b-postform-login-opts">
                     <strong><TMPL_VAR remote_display_name></strong>
@@ -64,17 +64,16 @@
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-vkontakte b-postform-login-disabled">
-                <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte" id="talkpostfromvklo" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte>checked="checked"</TMPL_IF> />
+                <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte_cookie" id="talkpostfromvklo" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte>checked="checked"</TMPL_IF> />
                 <label for="talkpostfromvklo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></label>
                 <div class="b-postform-login-opts">
                     <strong><TMPL_VAR remote_display_name></strong>
-                    <TMPL_VAR ml_notafriend>
                 </div>
             </div>
         </TMPL_IF>
     <TMPL_ELSE>
         <div class="b-postform-login-item b-postform-login-vkontakte">
-            <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte" id="talkpostfromvklo" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte>checked="checked"</TMPL_IF> />
+            <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte_cookie" id="talkpostfromvklo" class="b-postform-login-radio" <TMPL_IF whocheck_vkontakte>checked="checked"</TMPL_IF> />
             <label for="talkpostfromvklo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></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.vkontakte.who.you.are')"><TMPL_VAR helpicon_vkontakte></span>

Modified: trunk/templates/CommentForm/AuthorTitle-Google.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-Google.tmpl	2011-08-25 07:33:55 UTC (rev 10918)
+++ trunk/templates/CommentForm/AuthorTitle-Google.tmpl	2011-08-25 08:05:40 UTC (rev 10919)
@@ -1,21 +1,21 @@
 <TMPL_IF everyone_can_comment>
-    <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.google')"></span></a></span>
+    <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'google'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.google')"></TMPL_IF></span></a></span>
 <TMPL_ELSIF registered_can_comment>
     <TMPL_IF is_trusted_identity>
-        <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.google')"></span></a></span>
+        <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'google'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.google')"></TMPL_IF></span></a></span>
     <TMPL_ELSIF is_identity>
-        <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.google')"></span></a></span>
+        <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'google'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.google')"></TMPL_IF></span></a></span>
     <TMPL_ELSE>
-        <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.google')"></span></a></span>
+        <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'google'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.google')"></TMPL_IF></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-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.google')"></span></a></span>
+            <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'google'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.google')"></TMPL_IF></span></a></span>
         <TMPL_ELSE>
-            <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.google')"></span></a></span>
+            <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'google'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.google')"></TMPL_IF></span></a></span>
         </TMPL_IF>
     <TMPL_ELSE>
-        <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.google')"></span></a></span>
+        <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/google-16.png" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'google'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.google')"></TMPL_IF></span></a></span>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-Vkontakte.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-Vkontakte.tmpl	2011-08-25 07:33:55 UTC (rev 10918)
+++ trunk/templates/CommentForm/AuthorTitle-Vkontakte.tmpl	2011-08-25 08:05:40 UTC (rev 10919)
@@ -1,21 +1,21 @@
 <TMPL_IF everyone_can_comment>
-    <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span>
+    <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'vkontakte'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></TMPL_IF></span></a></span>
 <TMPL_ELSIF registered_can_comment>
     <TMPL_IF is_trusted_identity>
-        <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span>
+        <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'vkontakte'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></TMPL_IF></span></a></span>
     <TMPL_ELSIF is_identity>
-        <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span>
+        <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'vkontakte'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></TMPL_IF></span></a></span>
     <TMPL_ELSE>
-        <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span>
+        <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'vkontakte'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></TMPL_IF></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-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span>
+            <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'vkontakte'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></TMPL_IF></span></a></span>
         <TMPL_ELSE>
-            <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span>
+            <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'vkontakte'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></TMPL_IF></span></a></span>
         </TMPL_IF>
     <TMPL_ELSE>
-        <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span>
+        <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte_cookie" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/icons/vkontakte-16.gif" /><span class="b-postform-login-services-name"><TMPL_IF EXPR="service_short_code eq 'vkontakte'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></TMPL_IF></span></a></span>
     </TMPL_IF>
 </TMPL_IF>

Tags: ljcom, 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