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

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

Modified: trunk/htdocs/stc/lj_base.css
===================================================================
--- trunk/htdocs/stc/lj_base.css	2011-08-25 07:24:38 UTC (rev 19832)
+++ trunk/htdocs/stc/lj_base.css	2011-08-25 07:29:51 UTC (rev 19833)
@@ -1165,7 +1165,8 @@
 .b-postform-alert-banned,
 .b-postform-alert-notafriend,
 .b-postform-alert-notreg,
-.b-postform-alert-regonly {
+.b-postform-alert-regonly,
+.b-postform-alert-ajax {
 	display: none;
 	}
 
@@ -1479,31 +1480,49 @@
 .b-postform-realauth-facebook_cookie.b-postform-authtype-facebook_cookie.b-postform-user-notreg .b-postform-msgbox,
 .b-postform-realauth-facebook_cookie.b-postform-authtype-facebook_cookie.b-postform-user-notreg .b-postform-repostbox,
 .b-postform-realauth-facebook_cookie.b-postform-authtype-facebook_cookie.b-postform-user-notreg .b-postform-submitbox,
+.b-postform-realauth-facebook_cookie.b-postform-authtype-facebook_cookie.b-postform-user-notreg .b-postform-alert-screened,
+.b-postform-realauth-facebook_cookie.b-postform-authtype-facebook_cookie.b-postform-user-notreg.b-postform-user-screened-nonf .b-postform-alert-screened,
+.b-postform-realauth-facebook_cookie.b-postform-authtype-facebook_cookie.b-postform-user-notreg .b-postform-alert-logcommentips,
 
 .b-postform-realauth-twitter_cookie.b-postform-authtype-twitter_cookie.b-postform-user-notreg .b-postform-subjectbox,
 .b-postform-realauth-twitter_cookie.b-postform-authtype-twitter_cookie.b-postform-user-notreg .b-postform-msgbox,
 .b-postform-realauth-twitter_cookie.b-postform-authtype-twitter_cookie.b-postform-user-notreg .b-postform-repostbox,
 .b-postform-realauth-twitter_cookie.b-postform-authtype-twitter_cookie.b-postform-user-notreg .b-postform-submitbox,
+.b-postform-realauth-twitter_cookie.b-postform-authtype-twitter_cookie.b-postform-user-notreg .b-postform-alert-screened,
+.b-postform-realauth-twitter_cookie.b-postform-authtype-twitter_cookie.b-postform-user-notreg.b-postform-user-screened-nonf .b-postform-alert-screened,
+.b-postform-realauth-twitter_cookie.b-postform-authtype-twitter_cookie.b-postform-user-notreg .b-postform-alert-logcommentips,
 
 .b-postform-realauth-google_cookie.b-postform-authtype-google_cookie.b-postform-user-notreg .b-postform-subjectbox,
 .b-postform-realauth-google_cookie.b-postform-authtype-google_cookie.b-postform-user-notreg .b-postform-msgbox,
 .b-postform-realauth-google_cookie.b-postform-authtype-google_cookie.b-postform-user-notreg .b-postform-repostbox,
 .b-postform-realauth-google_cookie.b-postform-authtype-google_cookie.b-postform-user-notreg .b-postform-submitbox,
+.b-postform-realauth-google_cookie.b-postform-authtype-google_cookie.b-postform-user-notreg .b-postform-alert-screened,
+.b-postform-realauth-google_cookie.b-postform-authtype-google_cookie.b-postform-user-notreg.b-postform-user-screened-nonf .b-postform-alert-screened,
+.b-postform-realauth-google_cookie.b-postform-authtype-google_cookie.b-postform-user-notreg .b-postform-alert-logcommentips,
 
 .b-postform-realauth-openid_cookie.b-postform-authtype-openid_cookie.b-postform-user-notreg .b-postform-subjectbox,
 .b-postform-realauth-openid_cookie.b-postform-authtype-openid_cookie.b-postform-user-notreg .b-postform-msgbox,
 .b-postform-realauth-openid_cookie.b-postform-authtype-openid_cookie.b-postform-user-notreg .b-postform-repostbox,
 .b-postform-realauth-openid_cookie.b-postform-authtype-openid_cookie.b-postform-user-notreg .b-postform-submitbox,
+.b-postform-realauth-openid_cookie.b-postform-authtype-openid_cookie.b-postform-user-notreg .b-postform-alert-screened,
+.b-postform-realauth-openid_cookie.b-postform-authtype-openid_cookie.b-postform-user-notreg.b-postform-user-screened-nonf .b-postform-alert-screened,
+.b-postform-realauth-openid_cookie.b-postform-authtype-openid_cookie.b-postform-user-notreg .b-postform-alert-logcommentips,
 
 .b-postform-realauth-mailru_cookie.b-postform-authtype-mailru_cookie.b-postform-user-notreg .b-postform-subjectbox,
 .b-postform-realauth-mailru_cookie.b-postform-authtype-mailru_cookie.b-postform-user-notreg .b-postform-msgbox,
 .b-postform-realauth-mailru_cookie.b-postform-authtype-mailru_cookie.b-postform-user-notreg .b-postform-repostbox,
 .b-postform-realauth-mailru_cookie.b-postform-authtype-mailru_cookie.b-postform-user-notreg .b-postform-submitbox,
+.b-postform-realauth-mailru_cookie.b-postform-authtype-mailru_cookie.b-postform-user-notreg .b-postform-alert-screened,
+.b-postform-realauth-mailru_cookie.b-postform-authtype-mailru_cookie.b-postform-user-notreg.b-postform-user-screened-nonf .b-postform-alert-screened,
+.b-postform-realauth-mailru_cookie.b-postform-authtype-mailru_cookie.b-postform-user-notreg .b-postform-alert-logcommentips,
 
 .b-postform-realauth-vkontakte_cookie.b-postform-authtype-vkontakte_cookie.b-postform-user-notreg .b-postform-subjectbox,
 .b-postform-realauth-vkontakte_cookie.b-postform-authtype-vkontakte_cookie.b-postform-user-notreg .b-postform-msgbox,
 .b-postform-realauth-vkontakte_cookie.b-postform-authtype-vkontakte_cookie.b-postform-user-notreg .b-postform-repostbox,
-.b-postform-realauth-vkontakte_cookie.b-postform-authtype-vkontakte_cookie.b-postform-user-notreg .b-postform-submitbox {
+.b-postform-realauth-vkontakte_cookie.b-postform-authtype-vkontakte_cookie.b-postform-user-notreg .b-postform-submitbox,
+.b-postform-realauth-vkontakte_cookie.b-postform-authtype-vkontakte_cookie.b-postform-user-notreg .b-postform-alert-screened,
+.b-postform-realauth-vkontakte_cookie.b-postform-authtype-vkontakte_cookie.b-postform-user-notreg.b-postform-user-screened-nonf .b-postform-alert-screened,
+.b-postform-realauth-vkontakte_cookie.b-postform-authtype-vkontakte_cookie.b-postform-user-notreg .b-postform-alert-logcommentips {
 	display: none;
 	}
 
@@ -1760,6 +1779,16 @@
 						vertical-align: -4px;
 						border: 0 !important;
 						}
+			.b-postform-realauth-cookieuser .b-postform-login-services-livejournal {
+				display: none;
+				}
+			.b-postform-login-services-livejournal,
+			.b-postform-realauth-cookieuser .b-postform-login-services-user {
+				border-bottom: 1px solid #CCC;
+				}
+			.b-postform-realauth-cookieuser .b-postform-login-services-livejournal {
+				border-bottom: 0;
+				}
 	.b-postform-login-details {
 		position: static;
 		float: none;

Modified: trunk/templates/CommentForm/AuthorTitle-User.tmpl
===================================================================
--- trunk/templates/CommentForm/AuthorTitle-User.tmpl	2011-08-25 07:24:38 UTC (rev 19832)
+++ trunk/templates/CommentForm/AuthorTitle-User.tmpl	2011-08-25 07:29:51 UTC (rev 19833)
@@ -9,4 +9,4 @@
         </TMPL_IF>
     </TMPL_IF>
 </TMPL_IF>
-<span class="b-postform-login-services-item b-postform-login-services-livejournal"><a href="#livejournal" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/pencil.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span></a></span>
+<span class="b-postform-login-services-item b-postform-login-services-livejournal"><a class="<TMPL_IF is_person><TMPL_IF remote_can_comment>b-postform-login-invisible</TMPL_IF></TMPL_IF>" href="#livejournal" tabindex="11"><img src="<TMPL_VAR lj_imgprefix>/pencil.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span></a></span>

Modified: trunk/templates/CommentForm/Form.tmpl
===================================================================
--- trunk/templates/CommentForm/Form.tmpl	2011-08-25 07:24:38 UTC (rev 19832)
+++ trunk/templates/CommentForm/Form.tmpl	2011-08-25 07:29:51 UTC (rev 19833)
@@ -181,17 +181,14 @@
                     <TMPL_IF EXPR="whocanreply eq 'reg'">
                         <p class="b-bubble b-bubble-warning b-bubble-noarrow b-bubble-intext b-postform-alert-regonly"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')"></p>
                     </TMPL_IF>
+                    
+                    <p class="b-bubble b-bubble-warning b-bubble-noarrow b-bubble-intext b-postform-alert-ajax"></p>
                 </td>
             </tr>
         </table>
     </form>
-	
-<script type="text/javascript" src="http://www.ljdev10.livejournal.ru/js/jquery/jquery.lj.commentator.js"></script>	
-	
     <script type="text/javascript">
-        jQuery('#postform')
-			.authtype()
-			.commentator();
+        jQuery('#postform').authtype();
     </script>
 <TMPL_ELSE>
     <p class="b-bubble b-bubble-alert b-bubble-noarrow b-bubble-intext"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost_do.bml.error.nocomments')"></p>