[livejournal] r18551: LJSUP-7762: mail.ru connect

U   trunk/templates/CommentForm/Author-Anonymous.tmpl
U   trunk/templates/CommentForm/Author-User.tmpl
U   trunk/templates/CommentForm/Form.tmpl

Modified: trunk/templates/CommentForm/Author-Anonymous.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Anonymous.tmpl	2011-03-15 09:06:28 UTC (rev 18550)
+++ trunk/templates/CommentForm/Author-Anonymous.tmpl	2011-03-15 09:11:25 UTC (rev 18551)
@@ -19,11 +19,15 @@
 <TMPL_ELSIF registered_can_comment>
     <div class="b-postform-login-item b-postform-login-anonymous b-postform-login-disabled">
         <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span>
-        <TMPL_UNLESS remote_username>
+        <TMPL_IF remote_username>
+        	<div class="b-postform-login-opts b-postform-login-opts-anonymous">
+                <strong><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></strong>
+            </div>
+		<TMPL_ELSE>
             <div class="b-postform-login-opts">
                 <span class="i-bubble b-bubble-alert"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')"></span>
             </div>
-        </TMPL_UNLESS>
+        </TMPL_IF>
     </div>
 <TMPL_ELSIF friends_can_comment>
     <div class="b-postform-login-item b-postform-login-anonymous b-postform-login-disabled">

Modified: trunk/templates/CommentForm/Author-User.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-User.tmpl	2011-03-15 09:06:28 UTC (rev 18550)
+++ trunk/templates/CommentForm/Author-User.tmpl	2011-03-15 09:11:25 UTC (rev 18551)
@@ -3,7 +3,7 @@
         <div class="b-postform-login-item b-postform-login-user">
             <div class="b-postform-login-opts">
                 <TMPL_VAR ml_loggedin>
-                <span class="b-postform-login-opts-lj"><a href="#"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
+                <span class="b-postform-login-opts-lj"><a href="#livejournal" class="b-postform-notselect"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
                 <TMPL_VAR ml_banned>
             </div>
         </div>
@@ -14,7 +14,7 @@
                 <label for="talkpostfromremote" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></label>
                 <div class="b-postform-login-opts">
                     <TMPL_VAR ml_loggedin>
-                    <span class="b-postform-login-opts-lj"><a href="#"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
+                    <span class="b-postform-login-opts-lj"><a href="#livejournal" class="b-postform-notselect"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
                     <input type='hidden' name='cookieuser' value='<TMPL_VAR remote_username>' id='cookieuser' />
                     <TMPL_VAR ml_willscreen>
                 </div>
@@ -24,7 +24,7 @@
                 <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span>
                 <div class="b-postform-login-opts">
                     <TMPL_VAR ml_loggedin>
-                    <span class="b-postform-login-opts-lj"><a href="#"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
+                    <span class="b-postform-login-opts-lj"><a href="#livejournal" class="b-postform-notselect"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
                     <TMPL_VAR ml_notafriend>
                     <input type="hidden" name="cookieuser" value="<TMPL_VAR remote_username>" id="cookieuser" />
                     <TMPL_VAR ml_willscreen>
@@ -39,7 +39,7 @@
     <div class="b-postform-login-opts">
         <input class="textbox" name="userpost" size="13" maxlength="15" id="username" value="<TMPL_VAR username_default>" placeholder="<TMPL_VAR expr="ml('Username')">" />
         <input class="textbox" name="password" type="password" maxlength="30" size="18" id="password" placeholder="<TMPL_VAR expr="ml('Password')">" />
-        <TMPL_IF is_person><span class="b-postform-login-opts-lj"><a href="#"><TMPL_VAR expr="ml('/talkpost.bml.back.to')">&nbsp;<em><TMPL_VAR username_default></em></a></span></TMPL_IF>
+        <TMPL_IF is_person><span class="b-postform-login-opts-lj"><a href="#user" class="b-postform-notselect"><TMPL_VAR expr="ml('/talkpost.bml.back.to')">&nbsp;<em><TMPL_VAR username_default></em></a></span></TMPL_IF>
         <TMPL_VAR ml_willscreen>
         <TMPL_VAR ml_willscreenfriend>
         <input type="hidden" name="do_login" id="logincheck" />

Modified: trunk/templates/CommentForm/Form.tmpl
===================================================================
--- trunk/templates/CommentForm/Form.tmpl	2011-03-15 09:06:28 UTC (rev 18550)
+++ trunk/templates/CommentForm/Form.tmpl	2011-03-15 09:11:25 UTC (rev 18551)
@@ -44,15 +44,16 @@
                 </div>
             </div>
         <TMPL_ELSE>
-            <div class='b-postform-login b-postform-<TMPL_IF expr="usertype_default eq 'anonymous'">anonymous b-postform-anonymous-cookie<TMPL_ELSIF expr="usertype_default eq 'cookieuser'">user b-postform-user-cookie<TMPL_ELSIF expr="usertype_default eq 'facebook_cookie'">facebook b-postform-facebook-cookie<TMPL_ELSIF expr="usertype_default eq 'twitter_cookie'">twitter b-postform-twitter-cookie<TMPL_ELSIF expr="usertype_default eq 'openid_cookie'">openid b-postform-openid-cookie<TMPL_ELSIF expr="usertype_default eq 'mailru_cookie'">mailru b-postform-mailru-cookie</TMPL_IF>'>
+            <div class='b-postform-login b-postform-authtype-<TMPL_IF expr="usertype_default eq 'anonymous'">anonymous b-postform-anonymous-cookie<TMPL_ELSIF expr="usertype_default eq 'cookieuser'">user b-postform-user-cookie<TMPL_ELSIF expr="usertype_default eq 'facebook_cookie'">facebook b-postform-facebook-cookie<TMPL_ELSIF expr="usertype_default eq 'twitter_cookie'">twitter b-postform-twitter-cookie<TMPL_ELSIF expr="usertype_default eq 'openid_cookie'">openid b-postform-openid-cookie<TMPL_ELSIF expr="usertype_default eq 'mailru_cookie'">mailru b-postform-mailru-cookie</TMPL_IF>'>
                 <div class="b-postform-login-services">
                     <div class="b-postform-login-services-items">
-                        <span class="b-postform-login-services-item b-postform-login-services-anonymous"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/anonymous.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span></a></span>
-                        <span class="b-postform-login-services-item b-postform-login-services-livejournal"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/userinfo.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-facebook"><a href="#"><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-twitter"><a href="#"><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-openid"><a href="#"><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-mailru"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif" /><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-anonymous<TMPL_IF everyone_can_comment><TMPL_UNLESS is_public> b-postform-login-services-disabled</TMPL_UNLESS><TMPL_ELSIF registered_can_comment> b-postform-login-services-disabled<TMPL_ELSIF friends_can_comment> b-postform-login-services-disabled</TMPL_IF>"><a href="#anonymous"><img src="<TMPL_VAR lj_imgprefix>/anonymous.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-user<TMPL_IF is_person><TMPL_UNLESS remote_banned><TMPL_UNLESS remote_can_comment> b-postform-login-services-disabled</TMPL_UNLESS></TMPL_UNLESS></TMPL_IF>"><a href="#user"><img src="<TMPL_VAR lj_imgprefix>/userinfo.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 href="#livejournal"><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-facebook<TMPL_IF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment> b-postform-login-services-disabled</TMPL_UNLESS></TMPL_IF></TMPL_IF>"><a href="#facebook"><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-twitter<TMPL_IF registered_can_comment><TMPL_IF is_identity> b-postform-login-services-disabled</TMPL_IF><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment> b-postform-login-services-disabled</TMPL_UNLESS><TMPL_ELSE></TMPL_IF></TMPL_IF>"><a href="#twitter"><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-openid<TMPL_IF openid_enabled><TMPL_IF registered_can_comment><TMPL_IF is_identity> b-postform-login-services-disabled</TMPL_IF><TMPL_ELSIF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment> b-postform-login-services-disabled</TMPL_UNLESS><TMPL_ELSE></TMPL_IF></TMPL_IF></TMPL_IF>"><a href="#openid"><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-mailru<TMPL_IF friends_can_comment><TMPL_IF is_identity><TMPL_UNLESS remote_can_comment> b-postform-login-services-disabled</TMPL_UNLESS></TMPL_IF></TMPL_IF>"><a href="#mailru"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span></a></span>
                     </div>
                 </div>
                 <div class="b-postform-login-details">
@@ -62,6 +63,9 @@
                 </div>
             </div>
         </TMPL_IF>
+		<script type="text/javascript">
+			jQuery('div.b-postform-login').authtype();
+		</script>		
     </td>
 </tr>
 
@@ -88,6 +92,10 @@
                 </TMPL_LOOP>
             </ul>
         </div>
+		<script type="text/javascript">
+			jQuery('div.b-subjecticons').bubble({ target: jQuery('#subjectIconImage') });
+		</script>
+						
         <TMPL_IF 0> end subject icon </TMPL_IF>
 
         <div id='ljnohtmlsubj' class='ljdeem'><span style='font-size: 8pt; font-style: italic;'><TMPL_VAR expr="ml('/talkpost.bml.nosubjecthtml')"></span></div>
@@ -221,6 +229,6 @@
 <script type='text/javascript' language='JavaScript'>
     var usermismatchtext = "<TMPL_VAR ml_usermismatch>";
 </script>
-<script type='text/javascript' language='JavaScript' src='<TMPL_VAR lj_jsprefix>/talkpost.js'></script>
+<script type='text/javascript' src='<TMPL_VAR lj_jsprefix>/talkpost.js'></script>
 
 </form>