Changeset 2802 for TI05-delivery


Ignore:
Timestamp:
14/08/07 12:17:30 (12 years ago)
Author:
lawrence
Message:

Adding more functionality to the selections ...

Location:
TI05-delivery/ows_framework/trunk/ows_server/ows_server
Files:
4 added
6 edited

Legend:

Unmodified
Added
Removed
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/routing.py

    r2789 r2802  
    4040    map.connect('correct/:uri', controller='retrieve', action='correct') 
    4141    map.connect('retrieve/:uri', controller = 'retrieve') 
     42    map.connect('selection',controller='selection',action='index') 
     43    map.connect('expand/:uri',controller='selection',action='expand') 
    4244 
    4345    # This route doesn't match the controller's parameters. 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/discovery.py

    r2800 r2802  
    190190                    session['results']=h.current_url() 
    191191                    session.save() 
     192                    if c.pageTabs[1][0]!='Results': 
     193                         c.pageTabs.insert(1,('Results',session['results'])) 
    192194                    return render_response('results') 
    193195                 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/retrieve.py

    r2800 r2802  
    8989                    c.xml=x.tohtml() 
    9090                    r='content' 
     91                    c.tab='Display' 
    9192            #f=file('debug.xml','w') 
    9293            #f.write(x.tohtml()) 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py

    r2800 r2802  
    4343            h.redirect_to(cc) 
    4444         
     45        #organise the information needed by pagetabs ...  
     46        # TODO avoid this for the server controllers ... 
     47         
    4548        c.pageTabs=[('Search',g.discoveryURL)] 
    4649        if 'results' in session: c.pageTabs.append(('Results',session['results'])) 
     
    4851         
    4952        if 'ndgSec' in session: 
    50             c.pageTabs.append(('Selections','Blah')) 
     53            c.pageTabs.append(('Selections',h.url_for(controller='selection',action='index'))) 
    5154            c.pageTabs.append(('Visualise','Blah')) 
     55            c.pageTabs.append(('Download','Blah')) 
    5256 
    5357        return WSGIController.__call__(self, environ, start_response) 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/content.kid

    r2688 r2802  
    55    <div id="entirepage"> 
    66        <div py:replace="header()"/> 
     7        <div py:replace="PageTabs(c.tab)"/> 
    78        <div py:replace="searchOneLine()"/> 
    8         <!--! The if on the call to the left panel needs to be here for subtle css reasons --> 
     9        <!--! The if on the call to the left panel needs to be here for subtle css reasons  
    910        <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/> 
    1011        <?python 
     
    1213        if "ndgSec" in session: id="contentsRight" 
    1314        ?>  
    14         <div id="${id}"> 
     15        <div id="${id}">--> 
     16        <div id="contents"> 
    1517            ${XML(c.xml)} 
    1618        </div> 
  • TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid

    r2800 r2802  
    55    <body> 
    66        <div id="entirepage"> ${XML(c.tbinfo)} <div py:replace="header()"/> 
    7             <div py:if="'ndgSec'in session" py:replace="PageTabs('Display')"/> 
     7            <div py:replace="PageTabs('Display')"/> 
    88            <div py:replace="searchOneLine()"/> 
    99            <!--! The if on the call to the left panel needs to be here for subtle css reasons  
Note: See TracChangeset for help on using the changeset viewer.