Changeset 4554
- Timestamp:
- 05/12/08 20:22:49 (12 years ago)
- Location:
- TI12-security/trunk/python
- Files:
-
- 1 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid/provider/__init__.py
r4549 r4554 163 163 """ 164 164 raise NotImplementedError( 165 165 self.username2UserIdentifiers.__doc__.replace('\n ','')) 166 166 167 167 -
TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid/provider/renderinginterface/buffet/__init__.py
r4552 r4554 78 78 class""" 79 79 80 propNames = ('templateType', 'templateRoot') 80 propNames = ( 81 'templateType', 82 'templateRoot', 83 'baseURL', 84 'leftLogo', 85 'leftAlt', 86 'ndgLink', 87 'ndgImage', 88 'disclaimer', 89 'stfcLink', 90 'stfcImage', 91 'helpIcon', 92 ) 93 81 94 def __init__(self, **prop): 82 95 try: … … 86 99 raise AuthNInterfaceConfigError("Missing property: %s" % e) 87 100 88 self._buffet =OpenIDProviderRenderingBuffet(self.templateType,89 template_root=templateRoot)101 self._buffet=OpenIDProviderRenderingBuffet(self.templateType, 102 template_root=templateRoot) 90 103 91 104 def _render(self, templateName, **kw): -
TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid/provider/renderinginterface/buffet/templates/ndg/security/decidePage.kid
r4553 r4554 2 2 <head> 3 3 <replace py:replace="pagehead()"/> 4 <script src="${g['server']}/js/wmsc.js"></script> 5 <script src="${g['server']}/js/prototype.js"></script> 6 <script src="http://www.openlayers.org/api/OpenLayers.js"></script> 7 <script src="${g['server']}/js/openlayers-x.js"/> 8 <script src="${g['server']}/js/dimensionControl.js"/> 9 <script src="${g['server']}/js/mapControl.js"/> 4 <!-- 5 <script src="${c.baseURL}/js/wmsc.js"></script> 6 <script src="${c.baseURL}/js/prototype.js"></script> 7 --> 10 8 </head> 11 9 <body> -
TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid/provider/renderinginterface/buffet/templates/ndg/security/ndgPage.kid
r4553 r4554 9 9 <!--! The following includes the javascript, note that the XML 10 10 function is needed to avoid escaping the < character --> 11 <!-- 11 12 <?python 12 13 # Fudge for WebHelpers migration to 0.6.1 … … 17 18 ?> 18 19 ${XML(javascript_include_tag(builtins=True))} 19 <script type="text/javascript" src="${ g['server']}/js/toggleDiv.js"/>20 21 <link media="all, screen" href="${ g['server']}/layout/ndg2.css" type="text/css" rel="stylesheet"/>22 <link rel="icon" type="image/ico" href="${ g['server']}/layout/favicon.jpg" />20 <script type="text/javascript" src="${c.baseURL}/js/toggleDiv.js"/> 21 --> 22 <link media="all, screen" href="${c.baseURL}/layout/ndg2.css" type="text/css" rel="stylesheet"/> 23 <link rel="icon" type="image/ico" href="${c.baseURL}/layout/favicon.jpg" /> 23 24 </head> 24 25 … … 40 41 ?> 41 42 <li class="$status"><span class="pagetab"> 42 ${XML(h.link_to_if(linkto,tab[0],tab[1]))} 43 <!-- 44 ${XML(h.link_to_if(linkto,tab[0],tab[1]))} 45 --> 43 46 </span></li> 44 47 </span> -
TI12-security/trunk/python/ndg.security.test/ndg/security/test/combinedservices/services.ini
r4549 r4554 324 324 openid.provider.session_middleware=beaker.session 325 325 openid.provider.base_url=http://localhost:8000 326 #openid.provider.consumer_store_dirpath=./327 326 openid.provider.trace=False 328 327 openid.provider.renderingClass=ndg.security.server.wsgi.openid.provider.renderinginterface.buffet.BuffetRendering … … 330 329 331 330 openid.provider.rendering.templateType = kid 332 openid.provider.rendering.templateRoot = ndg.security.server. pylons.container.templates331 openid.provider.rendering.templateRoot = ndg.security.server.wsgi.openid.provider.renderinginterface.buffet.templates 333 332 334 333 # Layout 335 openid.provider.rendering. server= http://localhost:8000336 openid.provider.rendering. LeftLogo = %(server)s/layout/NERC_Logo.gif337 openid.provider.rendering. LeftAlt = Natural Environment Research Council334 openid.provider.rendering.baseURL = http://localhost:8000 335 openid.provider.rendering.leftLogo = %(openid.provider.rendering.baseURL)s/layout/NERC_Logo.gif 336 openid.provider.rendering.leftAlt = Natural Environment Research Council 338 337 openid.provider.rendering.ndgLink = http://ndg.nerc.ac.uk/ 339 openid.provider.rendering.ndgImage = %( server)s/layout/ndg_logo_circle.gif338 openid.provider.rendering.ndgImage = %(openid.provider.rendering.baseURL)s/layout/ndg_logo_circle.gif 340 339 openid.provider.rendering.disclaimer = This site is for test purposes only and is under active development. 341 340 openid.provider.rendering.stfcLink = http://ceda.stfc.ac.uk/ 342 openid.provider.rendering.stfcImage = %( server)s/layout/stfc-circle-sm.gif343 openid.provider.rendering.helpIcon = %( server)s/layout/icons/help.png341 openid.provider.rendering.stfcImage = %(openid.provider.rendering.baseURL)s/layout/stfc-circle-sm.gif 342 openid.provider.rendering.helpIcon = %(openid.provider.rendering.baseURL)s/layout/icons/help.png 344 343 345 344
Note: See TracChangeset
for help on using the changeset viewer.