vadvs (vadvs) wrote in changelog,
vadvs
vadvs
changelog

[ljcom] r9739: LJINT-363: Comments for side projects

Committer: vsukhanov
LJINT-363: Comments for side projects
U   trunk/htdocs/gadgets/logout.bml
U   trunk/htdocs/identity/login.bml.text
U   trunk/htdocs/identity/login.bml.text.local
U   trunk/templates/Identity/Login-facebook.tmpl
U   trunk/templates/Identity/Login-twitter.tmpl
Modified: trunk/htdocs/gadgets/logout.bml
===================================================================
--- trunk/htdocs/gadgets/logout.bml	2010-11-19 06:36:13 UTC (rev 9738)
+++ trunk/htdocs/gadgets/logout.bml	2010-11-22 08:34:08 UTC (rev 9739)
@@ -12,8 +12,16 @@
     my $user   = $POST{'user'} || $GET{'user'};
     my $sessid = $POST{'sessid'} || $GET{'sessid'};
 
+    ## delete user sessions.
     $u->logout_all if $u;
 
+    ## Redirect instead of xml-response?
+    my $returnto = $GET{returnto} || $POST{returnto};
+    if ($returnto =~ m!^https?://\Q$LJ::DOMAIN_WEB\E/! or $returnto =~ m|^/|){
+        return BML::redirect($returnto);        
+    }
+
+    ## XML response
     return XMLout(
         {
             status => "loggedout"

Modified: trunk/htdocs/identity/login.bml.text
===================================================================
--- trunk/htdocs/identity/login.bml.text	2010-11-19 06:36:13 UTC (rev 9738)
+++ trunk/htdocs/identity/login.bml.text	2010-11-22 08:34:08 UTC (rev 9739)
@@ -2,8 +2,24 @@
 
 .openid.label.url=Your OpenID URL:
 
+.openid.label.sample=ex. myblog.domain.com
+
 .openid.btn.login=Login
 
 .title=Log in with OpenID and more
 
 .tab.openid=OpenID
+
+.user.btn.login=Login
+
+.user.label.url=Your Livejournal Login
+
+.user.denylogin=This account cant logged in.
+
+.user.help=Forgot your password?
+
+.user.desc=Log in with livejournal account
+
+.user.label.name=Username
+
+.user.label.pass=Password

Modified: trunk/htdocs/identity/login.bml.text.local
===================================================================
--- trunk/htdocs/identity/login.bml.text.local	2010-11-19 06:36:13 UTC (rev 9738)
+++ trunk/htdocs/identity/login.bml.text.local	2010-11-22 08:34:08 UTC (rev 9739)
@@ -4,6 +4,8 @@
 
 .tab.facebook=Facebook
 
+.tab.user=LiveJournal
+
 .tab.twitter=Twitter
 
 .twitter.btn.connect=Sign in with Twitter

Modified: trunk/templates/Identity/Login-facebook.tmpl
===================================================================
--- trunk/templates/Identity/Login-facebook.tmpl	2010-11-19 06:36:13 UTC (rev 9738)
+++ trunk/templates/Identity/Login-facebook.tmpl	2010-11-22 08:34:08 UTC (rev 9739)
@@ -1,3 +1,3 @@
-<button type="submit" class="b-facebookbtn" title="<TMPL_VAR expr="ml('.facebook.btn.connect')">"><span><i></i><TMPL_VAR expr="ml('.facebook.btn.connect')"></span></button>
-<p class="b-auth-desc"><TMPL_VAR expr="ml('.facebook.desc')"></p>
+<button type="submit" class="b-facebookbtn" title="<TMPL_VAR expr="ml('/identity/login.bml.facebook.btn.connect')">"><span><i></i><TMPL_VAR expr="ml('/identity/login.bml.facebook.btn.connect')"></span></button>
+<p class="b-auth-desc"><TMPL_VAR expr="ml('/identity/login.bml.facebook.desc')"></p>
 <TMPL_IF errors><TMPL_LOOP errors><p class="b-auth-error"><span class="i-message i-message-error"><TMPL_VAR error></span></p></TMPL_LOOP></TMPL_IF>

Modified: trunk/templates/Identity/Login-twitter.tmpl
===================================================================
--- trunk/templates/Identity/Login-twitter.tmpl	2010-11-19 06:36:13 UTC (rev 9738)
+++ trunk/templates/Identity/Login-twitter.tmpl	2010-11-22 08:34:08 UTC (rev 9739)
@@ -4,6 +4,6 @@
     </TMPL_LOOP>
 </TMPL_IF>
 
-<button type="submit" class="b-twitterbtn"><span><i></i><TMPL_VAR expr="ml('.twitter.btn.connect')"></span></button>
-<p class="b-auth-desc"><TMPL_VAR expr="ml('.twitter.desc')"></p>
+<button type="submit" class="b-twitterbtn"><span><i></i><TMPL_VAR expr="ml('/identity/login.bml.twitter.btn.connect')"></span></button>
+<p class="b-auth-desc"><TMPL_VAR expr="ml('/identity/login.bml.twitter.desc')"></p>
 <TMPL_IF errors><TMPL_LOOP errors><p class="b-auth-error"><span class="i-message i-message-error"><TMPL_VAR error></span></p></TMPL_LOOP></TMPL_IF>

Tags: bml, ljcom, local, text, tmpl, vadvs
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments