Changeset 3503 for TI05-delivery/ows_framework

Timestamp:

22/02/08 15:28:17 (13 years ago)

Author:

cbyrom

Message:

Further tidy up of existing code: remove History, cart and selection templates
and remove leftPanel template function and its references. Also remove selection.py
and tabs.py and clear out any associated code.

Location:

TI05-delivery/ows_framework/trunk/ows_server/ows_server

Files:

• config/routing.py (modified) (2 diffs)
• controllers/login.py (modified) (2 diffs)
• controllers/retrieve.py (modified) (1 diff)
• controllers/selection.py (deleted)
• controllers/tabs.py (deleted)
• lib/base.py (modified) (1 diff)
• templates/History.kid (deleted)
• templates/cart.kid (deleted)
• templates/content.kid (modified) (1 diff)
• templates/csml.kid (modified) (1 diff)
• templates/dif.kid (modified) (1 diff)
• templates/error.kid (modified) (1 diff)
• templates/ndgPage.kid (modified) (1 diff)
• templates/selection.kid (deleted)
• templates/short_results.kid (modified) (1 diff)
• templates/stubB.kid (modified) (3 diffs)
• tests/functional/test_selectedItems.py (moved) (moved from TI05-delivery/ows_framework/trunk/ows_server/ows_server/tests/functional/test_selection.py) (1 diff)
• tests/functional/test_tabs.py (deleted)

TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/routing.py

@@ -49 +49 @@
     map.connect('unSelectItem/:entryid/:divid', controller='selectedItems',action='unSelectItem')
     map.connect('removeSelectedItem/:entryid',controller='selectedItems',action='removeSelectedItem')
-    map.connect('expand/:uri',controller='selection',action='expand')
     map.connect('visualise', controller='visualise', action='index')
 
@@ -64 +63 @@
     map.connect('trackback/:uri', controller='trackback')
     map.connect('discovery',controller='discovery')
-    map.connect('updatetab/:value',controller='tabs',action='update')
-    map.connect('clear/:value',controller='tabs',action='clear')
     map.connect('visualise/:dataset/:view',controller='visualise',action='tabChange')
     map.connect('visualise/:view',controller='visualise',action='featureChange')

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

@@ -163 +163 @@
                            roles=attCert.roles,
                            sid=sessID)
-        session['panelView']='History'
         session.save()
 
@@ -192 +191 @@
         c.providers=dict([(k, v['loginURI']) for k, v in hosts.items()])
         
-        if 'panelView' in session: del session['panelView']
         session.save()
         

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

@@ -117 +117 @@
             if needed: c.pageTabs.append(('Display',session['lastViewed']))
             
-            if 'ndgSec' in session:
-                #we can update the history
-                if 'history' not in session:
-                    session['history']=[(name,uri),]
-                else:
-                    rb=Utilities.RingBuffer(10)
-                    for i in session['history']: rb.append(i)
-                    #delete it first, so we get to the top of the queue.
-                    if (name,uri) in rb: rb.remove((name,uri))
-                    rb.append((name,uri))
-                    session['history']=rb.tolist()
             session.save()
             code=200

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

@@ -69 +69 @@
             setSecuritySession()
             
-            if 'panelView' not in session:
-                session['panelView']='History'
             session.save()
             

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

@@ -8 +8 @@
         <div py:replace="PageTabs(c.tab)"/>
         <div py:replace="searchOneLine()"/>
-        <!--! The if on the call to the left panel needs to be here for subtle css reasons 
-        <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>
-        <?python
-        id="contents"
-        if "ndgSec" in session: id="contentsRight"
-        ?> 
-        <div id="${id}">-->
         <div id="contents">
             ${XML(c.xml)}

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

@@ -6 +6 @@
     <div id="entirepage">
         <div py:replace="header()"/>
-        <!--! The if on the call to the left panel needs to be here for subtle css reasons -->
-        <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>
         <?python
         id="contents"

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

@@ -9 +9 @@
         <div py:replace="PageTabs('Display')"/>
         <div py:replace="searchOneLine()"/>
-        <!--! The if on the call to the left panel needs to be here for subtle css reasons 
-        <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>
-        <?python
-        id="contents"
-        if "ndgSec" in session: id="contentsRight"
-        ?> 
-        <div id="${id}">-->
         <div id="contents">
             <div class="metadata">

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

@@ -7 +7 @@
         <div py:replace="header()"/>
         <div py:replace="searchOneLine()"/>
-        <!--! The if on the call to the left panel needs to be here for subtle css reasons -->
-        <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>
         <?python
         id="contents"

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

@@ -90 +90 @@
     <py if="c.UpdatePageTabs" py:replace="PageTabs(c.current)"/>
 
-    <!-- History and Shopping Cart follow -->
-
-    <div py:def="leftpanel()" id="Left">
-            <div py:if="session['panelView']=='History'"> 
-                <div class="tabhdr">
-                    <ul>
-                        <li class="current"> <span class="tabhdri">History</span></li>
-                        <li class="hidden"><span class="tabhdri">${XML(h.link_to_remote("Selected",dict(update="Left", url=h.url_for(controller="tabs", action="update",value="Selection"))))}</span></li>
-                    </ul>
-                </div>
-                <div class="tabcontent">
-                   <p> Dataset History </p>  
-                   <ul py:if="'history' in session">
-                        <li py:for="item in session['history']">
-                        ${XML(h.link_to(item[0],item[1]))}</li>
-                   </ul>
-                </div>
-            </div>
-            <div py:if="session['panelView']=='Selection'"> 
-                <div class="tabhdr">
-                    <ul>
-                    <li class="hidden"><span class="tabhdri">${XML(h.link_to_remote("History",dict(update="Left", url=h.url_for(controller="tabs", action="update",value="History"))))}</span></li>
-                    <li class="current"><span class="tabhdri">Selection</span></li>
-                    </ul>
-                </div>
-                <div class="tabcontent">
-                    <p> Selected Datasets </p>  
-                    <ul py:if="'selection' in session">
-                        <li py:for="item in session['selection']">
-                        ${XML(h.link_to(item[1],item[0]))}</li>
-                    </ul>
-                    ${XML(h.link_to_remote("Clear",dict(update="Left", url=h.url_for(controller="tabs", action="clear",value="Selection"))))}
-                </div>
-            </div>
-    </div>
-    
     <!-- Page Footer follows -->
-
     <div py:def="footer()" id="Footer">
         <center><table><tbody>

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

@@ -13 +13 @@
         <div py:replace="PageTabs('Results')"/>
         <div py:replace="searchOneLine(targets=c.searchTarget)"/>
-        <!--! The if on the call to the left panel needs to be here for subtle css reasons -->
-        <!-- <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>-->
-        <?python
-        id="contents"
-        if "ndgSec" in session: id="contentsRight"
-        ?> 
         <div id="results">
             <div id="context">

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

@@ -9 +9 @@
             <div py:replace="PageTabs('Display')"/>
             <div py:replace="searchOneLine(targets='Browse')"/>
-            <!--! The if on the call to the left panel needs to be here for subtle css reasons 
-            <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>
-            <?python id="contents"
-            if "ndgSec" in session: id="contentsRight"
-            ?>
-            <div id="${id}">-->
-
             <div id="contents">
                 <div class="metadata">
@@ -91 +84 @@
                                           Selected
                                         </span>
-                                        <span class="selectme" py:if="showSelect and not selected">
+                                        <!--span class="selectme" py:if="showSelect and not selected">
                                             ${XML(h.link_to_remote("Select",dict(update="PageTabs",
                                             url=h.url_for(controller="tabs",
@@ -106 +99 @@
                                     <td><div py:replace="ShortCoverage(granule)"/></td>
                                 </tr>
-                            </tbody>
+                            </tbody-->
                         </table>
                     </div>

TI05-delivery/ows_framework/trunk/ows_server/ows_server/tests/functional/test_selectedItems.py

@@ -3 +3 @@
 class TestSelectionController(TestController):
     def test_index(self):
-        response = self.app.get(url_for(controller='selection'))
+        response = self.app.get(url_for(controller='selectedItems'))
         # Test response...