Changeset 2853

Timestamp:

29/08/07 11:52:25 (12 years ago)

Author:

lawrence

Message:

This a complete fix for ticket:863 (I hope) which includes logic
for handling the pagetabs as a consequence.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• controllers/tabs.py (modified) (2 diffs)
• lib/base.py (modified) (1 diff)
• templates/ndgPage.kid (modified) (1 diff)
• templates/stubB.kid (modified) (1 diff)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/tabs.py

@@ -18 +18 @@
     def addSelection(self,uri,name):
         if 'selection' not in session:
+            newtabs=1
             session['selection']=[(uri,name),]
         else:
+            newtabs=0
             rb=Utilities.RingBuffer(10)
             for i in session['selection']: rb.append(i)
@@ -26 +28 @@
             session['selection']=rb.tolist()
         session.save()
-        return render_response('cart',fragment=True)
+        if newtabs:
+            c.UpdatePageTabs=1
+            c.current='Display'
+            c.pageTabs.append(('Selections',h.url_for(controller='selection',action='index')))
+            c.pageTabs.append(('Visualise','Blah'))
+            c.pageTabs.append(('Download','Blah'))
+        return render_response('ndgPage',fragment=True)
             
     def clear(self,value):

TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py

@@ -50 +50 @@
         if 'lastViewed' in session: c.pageTabs.append(('Display',session['lastViewed']))
         
-        if 'ndgSec' in session:
+        if 'selection' in session:
             c.pageTabs.append(('Selections',h.url_for(controller='selection',action='index')))
             c.pageTabs.append(('Visualise','Blah'))

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid

@@ -97 +97 @@
         <div class="clear"/>
     </div>
+    <py if="c.UpdatePageTabs" py:replace="PageTabs(c.current)"/>
 
     <!-- History and Shopping Cart follow -->

TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid

@@ -64 +64 @@
                                     <td width="10%">
                                         <span class="selectme" py:if="showSelect">
-                                            ${XML(h.link_to_remote("Select",dict(update="Left",
+                                            ${XML(h.link_to_remote("Select",dict(update="PageTabs",
                                             url=h.url_for(controller="tabs",
                                             action="addSelection",uri=granule.entryID,name=granule.name))))}