[livejournal] r19836: LJSUP-8857: Updating commenting form: changelog

Committer: esavintcev

LJSUP-8857: Updating commenting form

U   trunk/templates/CommentForm/Author-OpenID.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

Modified: trunk/templates/CommentForm/Author-OpenID.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-OpenID.tmpl	2011-08-25 07:33:29 UTC (rev 19835)
+++ trunk/templates/CommentForm/Author-OpenID.tmpl	2011-08-25 08:04:58 UTC (rev 19836)
@@ -2,7 +2,7 @@
     <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" data-value="openid" 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_cookie" 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>
@@ -10,7 +10,7 @@
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-openid">
-                <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> />
+                <input type="radio" name="usertype" value="openid" data-value="openid_cookie" 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><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>
@@ -21,13 +21,13 @@
         <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> />
+                    <input type="radio" name="usertype" value="openid_cookie" data-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>
                     <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="openid_cookie" data-value="openid" 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_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>
                     <div class="b-postform-login-opts">
                         <strong><TMPL_VAR remote_display_name></strong>
@@ -36,16 +36,15 @@
             </div>
         <TMPL_ELSIF is_identity>
             <div class="b-postform-login-item b-postform-login-openid b-postform-login-disabled">
-                <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> />
+                <input type="radio" name="usertype" value="openid" data-value="openid_cookie" 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>
+                    <strong><TMPL_VAR remote_display_name></strong>
                 </div>
             </div>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-openid">
-                <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> />
+                <input type="radio" name="usertype" value="openid" data-value="openid_cookie" 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><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>
@@ -56,7 +55,7 @@
         <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" data-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_cookie" 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>
@@ -64,17 +63,16 @@
                 </div>
             <TMPL_ELSE>
                 <div class="b-postform-login-item b-postform-login-openid b-postform-login-disabled">
-                    <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> />
+                    <input type="radio" name="usertype" value="openid" data-value="openid_cookie" 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>
                     </div>
                 </div>
             </TMPL_IF>
         <TMPL_ELSE>
             <div class="b-postform-login-item b-postform-login-openid">
-                <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> />
+                <input type="radio" name="usertype" value="openid" data-value="openid_cookie" 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><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>

Modified: trunk/templates/CommentForm/AuthorTitle-Facebook.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-Facebook.tmpl	2011-08-25 07:33:29 UTC (rev 19835)
+++ trunk/templates/CommentForm/AuthorTitle-Facebook.tmpl	2011-08-25 08:04:58 UTC (rev 19836)
@@ -1,15 +1,15 @@
 <TMPL_IF everyone_can_comment>
-    <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>
+    <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_IF EXPR="service_short_code eq 'facebook'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></TMPL_IF></span></a></span>
 <TMPL_ELSIF registered_can_comment>
-    <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>
+    <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_IF EXPR="service_short_code eq 'facebook'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></TMPL_IF></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_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>
+            <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_IF EXPR="service_short_code eq 'facebook'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></TMPL_IF></span></a></span>
         <TMPL_ELSE>
-            <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>
+            <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_IF EXPR="service_short_code eq 'facebook'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></TMPL_IF></span></a></span>
         </TMPL_IF>
     <TMPL_ELSE>
-        <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>
+        <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_IF EXPR="service_short_code eq 'facebook'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></TMPL_IF></span></a></span>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-MailRU.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-MailRU.tmpl	2011-08-25 07:33:29 UTC (rev 19835)
+++ trunk/templates/CommentForm/AuthorTitle-MailRU.tmpl	2011-08-25 08:04:58 UTC (rev 19836)
@@ -1,15 +1,15 @@
 <TMPL_IF everyone_can_comment>
-    <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>
+    <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_IF EXPR="service_short_code eq 'mailru'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></TMPL_IF></span></a></span>
 <TMPL_ELSIF registered_can_comment>
-    <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>
+    <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_IF EXPR="service_short_code eq 'mailru'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></TMPL_IF></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_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>
+            <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_IF EXPR="service_short_code eq 'mailru'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></TMPL_IF></span></a></span>
         <TMPL_ELSE>
-            <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>
+            <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_IF EXPR="service_short_code eq 'mailru'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></TMPL_IF></span></a></span>
         </TMPL_IF>
     <TMPL_ELSE>
-        <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>
+        <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_IF EXPR="service_short_code eq 'mailru'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></TMPL_IF></span></a></span>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-OpenID.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-OpenID.tmpl	2011-08-25 07:33:29 UTC (rev 19835)
+++ trunk/templates/CommentForm/AuthorTitle-OpenID.tmpl	2011-08-25 08:04:58 UTC (rev 19836)
@@ -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_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>
+        <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_IF EXPR="service_short_code eq 'openid'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.openid')"></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-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>
+            <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_IF EXPR="service_short_code eq 'openid'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.openid')"></TMPL_IF></span></a></span>
         <TMPL_ELSIF is_identity>
-            <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>
+            <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_IF EXPR="service_short_code eq 'openid'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.openid')"></TMPL_IF></span></a></span>
         <TMPL_ELSE>
-            <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>
+            <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_IF EXPR="service_short_code eq 'openid'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.openid')"></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-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>
+                <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_IF EXPR="service_short_code eq 'openid'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.openid')"></TMPL_IF></span></a></span>
             <TMPL_ELSE>
-                <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>
+                <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_IF EXPR="service_short_code eq 'openid'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.openid')"></TMPL_IF></span></a></span>
             </TMPL_IF>
         <TMPL_ELSE>
-            <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>
+            <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_IF EXPR="service_short_code eq 'openid'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.openid')"></TMPL_IF></span></a></span>
         </TMPL_IF>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/AuthorTitle-Twitter.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-Twitter.tmpl	2011-08-25 07:33:29 UTC (rev 19835)
+++ trunk/templates/CommentForm/AuthorTitle-Twitter.tmpl	2011-08-25 08:04:58 UTC (rev 19836)
@@ -1,21 +1,21 @@
 <TMPL_IF everyone_can_comment>
-    <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>
+    <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_IF EXPR="service_short_code eq 'twitter'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></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-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>
+        <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_IF EXPR="service_short_code eq 'twitter'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></TMPL_IF></span></a></span>
     <TMPL_ELSIF is_identity>
-        <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>
+        <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_IF EXPR="service_short_code eq 'twitter'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></TMPL_IF></span></a></span>
     <TMPL_ELSE>
-        <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>
+        <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_IF EXPR="service_short_code eq 'twitter'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></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-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>
+            <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_IF EXPR="service_short_code eq 'twitter'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></TMPL_IF></span></a></span>
         <TMPL_ELSE>
-            <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>
+            <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_IF EXPR="service_short_code eq 'twitter'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></TMPL_IF></span></a></span>
         </TMPL_IF>
     <TMPL_ELSE>
-        <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>
+        <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_IF EXPR="service_short_code eq 'twitter'"><TMPL_VAR remote_display_name><TMPL_ELSE><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></TMPL_IF></span></a></span>
     </TMPL_IF>
 </TMPL_IF>

Post a new comment
Error

Anonymous comments are disabled in this journal
ramblerID

We will log you in after post

We will log you in after post

We will log you in after post

We will log you in after post

We will log you in after post

Anonymously

switch

ramblerID

LiveJournal

Facebook

Twitter

OpenId

Google

MailRu

VKontakte

Anonymously

default userpic

Your reply will be screened

Your IP address will be recorded

Preview comment

Help
0 comments

Post a new comment
0 comments

Log in

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

[livejournal] r23491: LJSUP-14677: Provide additional info in ...

[ljcom] r13048: LJSUP-14561: Suspicious Login Notificati...

[livejournal] r23460: LJSUP-14527: Improve reset_password admi...

Error