Changeset 3503 for TI05-delivery/ows_framework
- Timestamp:
- 22/02/08 15:28:17 (13 years ago)
- Location:
- TI05-delivery/ows_framework/trunk/ows_server/ows_server
- Files:
-
- 6 deleted
- 11 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/routing.py
r3501 r3503 49 49 map.connect('unSelectItem/:entryid/:divid', controller='selectedItems',action='unSelectItem') 50 50 map.connect('removeSelectedItem/:entryid',controller='selectedItems',action='removeSelectedItem') 51 map.connect('expand/:uri',controller='selection',action='expand')52 51 map.connect('visualise', controller='visualise', action='index') 53 52 … … 64 63 map.connect('trackback/:uri', controller='trackback') 65 64 map.connect('discovery',controller='discovery') 66 map.connect('updatetab/:value',controller='tabs',action='update')67 map.connect('clear/:value',controller='tabs',action='clear')68 65 map.connect('visualise/:dataset/:view',controller='visualise',action='tabChange') 69 66 map.connect('visualise/:view',controller='visualise',action='featureChange') -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/login.py
r3062 r3503 163 163 roles=attCert.roles, 164 164 sid=sessID) 165 session['panelView']='History'166 165 session.save() 167 166 … … 192 191 c.providers=dict([(k, v['loginURI']) for k, v in hosts.items()]) 193 192 194 if 'panelView' in session: del session['panelView']195 193 session.save() 196 194 -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/retrieve.py
r3501 r3503 117 117 if needed: c.pageTabs.append(('Display',session['lastViewed'])) 118 118 119 if 'ndgSec' in session:120 #we can update the history121 if 'history' not in session:122 session['history']=[(name,uri),]123 else:124 rb=Utilities.RingBuffer(10)125 for i in session['history']: rb.append(i)126 #delete it first, so we get to the top of the queue.127 if (name,uri) in rb: rb.remove((name,uri))128 rb.append((name,uri))129 session['history']=rb.tolist()130 119 session.save() 131 120 code=200 -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py
r3430 r3503 69 69 setSecuritySession() 70 70 71 if 'panelView' not in session:72 session['panelView']='History'73 71 session.save() 74 72 -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/content.kid
r2882 r3503 8 8 <div py:replace="PageTabs(c.tab)"/> 9 9 <div py:replace="searchOneLine()"/> 10 <!--! The if on the call to the left panel needs to be here for subtle css reasons11 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>12 <?python13 id="contents"14 if "ndgSec" in session: id="contentsRight"15 ?>16 <div id="${id}">-->17 10 <div id="contents"> 18 11 ${XML(c.xml)} -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/csml.kid
r2882 r3503 6 6 <div id="entirepage"> 7 7 <div py:replace="header()"/> 8 <!--! The if on the call to the left panel needs to be here for subtle css reasons -->9 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>10 8 <?python 11 9 id="contents" -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/dif.kid
r3152 r3503 9 9 <div py:replace="PageTabs('Display')"/> 10 10 <div py:replace="searchOneLine()"/> 11 <!--! The if on the call to the left panel needs to be here for subtle css reasons12 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>13 <?python14 id="contents"15 if "ndgSec" in session: id="contentsRight"16 ?>17 <div id="${id}">-->18 11 <div id="contents"> 19 12 <div class="metadata"> -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/error.kid
r3092 r3503 7 7 <div py:replace="header()"/> 8 8 <div py:replace="searchOneLine()"/> 9 <!--! The if on the call to the left panel needs to be here for subtle css reasons -->10 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>11 9 <?python 12 10 id="contents" -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid
r3421 r3503 90 90 <py if="c.UpdatePageTabs" py:replace="PageTabs(c.current)"/> 91 91 92 <!-- History and Shopping Cart follow -->93 94 <div py:def="leftpanel()" id="Left">95 <div py:if="session['panelView']=='History'">96 <div class="tabhdr">97 <ul>98 <li class="current"> <span class="tabhdri">History</span></li>99 <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>100 </ul>101 </div>102 <div class="tabcontent">103 <p> Dataset History </p>104 <ul py:if="'history' in session">105 <li py:for="item in session['history']">106 ${XML(h.link_to(item[0],item[1]))}</li>107 </ul>108 </div>109 </div>110 <div py:if="session['panelView']=='Selection'">111 <div class="tabhdr">112 <ul>113 <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>114 <li class="current"><span class="tabhdri">Selection</span></li>115 </ul>116 </div>117 <div class="tabcontent">118 <p> Selected Datasets </p>119 <ul py:if="'selection' in session">120 <li py:for="item in session['selection']">121 ${XML(h.link_to(item[1],item[0]))}</li>122 </ul>123 ${XML(h.link_to_remote("Clear",dict(update="Left", url=h.url_for(controller="tabs", action="clear",value="Selection"))))}124 </div>125 </div>126 </div>127 128 92 <!-- Page Footer follows --> 129 130 93 <div py:def="footer()" id="Footer"> 131 94 <center><table><tbody> -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/short_results.kid
r3421 r3503 13 13 <div py:replace="PageTabs('Results')"/> 14 14 <div py:replace="searchOneLine(targets=c.searchTarget)"/> 15 <!--! The if on the call to the left panel needs to be here for subtle css reasons -->16 <!-- <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>-->17 <?python18 id="contents"19 if "ndgSec" in session: id="contentsRight"20 ?>21 15 <div id="results"> 22 16 <div id="context"> -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid
r3102 r3503 9 9 <div py:replace="PageTabs('Display')"/> 10 10 <div py:replace="searchOneLine(targets='Browse')"/> 11 <!--! The if on the call to the left panel needs to be here for subtle css reasons12 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>13 <?python id="contents"14 if "ndgSec" in session: id="contentsRight"15 ?>16 <div id="${id}">-->17 18 11 <div id="contents"> 19 12 <div class="metadata"> … … 91 84 Selected 92 85 </span> 93 < span class="selectme" py:if="showSelect and not selected">86 <!--span class="selectme" py:if="showSelect and not selected"> 94 87 ${XML(h.link_to_remote("Select",dict(update="PageTabs", 95 88 url=h.url_for(controller="tabs", … … 106 99 <td><div py:replace="ShortCoverage(granule)"/></td> 107 100 </tr> 108 </tbody >101 </tbody--> 109 102 </table> 110 103 </div> -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/tests/functional/test_selectedItems.py
r2802 r3503 3 3 class TestSelectionController(TestController): 4 4 def test_index(self): 5 response = self.app.get(url_for(controller='select ion'))5 response = self.app.get(url_for(controller='selectedItems')) 6 6 # Test response...
Note: See TracChangeset
for help on using the changeset viewer.