Committer: esavintcev
LJSUP-8857: Updating commenting formU 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/AuthorDisabled-Google.tmpl U trunk/templates/CommentForm/AuthorDisabled-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-24 08:55:42 UTC (rev 10915) +++ trunk/templates/CommentForm/Author-Facebook.tmpl 2011-08-24 11:02:42 UTC (rev 10916) @@ -5,7 +5,6 @@ <label for="talkpostfromfbli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label> <div class="b-postform-login-opts"> <strong><TMPL_VAR remote_display_name></strong> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> @@ -14,7 +13,6 @@ <label for="talkpostfromfblo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label> <div class="b-postform-login-opts"> <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"><TMPL_VAR helpicon_facebook></span> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -24,14 +22,12 @@ <TMPL_IF remote_banned> <div class="b-postform-login-opts"> <TMPL_VAR ml_loggedin> - <TMPL_VAR ml_banned> </div> <TMPL_ELSE> <input type="radio" name="usertype" value="facebook_cookie" id="talkpostfromfbli" class="b-postform-login-radio" 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> - <TMPL_VAR ml_willscreen> </div> </TMPL_IF> </div> @@ -41,7 +37,6 @@ <label for="talkpostfromfblo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label> <div class="b-postform-login-opts"> <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"><TMPL_VAR helpicon_facebook></span> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -53,7 +48,6 @@ <label for="talkpostfromfbli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label> <div class="b-postform-login-opts"> <strong><TMPL_VAR remote_display_name></strong> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> @@ -62,7 +56,6 @@ <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> @@ -72,7 +65,6 @@ <label for="talkpostfromfblo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></label> <div class="b-postform-login-opts"> <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"><TMPL_VAR helpicon_facebook></span> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> Modified: trunk/templates/CommentForm/Author-Google.tmpl =================================================================== --- trunk/templates/CommentForm/Author-Google.tmpl 2011-08-24 08:55:42 UTC (rev 10915) +++ trunk/templates/CommentForm/Author-Google.tmpl 2011-08-24 11:02:42 UTC (rev 10916) @@ -1,20 +1,18 @@ <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-google"> - <input type="radio" tabindex="16" name="usertype" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -24,34 +22,31 @@ <div class="b-postform-login-item b-postform-login-google"> <div class="b-postform-login-opts"> <TMPL_VAR ml_loggedin> - <TMPL_VAR ml_banned> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-google"> - <input type="radio" tabindex="16" name="usertype" value="google_cookie" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> <TMPL_ELSIF is_identity> <div class="b-postform-login-item b-postform-login-google b-postform-login-disabled"> - <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></span> + <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> /> + <label for="talkpostfromgooglo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></label> <div class="b-postform-login-opts"> - <TMPL_VAR ml_noopenidpost> - <TMPL_VAR helpicon_google> + <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -59,30 +54,28 @@ <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-google b-postform-login-disabled"> - <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.google')"></span> + <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> /> + <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> - <TMPL_VAR ml_willscreen> </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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> Modified: trunk/templates/CommentForm/Author-MailRU.tmpl =================================================================== --- trunk/templates/CommentForm/Author-MailRU.tmpl 2011-08-24 08:55:42 UTC (rev 10915) +++ trunk/templates/CommentForm/Author-MailRU.tmpl 2011-08-24 11:02:42 UTC (rev 10916) @@ -1,20 +1,18 @@ <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-mailru"> - <input type="radio" name="usertype" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -24,24 +22,21 @@ <TMPL_IF remote_banned> <div class="b-postform-login-opts"> <TMPL_VAR ml_loggedin> - <TMPL_VAR ml_banned> </div> <TMPL_ELSE> - <input type="radio" name="usertype" value="mailru_cookie" id="talkpostfrommrli" class="b-postform-login-radio" tabindex="16" <TMPL_IF whocheck_mailru_cookie>checked="checked"</TMPL_IF> /> + <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> /> <label for="talkpostfrommrli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></label> <div class="b-postform-login-opts"> <strong><TMPL_VAR remote_display_name></strong> - <TMPL_VAR ml_willscreen> </div> </TMPL_IF> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-mailru"> - <input type="radio" name="usertype" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -49,30 +44,28 @@ <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-mailru b-postform-login-disabled"> - <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span> + <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> /> + <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> <TMPL_VAR ml_notafriend> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-mailru"> - <input type="radio" name="usertype" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> Modified: trunk/templates/CommentForm/Author-Twitter.tmpl =================================================================== --- trunk/templates/CommentForm/Author-Twitter.tmpl 2011-08-24 08:55:42 UTC (rev 10915) +++ trunk/templates/CommentForm/Author-Twitter.tmpl 2011-08-24 11:02:42 UTC (rev 10916) @@ -1,20 +1,18 @@ <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-twitter"> - <input type="radio" name="usertype" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -22,36 +20,35 @@ <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> /> + <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> - <TMPL_VAR ml_banned> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-twitter"> - <input type="radio" name="usertype" value="twitter_cookie" id="talkpostfromtwli" class="b-postform-login-radio" tabindex="14" <TMPL_IF whocheck_twitter_cookie>checked="checked"</TMPL_IF> /> + <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> /> <label for="talkpostfromtwli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></label> <div class="b-postform-login-opts"> <strong><TMPL_VAR remote_display_name></strong> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> <TMPL_ELSIF is_identity> <div class="b-postform-login-item b-postform-login-twitter b-postform-login-disabled"> - <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></span> + <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-opts"> - <TMPL_VAR ml_noopenidpost> - <TMPL_VAR helpicon_twitter> + <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -59,30 +56,28 @@ <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-twitter b-postform-login-disabled"> - <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></span> + <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-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-twitter"> - <input type="radio" name="usertype" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> Modified: trunk/templates/CommentForm/Author-Vkontakte.tmpl =================================================================== --- trunk/templates/CommentForm/Author-Vkontakte.tmpl 2011-08-24 08:55:42 UTC (rev 10915) +++ trunk/templates/CommentForm/Author-Vkontakte.tmpl 2011-08-24 11:02:42 UTC (rev 10916) @@ -1,20 +1,18 @@ <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-vkontakte"> - <input type="radio" tabindex="16" name="usertype" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -22,36 +20,35 @@ <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> /> + <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> - <TMPL_VAR ml_banned> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-vkontakte"> - <input type="radio" tabindex="16" name="usertype" value="vkontakte_cookie" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> <TMPL_ELSIF is_identity> <div class="b-postform-login-item b-postform-login-vkontakte b-postform-login-disabled"> - <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></span> + <input type="radio" tabindex="16" name="usertype" value="vkontakte" data-value="vkontakte" 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"> - <TMPL_VAR ml_noopenidpost> - <TMPL_VAR helpicon_vkontakte> + <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> @@ -59,30 +56,28 @@ <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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> <TMPL_ELSE> <div class="b-postform-login-item b-postform-login-vkontakte b-postform-login-disabled"> - <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.vkontakte')"></span> + <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> /> + <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> - <TMPL_VAR ml_willscreen> </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" 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" 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> - <TMPL_VAR ml_willscreen> </div> </div> </TMPL_IF> Modified: trunk/templates/CommentForm/AuthorDisabled-Google.tmpl =================================================================== --- trunk/templates/CommentForm/AuthorDisabled-Google.tmpl 2011-08-24 08:55:42 UTC (rev 10915) +++ trunk/templates/CommentForm/AuthorDisabled-Google.tmpl 2011-08-24 11:02:42 UTC (rev 10916) @@ -2,12 +2,12 @@ <TMPL_ELSIF registered_can_comment> <TMPL_IF is_trusted_identity> <TMPL_ELSIF is_identity> - b-postform-ability-disabled-google + b-postform-disabled-google </TMPL_IF> <TMPL_ELSIF friends_can_comment> <TMPL_IF is_identity> <TMPL_UNLESS remote_can_comment> - b-postform-ability-disabled-google + b-postform-disabled-google </TMPL_UNLESS> </TMPL_IF> </TMPL_IF> Modified: trunk/templates/CommentForm/AuthorDisabled-Vkontakte.tmpl =================================================================== --- trunk/templates/CommentForm/AuthorDisabled-Vkontakte.tmpl 2011-08-24 08:55:42 UTC (rev 10915) +++ trunk/templates/CommentForm/AuthorDisabled-Vkontakte.tmpl 2011-08-24 11:02:42 UTC (rev 10916) @@ -2,12 +2,12 @@ <TMPL_ELSIF registered_can_comment> <TMPL_IF is_trusted_identity> <TMPL_ELSIF is_identity> - b-postform-ability-disabled-vkontakte + b-postform-disabled-vkontakte </TMPL_IF> <TMPL_ELSIF friends_can_comment> <TMPL_IF is_identity> <TMPL_UNLESS remote_can_comment> - b-postform-ability-disabled-vkontakte + b-postform-disabled-vkontakte </TMPL_UNLESS> </TMPL_IF> </TMPL_IF> Modified: trunk/templates/CommentForm/AuthorTitle-Google.tmpl =================================================================== --- trunk/templates/CommentForm/AuthorTitle-Google.tmpl 2011-08-24 08:55:42 UTC (rev 10915) +++ trunk/templates/CommentForm/AuthorTitle-Google.tmpl 2011-08-24 11:02:42 UTC (rev 10916) @@ -1,21 +1,21 @@ <TMPL_IF everyone_can_comment> - <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google" 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_VAR expr="ml('/talkpost.bml.google')"></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" 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_VAR expr="ml('/talkpost.bml.google')"></span></a></span> <TMPL_ELSIF is_identity> - <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google" title="<TMPL_VAR ml_noopenidpost>" class="b-postform-login-services-disabled"><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_VAR expr="ml('/talkpost.bml.google')"></span></a></span> <TMPL_ELSE> - <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google" 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_VAR expr="ml('/talkpost.bml.google')"></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" 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_VAR expr="ml('/talkpost.bml.google')"></span></a></span> <TMPL_ELSE> - <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google" 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/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_VAR expr="ml('/talkpost.bml.google')"></span></a></span> </TMPL_IF> <TMPL_ELSE> - <span class="b-postform-login-services-item b-postform-login-services-google"><a href="#google" 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_VAR expr="ml('/talkpost.bml.google')"></span></a></span> </TMPL_IF> </TMPL_IF> Modified: trunk/templates/CommentForm/AuthorTitle-Vkontakte.tmpl =================================================================== --- trunk/templates/CommentForm/AuthorTitle-Vkontakte.tmpl 2011-08-24 08:55:42 UTC (rev 10915) +++ trunk/templates/CommentForm/AuthorTitle-Vkontakte.tmpl 2011-08-24 11:02:42 UTC (rev 10916) @@ -1,21 +1,21 @@ <TMPL_IF everyone_can_comment> - <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte" 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_VAR expr="ml('/talkpost.bml.vkontakte')"></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" 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_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span> <TMPL_ELSIF is_identity> - <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte" title="<TMPL_VAR ml_noopenidpost>" class="b-postform-login-services-disabled"><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_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span> <TMPL_ELSE> - <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte" 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_VAR expr="ml('/talkpost.bml.vkontakte')"></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" 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_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span> <TMPL_ELSE> - <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte" 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/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_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span> </TMPL_IF> <TMPL_ELSE> - <span class="b-postform-login-services-item b-postform-login-services-vkontakte"><a href="#vkontakte" 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_VAR expr="ml('/talkpost.bml.vkontakte')"></span></a></span> </TMPL_IF> </TMPL_IF>