Changeset 2800
- Timestamp:
- 13/08/07 16:01:08 (14 years ago)
- Location:
- TI05-delivery/ows_framework/trunk/ows_server
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
TI05-delivery/ows_framework/trunk/ows_server/ndgDiscovery.config
r2794 r2800 49 49 stfcLink: http://ceda.stfc.ac.uk/ 50 50 stfcImage: %(layout)sstfc-circle-sm.gif 51 key: %(layout)skey Sm.gif51 key: %(layout)skey.gif 52 52 keyGrey: %(layout)skeyG.gif 53 53 selectI: %(layout)stick.png -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/discovery.py
r2786 r2800 188 188 else: 189 189 c.querystring='' 190 session['results']=h.current_url() 191 session.save() 190 192 return render_response('results') 191 193 -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/retrieve.py
r2694 r2800 98 98 c.xml='<div class="error">%s</div>'%x 99 99 r='error' 100 100 101 if status: session['lastViewed']=h.current_url() 102 101 103 if status and 'ndgSec' in session: 102 104 #we can update the history … … 110 112 rb.append((name,uri)) 111 113 session['history']=rb.tolist() 112 session.save() 114 115 if status: session.save() 113 116 114 117 if r=='content': -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py
r2798 r2800 42 42 cc=construct_url(environ,querystring=qs) 43 43 h.redirect_to(cc) 44 45 c.pageTabs=[('Search',g.discoveryURL)] 46 if 'results' in session: c.pageTabs.append(('Results',session['results'])) 47 if 'lastViewed' in session: c.pageTabs.append(('Display',session['lastViewed'])) 48 49 if 'ndgSec' in session: 50 c.pageTabs.append(('Selections','Blah')) 51 c.pageTabs.append(('Visualise','Blah')) 44 52 45 53 return WSGIController.__call__(self, environ, start_response) -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/layout/ndg2.css
r2793 r2800 37 37 } 38 38 39 .searchBar {margin-top: 2px; background-color: #f0f0f0; } 39 .searchBar {margin-top: 2px; background-color: #f0f0f0; } /* Change this color and you need to change the color in the pagetab current */ 40 40 .searchBar table {padding-left:10px; padding-bottom:0px; margin:0px;font-weight:bold;} 41 41 .searchBar .hidden {display:none} … … 44 44 #Header {color: black; background-color: white; text-align: center; margin-bottom: 10px; padding-top: 3px; padding-right: 0px; padding-left: 0px; padding-bottom: 0px; font-size: medium; font-weight:bold; color:white} 45 45 #Header table {margin:0px; padding:20px;} 46 47 /* Main Tabs First Cut */ 48 /* Reminder: top, right, bottom, left */ 49 #PageTabs {margin: 5px 0px 0px 0px; line-height:normal;border: solid black; border-width: 0px 0px 0px 0px;} 50 #PageTabRow {width:100%; } 51 #PageTabRow ul {margin:0 0 0 10px; padding:0; list-style:none; } 52 #PageTabRow li {float:left; margin-right:10px; padding: 2px 10px; border: solid black; border-width:1px 1px 0px 1px; } 53 #PageTabRow li.current {position:relative; top:1px; background-color: #f0f0f0; } /* color should be same as searchBar! */ 54 #PageTabRow li.hidden {} 55 #PageTabRow a {display:block; text-decoration:none;} 56 .line {border-top: 1px solid black; clear:both;} 57 46 58 47 59 /* Left Column if Necessary */ -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/advanced.kid
r2773 r2800 5 5 <div id="entirepage"> 6 6 <div py:replace="header1(0)"/> 7 <!--! The if on the call to the left panel needs to be here for subtle css reasons --> 8 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/> 7 <!--! The if on the call to the left panel needs to be here for subtle css reasons 8 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>--> 9 <div py:replace="PageTabs('Search')"/> 9 10 <div class="outer"> 10 11 <div class="inner"> -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/dif.kid
r2688 r2800 5 5 <div id="entirepage"> 6 6 <div py:replace="header()"/> 7 <div py:replace="PageTabs('Display')"/> 7 8 <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 9 10 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/> 10 11 <?python … … 12 13 if "ndgSec" in session: id="contentsRight" 13 14 ?> 14 <div id="${id}"> 15 <div id="${id}">--> 16 <div id="contents"> 15 17 <div class="metadata"> 16 18 <div class="headingblock"> -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid
r2799 r2800 49 49 <input type="submit" value="Search"/> 50 50 </form> 51 </td>< td align="right">51 </td><!--<td align="right"> 52 52 <form action="$g.discoveryURL"> 53 53 <input type="submit" value="New Search"/> 54 54 <span py:replace="helpIcon('ns_help')"/> 55 55 </form> 56 </td> <td align="right">56 </td>--><td align="right"> 57 57 <span py:if="'ndgSec' in session" id="loginBar"> 58 58 <span py:replace="logOut()"/></span> … … 67 67 <div class="helptxt"><p> This will return you to the new search page</p></div> 68 68 </div> 69 </div> 70 71 <div py:def="PageTabs(tabv)" id="PageTabs"> 72 <div id="PageTabRow"> 73 <ul> 74 <span py:for="tab in c.pageTabs"> 75 <?python 76 linkto=True 77 if tab[0] == tabv: 78 status='current' 79 linkto=False 80 else: status='hidden' 81 ?> 82 <li class="$status"><span class="pagetab"> 83 ${XML(h.link_to_if(linkto,tab[0],tab[1]))} 84 </span></li> 85 </span> 86 <!--<li py:for="i in enumerate()" class="${status[i[0]]}"> 87 <span class="pagetab">${i[1]}</span> 88 </li>--> 89 <!-- <li class="${status[i[0]]}"> 90 <span class="pagetab"> ${i[1]}</span> 91 </li> 92 <li> $i </li> 93 </span>--> 94 </ul> 95 </div> 96 <div class="line"/> 97 <div class="clear"/> 69 98 </div> 70 99 -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/results.kid
r2799 r2800 5 5 <div id="entirepage"> 6 6 <div py:replace="header()"/> 7 <!--<?python 8 tlist=['Search Page','Results','Selections','WMS','WCS'] 9 status=['hidden','current','hidden','hidden','hidden'] 10 ?> 11 <div py:replace="PageTabs(tlist,status)"/>--> 12 <div py:replace="PageTabs('Results')"/> 7 13 <div py:replace="searchOneLine()"/> 8 14 <!--! 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"/>15 <!-- <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/>--> 10 16 <?python 11 17 id="contents" -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid
r2791 r2800 5 5 <body> 6 6 <div id="entirepage"> ${XML(c.tbinfo)} <div py:replace="header()"/> 7 <div py:if="'ndgSec'in session" py:replace="PageTabs('Display')"/> 7 8 <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 9 10 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/> 10 11 <?python id="contents" 11 12 if "ndgSec" in session: id="contentsRight" 12 13 ?> 13 <div id="${id}"> 14 14 <div id="${id}">--> 15 <div id="contents"> 15 16 <div class="metadata"> 16 17 <div class="headingblock">
Note: See TracChangeset
for help on using the changeset viewer.