Changeset 4554


Ignore:
Timestamp:
05/12/08 20:22:49 (13 years ago)
Author:
pjkersha
Message:

OpenID Provider Authentication interface:

  • more progress on port of Buffet based RenderingInterface? from Pylons project into openid.provider.renderinginterface.buffet sub-package.
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  
    163163        """ 
    164164        raise NotImplementedError( 
    165                     self.username2UserIdentifiers.__doc__.replace('\n       ','')) 
     165                self.username2UserIdentifiers.__doc__.replace('\n       ','')) 
    166166     
    167167     

  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid/provider/renderinginterface/buffet/__init__.py

    r4552 r4554  
    7878    class""" 
    7979 
    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         
    8194    def __init__(self, **prop): 
    8295        try: 
    … …  
    8699            raise AuthNInterfaceConfigError("Missing property: %s" % e)    
    87100          
    88         self._buffet = OpenIDProviderRenderingBuffet(self.templateType,  
    89                                                 template_root=templateRoot) 
     101        self._buffet=OpenIDProviderRenderingBuffet(self.templateType,  
     102                                                   template_root=templateRoot) 
    90103         
    91104    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  
    22    <head> 
    33            <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        --> 
    108    </head> 
    119    <body> 

  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/wsgi/openid/provider/renderinginterface/buffet/templates/ndg/security/ndgPage.kid

    r4553 r4554  
    99        <!--! The following includes the javascript, note that the XML 
    1010        function is needed to avoid escaping the < character --> 
     11<!--   
    1112        <?python 
    1213            # Fudge for WebHelpers migration to 0.6.1 
    … …  
    1718        ?> 
    1819        ${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" /> 
    2324    </head> 
    2425 
    … …  
    4041                    ?> 
    4142                    <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--> 
    4346                    </span></li>  
    4447                 </span> 

  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/combinedservices/services.ini

    r4549 r4554  
    324324openid.provider.session_middleware=beaker.session  
    325325openid.provider.base_url=http://localhost:8000 
    326 #openid.provider.consumer_store_dirpath=./ 
    327326openid.provider.trace=False 
    328327openid.provider.renderingClass=ndg.security.server.wsgi.openid.provider.renderinginterface.buffet.BuffetRendering 
    … …  
    330329 
    331330openid.provider.rendering.templateType = kid 
    332 openid.provider.rendering.templateRoot = ndg.security.server.pylons.container.templates 
     331openid.provider.rendering.templateRoot = ndg.security.server.wsgi.openid.provider.renderinginterface.buffet.templates 
    333332 
    334333# Layout 
    335 openid.provider.rendering.server = http://localhost:8000 
    336 openid.provider.rendering.LeftLogo = %(server)s/layout/NERC_Logo.gif 
    337 openid.provider.rendering.LeftAlt = Natural Environment Research Council 
     334openid.provider.rendering.baseURL = http://localhost:8000 
     335openid.provider.rendering.leftLogo = %(openid.provider.rendering.baseURL)s/layout/NERC_Logo.gif 
     336openid.provider.rendering.leftAlt = Natural Environment Research Council 
    338337openid.provider.rendering.ndgLink = http://ndg.nerc.ac.uk/ 
    339 openid.provider.rendering.ndgImage = %(server)s/layout/ndg_logo_circle.gif 
     338openid.provider.rendering.ndgImage = %(openid.provider.rendering.baseURL)s/layout/ndg_logo_circle.gif 
    340339openid.provider.rendering.disclaimer = This site is for test purposes only and is under active development. 
    341340openid.provider.rendering.stfcLink = http://ceda.stfc.ac.uk/ 
    342 openid.provider.rendering.stfcImage = %(server)s/layout/stfc-circle-sm.gif 
    343 openid.provider.rendering.helpIcon = %(server)s/layout/icons/help.png 
     341openid.provider.rendering.stfcImage = %(openid.provider.rendering.baseURL)s/layout/stfc-circle-sm.gif 
     342openid.provider.rendering.helpIcon = %(openid.provider.rendering.baseURL)s/layout/icons/help.png 
    344343 
    345344 
Note: See TracChangeset for help on using the changeset viewer.