Changeset 2675
- Timestamp:
- 29/06/07 22:15:47 (14 years ago)
- Location:
- TI05-delivery/ows_framework/trunk/ows_server/ows_server
- Files:
-
- 1 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
TI05-delivery/ows_framework/trunk/ows_server/ows_server/config/ndgDiscovery.config
r2674 r2675 43 43 ###### user customisable: 44 44 localLink: http://ndg.nerc.ac.uk/ 45 localImage: %(layout)sndg_logo .gif45 localImage: %(layout)sndg_logo_circle.gif 46 46 localAlt: visit badc 47 47 ###### ought to be the end of the customisations 48 48 ndgLink: http://ndg.nerc.ac.uk/ 49 ndgImage: %(layout)sndg_logo .gif49 ndgImage: %(layout)sndg_logo_circle.gif 50 50 ndgAlt: visit ndg 51 51 stfcLink: http://ceda.stfc.ac.uk/ … … 57 57 printer: %(layout)sprinter.gif 58 58 helpIcon: %(layout)shelp_icon.gif 59 HdrLeftAlt: %(layout)sNatural Environment Resear hcCouncil59 HdrLeftAlt: %(layout)sNatural Environment Research Council 60 60 HdrLeftLogo: %(layout)sNERC_Logo.gif 61 61 -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/discovery.py
r2672 r2675 167 167 return render_response('content') 168 168 c.xml=renderDiscoverySet(difs,state,self.cf) 169 print self.oneLineSearch()170 169 f=file('debug-dif.xml','w') 171 170 f.write(c.xml) -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/login.py
r2674 r2675 8 8 #where are we going back to? 9 9 self.inputs=dict(parse_querystring(request.environ)) 10 print self.inputs11 10 if 'r' in self.inputs: 12 11 c.returnTo=self.inputs['r'] … … 22 21 session['panelView']='History' 23 22 session.save() 23 24 24 # and now go back to whence we had come 25 try: 26 h.redirect_to(c.returnTo) 27 except: 28 #Dom added this try except as the http redirect was failing if controller accessed directly e.g. through http://localhost:8080/login 29 return 'Logged in' 30 25 if c.returnTo!='': 26 try: 27 h.redirect_to(c.returnTo) 28 except: 29 pass 30 c.xml='<p> Login Successful </p>' 31 return render_response(content) 32 31 33 def wayf(self): 32 34 ''' NDG equivalent to Shibboleth WAYF ''' -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/controllers/retrieve.py
r2674 r2675 76 76 elif self.uri.schema=='DIF': 77 77 r='dif' 78 c.doc=DIF.DIF(x.tree,et=1 )78 c.doc=DIF.DIF(x.tree,et=1,ndgObj=self.uri) 79 79 name=c.doc.name 80 print c.doc. parameters80 print c.doc.ndgObject 81 81 elif self.uri.schema=='NumSim': 82 82 r='numsim' -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/lib/base.py
r2667 r2675 5 5 from pylons.helpers import abort, redirect_to, etag_cache 6 6 from pylons.i18n import N_, _, ungettext 7 from paste.request import construct_url 7 8 import ows_server.models as model 8 9 import ows_server.lib.helpers as h … … 26 27 # is under environ['pylons.routes_dict'] should you want to check 27 28 # the action or route vars here 29 c.requestURL=construct_url(environ) 28 30 return WSGIController.__call__(self, environ, start_response) 29 31 -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/public/layout/ndg2.css
r2672 r2675 37 37 } 38 38 39 .searchBar { 40 text-align:right; 41 margin-top: 2px; margin-bottom: 2px; background-color: #f0f0f0; 42 font-weight:bold; 43 } 44 .searchBar #loginBar {text-align:right;} 39 .searchBar {margin-top: 2px; background-color: #f0f0f0; font-weight:bold;} 40 .searchBar table {padding-left:10px; padding-bottom:0px; margin:0px;} 45 41 /* .searchOneLine {margin-top: 2px; margin-bottom: 2px; background-color: #f0f0f0; text-align:right; font-size:100%;} */ 46 42 47 43 #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} 48 #Header table { padding:20px;}44 #Header table {margin:0px; padding:20px;} 49 45 50 46 /* Left Column if Necessary */ … … 147 143 148 144 /* And now the footer */ 149 150 #Footer { color: #999999; background-color: #f4f4f4; margin-bottom: 25px; padding-top: 3px; padding-right: 10px; padding-left: 10px; clear: both; border-top: 2px solid #3c78b5; margin-top:10px; font-size:80%;} 145 #Footer { color: #999999; background-color: #eeeeee; margin-bottom: 25px; padding-top: 3px; padding-right: 10px; padding-left: 10px; clear: both; border-top: 2px solid #333333; margin-top:10px; font-size:80%; border-bottom: 2px solid #333333;} 151 146 152 147 /* Footer not yet checked */ -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/dif.kid
r2655 r2675 1 <html py:extends=" 'ndgPage.kid'" xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">1 <html py:extends="ndgPage.kid,meta.kid" xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"> 2 2 3 3 <head py:replace="pagehead()"/> … … 5 5 <div id="entirepage"> 6 6 <div py:replace="header()"/> 7 <div py:replace="searchOneLine()"/> 7 8 <!--! The if on the call to the left panel needs to be here for subtle css reasons --> 8 9 <div py:if="'ndgSec' in session" py:replace="leftpanel()" id="Left"/> … … 18 19 </div> 19 20 <div py:replace="ParameterList(c.doc.parameters)"/> 21 <div py:replace="Coverage()"/> 22 <div py:replace="Sensors()"/> 23 <div py:replace="Sources()"/> 24 <div py:replace="Curator()"/> 25 <div py:replace="Services()"/> 20 26 </div> 21 27 </div> … … 26 32 <div py:replace="footer()"/> 27 33 </div> 34 35 36 28 37 </body> 29 38 </html> -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/ndgPage.kid
r2672 r2675 28 28 <table width="100%"><tr><td align="left"> 29 29 <form action="$g.discoveryURL"> 30 NewSearch <input type="text" size="25" name="searchString"/>30 Free Text Search <input type="text" size="25" name="searchString"/> 31 31 <select name="textTarget"> 32 32 <option value="Authors">Authors</option> … … 78 78 </div> 79 79 80 <!-- Parameter list class, used in StubB and DIF -->81 82 <div py:def="ParameterList(params)" class="ParameterList">83 <table cellspacing="0" cellpadding="3" border="0" width="100%"><tbody>84 <tr><td class="linehead"><span class="heading0"> Parameters</span></td></tr>85 <span py:for="item in params">86 <tr><td class="rowhead">$item</td></tr>87 <?python88 #need to make sure keyword with spaces are not split inappropriately89 keywords=[]90 for word in params[item]:91 keywords.append(word.replace(' ',' '))92 keywords='; '.join(keywords)93 ?>94 <tr py:if="params[item]!=[]"><td>$keywords</td></tr>95 </span>96 </tbody></table>97 </div>98 99 100 80 <!-- Page Footer follows --> 101 81 … … 146 126 <span py:def="logOut()" class="logOut"> 147 127 <form action="$g.logout"> 148 <input type="hidden" name="r" value="$ g.server${h.url_for()}"/>128 <input type="hidden" name="r" value="$c.requestURL"/> 149 129 <input type="submit" value="Logout"/> 150 130 </form> … … 153 133 <span py:def="logIn()" class="logIn"> 154 134 <form action="$g.wayfuri"> 155 <input type="hidden" name="r" value="$ g.server${h.url_for()}"/>135 <input type="hidden" name="r" value="$c.requestURL"/> 156 136 <input type="submit" value="Login"/> 157 137 </form> -
TI05-delivery/ows_framework/trunk/ows_server/ows_server/templates/stubB.kid
r2672 r2675 1 <html py:extends=" 'ndgPage.kid'" xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#">1 <html py:extends="ndgPage.kid,meta.kid" xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"> 2 2 3 3 <head py:replace="pagehead()"/> … … 61 61 </div> <!-- DeploymentList --> 62 62 63 <div py:replace="Services()"/> 63 64 64 <div id="ServiceList">65 <table cellspacing="0" cellpadding="3" width=" 100%" border="0"><tbody>66 <tr><td class="linehead" colspan="3"><span class="headingO">Links and Services</span></td></tr>67 <!-- s=renderService(self.config)68 <tr py:for="item in c.doc.services"><td>$s.get(item)<td><tr>69 -->70 <tr py:if="c.doc.ndgObject is not None">71 <td width="20%"><span py:replace="linkimage(c.doc.ndgObject.xmlURL,c.icons_xml,'[XML]')"/></td>72 <td>Downloadable XML version of this record</td>73 </tr>74 <tr py:if="c.doc.ndgObject is not None">75 <td width="20%"><span py:replace="linkimage(c.doc.ndgObject.printableURL,c.icons_prn,'[HTML]')"/></td>76 <td>Viewable XML version of this record</td>77 </tr>78 </tbody></table>79 </div> <!-- ServiceList -->80 81 65 <center> 82 66 <p>Not all information in this record may be rendered in this view. Please see the XML version for complete
Note: See TracChangeset
for help on using the changeset viewer.