# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1252933918 -7200
# Node ID 44fa8d4a25d5721d82cc653d9e29ad92106a07ad
# Parent  11b84e3b945858aa82e16a8fa55ba9186dcf80f9# Parent  c2c8f88a4520123d80edc706d1a34d42f4b72b2f
merge

diff -r 11b84e3b9458 -r 44fa8d4a25d5 web/views/tabs.py
--- a/web/views/tabs.py	Mon Sep 14 12:50:27 2009 +0200
+++ b/web/views/tabs.py	Mon Sep 14 15:11:58 2009 +0200
@@ -71,6 +71,9 @@
         return str('%s_active_tab' % self.config.appid)
 
     def active_tab(self, tabs, default):
+        formtab = self.req.form.get('tab')
+        if formtab in tabs:
+            return formtab
         cookies = self.req.get_cookie()
         cookiename = self.cookie_name
         activetab = cookies.get(cookiename)
@@ -112,7 +115,7 @@
         w(u'<ul>')
         for tab in tabs:
             w(u'<li>')
-            w(u'<a href="#as-%s">' % tab)
+            w(u'<a href="#%s">' % tab)
             w(u'<span onclick="set_tab(\'%s\', \'%s\')">' % (tab, self.cookie_name))
             w(self.req._(tab))
             w(u'</span>')
@@ -121,7 +124,7 @@
         w(u'</ul>')
         w(u'</div>')
         for tab in tabs:
-            w(u'<div id="as-%s">' % tab)
+            w(u'<div id="%s">' % tab)
             if entity:
                 self.lazyview(tab, eid=entity.eid)
             else:
@@ -153,7 +156,7 @@
         role = 'subject'
         vid = 'gallery'
 
-    in this example, entities related to project entity by the'screenshot'
+    in this example, entities related to project entity by the 'screenshot'
     relation (where the project is subject of the relation) will be displayed
     using the 'gallery' view.
     """