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

U   trunk/htdocs/stc/lj_base.css
U   trunk/templates/CommentForm/Form.tmpl

Modified: trunk/htdocs/stc/lj_base.css
===================================================================
--- trunk/htdocs/stc/lj_base.css	2011-12-19 08:46:14 UTC (rev 20804)
+++ trunk/htdocs/stc/lj_base.css	2011-12-19 08:49:35 UTC (rev 20805)
@@ -1506,13 +1506,13 @@
 
 .b-postform-authtype-anonymous.b-postform-user-friendonly .b-postform-alert-notafriend,
 .b-postform-authtype-anonymous.b-postform-user-notafriend .b-postform-alert-notafriend,
-.b-postform-realauth-cookieuser.b-postform-authtype-cookieuser.b-postform-user-notafriend .b-postform-alert-notafriend,
-.b-postform-realauth-facebook.b-postform-authtype-facebook.b-postform-user-notafriend .b-postform-alert-notafriend,
-.b-postform-realauth-twitter.b-postform-authtype-twitter.b-postform-user-notafriend .b-postform-alert-notafriend,
-.b-postform-realauth-google.b-postform-authtype-google.b-postform-user-notafriend .b-postform-alert-notafriend,
-.b-postform-realauth-openid.b-postform-authtype-openid.b-postform-user-notafriend .b-postform-alert-notafriend,
-.b-postform-realauth-mailru.b-postform-authtype-mailru.b-postform-user-notafriend .b-postform-alert-notafriend,
-.b-postform-realauth-vkontakte.b-postform-authtype-vkontakte.b-postform-user-notafriend .b-postform-alert-notafriend {
+.b-postform-realauth-cookieuser.b-postform-authtype-cookieuser.b-postform-user-friendonly.b-postform-user-notafriend .b-postform-alert-notafriend,
+.b-postform-realauth-facebook.b-postform-authtype-facebook.b-postform-user-friendonly.b-postform-user-notafriend .b-postform-alert-notafriend,
+.b-postform-realauth-twitter.b-postform-authtype-twitter.b-postform-user-friendonly.b-postform-user-notafriend .b-postform-alert-notafriend,
+.b-postform-realauth-google.b-postform-authtype-google.b-postform-user-friendonly.b-postform-user-notafriend .b-postform-alert-notafriend,
+.b-postform-realauth-openid.b-postform-authtype-openid.b-postform-user-friendonly.b-postform-user-notafriend .b-postform-alert-notafriend,
+.b-postform-realauth-mailru.b-postform-authtype-mailru.b-postform-user-friendonly.b-postform-user-notafriend .b-postform-alert-notafriend,
+.b-postform-realauth-vkontakte.b-postform-authtype-vkontakte.b-postform-user-friendonly.b-postform-user-notafriend .b-postform-alert-notafriend {
 	display: block;
 	}
 

Modified: trunk/templates/CommentForm/Form.tmpl
===================================================================
--- trunk/templates/CommentForm/Form.tmpl	2011-12-19 08:46:14 UTC (rev 20804)
+++ trunk/templates/CommentForm/Form.tmpl	2011-12-19 08:49:35 UTC (rev 20805)
@@ -4,7 +4,7 @@
         <TMPL_IF deleted>b-postform-user-deleted</TMPL_IF>
         <TMPL_IF EXPR="remote_banned && email_active">b-postform-user-banned</TMPL_IF>
         <TMPL_IF EXPR="whocanreply eq 'friends'">b-postform-user-friendonly</TMPL_IF>
-        <TMPL_IF EXPR="whocanreply eq 'friends' && !is_friend">b-postform-user-notafriend</TMPL_IF>
+        <TMPL_IF EXPR="!is_friend">b-postform-user-notafriend</TMPL_IF>
         <TMPL_IF EXPR="whocanreply eq 'reg'">b-postform-user-regonly</TMPL_IF>
         <TMPL_IF EXPR="whocanreply eq 'reg' && !email_active && usertype ne 'anonymous' && usertype ne 'cookieuser'">b-postform-user-notreg</TMPL_IF>
         <TMPL_IF EXPR="!email_active && usertype eq 'cookieuser'">b-postform-user-notmail</TMPL_IF>
@@ -14,6 +14,7 @@
         <TMPL_IF EXPR="will_be_screened eq 'F' && !is_friend">b-postform-user-screened b-postform-user-screened-nonf</TMPL_IF>
         <TMPL_IF EXPR="will_be_screened eq 'R' and !email_active">b-postform-user-screened b-postform-user-screened-anon</TMPL_IF>
         <TMPL_IF EXPR="commentcaptcha eq 'R'">b-postform-captcha-anon</TMPL_IF>
+        <TMPL_IF EXPR="commentcaptcha eq 'F'">b-postform-captcha-nonfriend</TMPL_IF>
         <TMPL_IF EXPR="commentcaptcha eq 'A'">b-postform-captcha-all</TMPL_IF>
         b-postform-trueauth-<TMPL_VAR authtype>
         b-postform-realauth-<TMPL_VAR usertype>