[Translate-cvs] src/translate/pootle indexpage.py,1.107,1.108 pagelayout.py,1.31,1.32 pootle.py,1.45,1.46 translatepage.py,1.82,1.83

[Dwayne B. <dwa...@us...>]

Update of /cvsroot/translate/src/translate/pootle
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11418

Modified Files:
	indexpage.py pagelayout.py pootle.py translatepage.py 
Log Message:
When a user logs in they will be redirected to the folder that they were
browsing when they decided to login.

TODO currently if they are viewing a file they will be returned to the folder 
that they started the view from they will not be returned to the place were
they were viewing.


Index: translatepage.py
===================================================================
RCS file: /cvsroot/translate/src/translate/pootle/translatepage.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- translatepage.py	24 Mar 2005 16:03:34 -0000	1.82
+++ translatepage.py	27 Mar 2005 12:01:34 -0000	1.83
@@ -52,7 +52,7 @@
     else:
       pagelinks = []
     translatediv = pagelayout.TranslateForm([notice, pagelinks, translateform, pagelinks])
-    pagelayout.PootlePage.__init__(self, title, translatediv, session, bannerheight=81)
+    pagelayout.PootlePage.__init__(self, title, translatediv, session, bannerheight=81, returnurl="%s/%s/%s" % (self.project.languagecode, self.project.projectcode, dirfilter))
     self.addfilelinks(self.pofilename, self.matchnames)
     if dirfilter and dirfilter.endswith(".po"):
       currentfolder = "/".join(dirfilter.split("/")[:-1])

Index: pagelayout.py
===================================================================
RCS file: /cvsroot/translate/src/translate/pootle/pagelayout.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- pagelayout.py	24 Mar 2005 14:50:04 -0000	1.31
+++ pagelayout.py	27 Mar 2005 12:01:34 -0000	1.32
@@ -72,7 +72,7 @@
 
 class PootleSidebar(widgets.Division):
   """the bar at the side describing current login details etc"""
-  def __init__(self, session):
+  def __init__(self, session, returnurl=""):
     baseurl = session.instance.baseurl
     title = SidebarTitle(getattr(session.instance, "title", session.localize("Pootle Demo")))
     doclink = widgets.Link(baseurl+"doc/index.html", session.localize("Docs & Help"))
@@ -84,7 +84,7 @@
       loginlinks = widgets.Link(baseurl+"?islogout=1", session.localize("Log Out"))
       homelink = [" | ", widgets.Link(baseurl+"home/", session.localize("Home"))]
     else:
-      loginlinks = [widgets.Link(baseurl+"login.html", session.localize("Log In")), " / ", widgets.Link(baseurl+"register.html", session.localize("Register")), " / ", widgets.Link(baseurl+"activate.html", session.localize("Activate"))]
+      loginlinks = [widgets.Link(baseurl+"login.html?returnurl="+returnurl, session.localize("Log In")), " / ", widgets.Link(baseurl+"register.html", session.localize("Register")), " / ", widgets.Link(baseurl+"activate.html", session.localize("Activate"))]
       homelink = []
     loginimage = Icon("person.png")
     loginstatus = SidebarText([loginimage, loginstatus])
@@ -124,7 +124,7 @@
 
 class PootlePage(widgets.Page):
   """the main page"""
-  def __init__(self, title, contents, session, bannerheight=135):
+  def __init__(self, title, contents, session, bannerheight=135, returnurl=""):
     if not hasattr(session.instance, "baseurl"):
       session.instance.baseurl = "/"
     self.localize = session.localize
@@ -134,7 +134,7 @@
     favicon = widgets.PlainContents('<link rel="shortcut icon" href="favicon.ico" >')
       
     self.banner = PootleBanner(session.instance, bannerheight)
-    self.links = PootleSidebar(session)
+    self.links = PootleSidebar(session, returnurl)
     widgets.Page.__init__(self, title, contents, {"includeheading":False}, stylesheets=stylesheets, headerwidgets=[favicon])
 
   def addsearchbox(self, searchtext, contextinfo="", action=""):

Index: indexpage.py
===================================================================
RCS file: /cvsroot/translate/src/translate/pootle/indexpage.py,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- indexpage.py	24 Mar 2005 13:32:23 -0000	1.107
+++ indexpage.py	27 Mar 2005 12:01:33 -0000	1.108
@@ -537,7 +537,7 @@
     mainitem = pagelayout.MainItem([mainicon, navbarpath, actionlinks, mainstats])
     childitems = self.getchilditems(dirfilter)
     pagetitle = self.localize("Pootle: Project %s, Language %s") % (self.project.projectname, self.project.languagename)
-    pagelayout.PootlePage.__init__(self, pagetitle, [message, mainitem, childitems], session, bannerheight=81)
+    pagelayout.PootlePage.__init__(self, pagetitle, [message, mainitem, childitems], session, bannerheight=81, returnurl="%s/%s/%s" % (self.project.languagecode, self.project.projectcode, self.dirname))
     self.addsearchbox(searchtext="", action="translate.html")
     if session.issiteadmin() and self.showassigns:
       self.addassignbox()

Index: pootle.py
===================================================================
RCS file: /cvsroot/translate/src/translate/pootle/pootle.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- pootle.py	18 Mar 2005 11:24:53 -0000	1.45
+++ pootle.py	27 Mar 2005 12:01:34 -0000	1.46
@@ -106,9 +106,12 @@
       return indexpage.AboutPage(session)
     elif top == "login.html":
       if session.isopen:
-        redirecttext = pagelayout.IntroText("Redirecting to home page...")
-        redirectpage = pagelayout.PootlePage("Redirecting to home page...", redirecttext, session)
-        return server.Redirect("home/", withpage=redirectpage)
+        if argdict['returnurl']:
+          return server.Redirect(argdict['returnurl'])
+        else:
+          redirecttext = pagelayout.IntroText("Redirecting to home page...")
+          redirectpage = pagelayout.PootlePage("Redirecting to home page...", redirecttext, session)
+          return server.Redirect("home/", withpage=redirectpage)
       if 'username' in argdict:
         session.username = argdict["username"]
       return users.LoginPage(session, languagenames=self.languagenames)