Committer: esavintcev
LJSUP-8746: Google IdentityU trunk/bin/upgrading/en_LJ.dat U trunk/cgi-bin/bml/scheme/lanzelot.look U trunk/templates/CommentForm/AuthorTitle-Google.tmpl
Modified: trunk/bin/upgrading/en_LJ.dat =================================================================== --- trunk/bin/upgrading/en_LJ.dat 2011-05-04 08:38:40 UTC (rev 10472) +++ trunk/bin/upgrading/en_LJ.dat 2011-05-04 08:48:33 UTC (rev 10473) @@ -2535,6 +2535,8 @@ horizon.login.loginwith=or login with +horizon.login.google=Login with Google + horizon.login.facebook=Login with Facebook horizon.login.forgot|staleness=1 Modified: trunk/cgi-bin/bml/scheme/lanzelot.look =================================================================== --- trunk/cgi-bin/bml/scheme/lanzelot.look 2011-05-04 08:38:40 UTC (rev 10472) +++ trunk/cgi-bin/bml/scheme/lanzelot.look 2011-05-04 08:48:33 UTC (rev 10473) @@ -182,6 +182,7 @@ <div class="b-loginpopup" id="login-more"> <ul class="b-loginpopup-items"> <li class="b-loginpopup-item"><a href="<?siteroot?>/identity/login.bml?type=openid" title="$ML{'horizon.login.openid'}"><img src="$LJ::IMGPREFIX/icons/openid-16.gif?v=1" width="16" height="16" alt="$ML{'horizon.login.openid'}" />$ML{'horizon.login.openid'}</a></li> + <li class="b-loginpopup-item"><a href="<?siteroot?>/identity/login.bml?type=google" title="$ML{'horizon.login.google'}"><img src="$LJ::IMGPREFIX/icons/google-16.png?v=1" width="16" height="16" alt="$ML{'horizon.login.google'}" />$ML{'horizon.login.google'}</a></li> <li class="b-loginpopup-item"><a href="<?siteroot?>/identity/login.bml?type=mailru" title="$ML{'horizon.login.mailru'}"><img src="$LJ::IMGPREFIX/icons/mailru-16.gif?v=3" width="16" height="16" alt="$ML{'horizon.login.mailru'}" />$ML{'horizon.login.mailru'}</a></li> <li class="b-loginpopup-item"><a href="<?siteroot?>/identity/login.bml?type=vkontakte" title="$ML{'horizon.login.vkontakte'}"><img src="$LJ::IMGPREFIX/icons/vkontakte-16.gif?v=1" width="16" height="16" alt="$ML{'horizon.login.vkontakte'}" />$ML{'horizon.login.vkontakte'}</a></li> </ul> Modified: trunk/templates/CommentForm/AuthorTitle-Google.tmpl =================================================================== --- trunk/templates/CommentForm/AuthorTitle-Google.tmpl 2011-05-04 08:38:40 UTC (rev 10472) +++ trunk/templates/CommentForm/AuthorTitle-Google.tmpl 2011-05-04 08:48:33 UTC (rev 10473) @@ -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.gif" /><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" 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.gif" /><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" 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.gif" /><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" 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> <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.gif" /><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" 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.gif" /><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" 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.gif" /><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" 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> </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.gif" /><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" 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>