Changeset 4587

Show
Ignore:
Timestamp:
05/16/08 03:40:05 (2 months ago)
Author:
fredlin
Message:

quickstart template update

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • projects/tg.devtools/trunk/devtools/templates/turbogears/development.ini_tmpl

    r4488 r4587  
    6262 
    6363[loggers] 
    64 keys = root 
     64keys = root, {{package_logger}}{{if sqlalchemy}}, sqlalchemy{{endif}} 
    6565 
    6666[handlers] 

  • projects/tg.devtools/trunk/devtools/templates/turbogears/+egg+.egg-info/paste_deploy_config.ini_tmpl_tmpl

    r4488 r4587  
    3434# %(here) may include a ':' character on Windows environments; this can 
    3535# invalidate the URI when specifying a SQLite db via path name 
    36 #sqlalchemy.dburi = sqlite:///%(here)s/somedb.db 
     36sqlalchemy.url = sqlite:///%(here)s/somedb.db 
    3737sqlalchemy.echo = False 
    3838{{endif}} 
    3939 
    4040{{if sqlobject}} 
    41 # Specify the database for SQLObject to use via turbogears.database.PackageHub. 
     41# Specify the database for SQLObject to use. 
    4242#sqlobject.dburi = sqlite://%(here)s/somedb.db 
    4343{{endif}} 

  • projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/config/environment.py_tmpl

    r4488 r4587  
    66{{elif template_engine == 'genshi'}} 
    77from genshi.template import TemplateLoader 
     8{{elif template_engine == 'jinja'}} 
     9from jinja import ChoiceLoader, Environment, FileSystemLoader 
    810{{endif}} 
    911from pylons import config 
    …… 
    5254    config['pylons.app_globals'] = app_globals.Globals() 
    5355    #config['pylons.h'] = {{package}}.lib.helpers 
    54     {{if sqlalchemy}} 
    55      
     56 
     57    {{if sqlalchemy}}     
    5658    # Setup SQLAlchemy database engine 
    5759    engine = engine_from_config(config, 'sqlalchemy.') 
    …… 
    7476    # Create the Mako TemplateLookup, with the default auto-escaping 
    7577    config['pylons.app_globals'].mako_lookup = TemplateLookup( 
    76         directories=paths['templates'], input_encoding='utf-8', 
     78        directories=paths['templates'], 
     79        module_directory=os.path.join(app_conf['cache_dir'], 'templates'), 
     80        input_encoding='utf-8', output_encoding='utf-8', 
    7781        imports=['from webhelpers.html import escape'], 
    78         default_filters=['escape'], output_encoding='utf-8', 
    79         module_directory=os.path.join(app_conf['cache_dir'], 'templates'), 
    80     ) 
     82        default_filters=['escape']) 
    8183    {{elif template_engine == 'genshi'}} 
    8284    # Create the Genshi TemplateLoader 
    8385    config['pylons.app_globals'].genshi_loader = TemplateLoader( 
    8486        paths['templates'], auto_reload=True) 
     87    {{elif template_engine == 'jinja'}} 
     88 
     89    # Create the Jinja Environment 
     90    config['pylons.app_globals'].jinja_env = Environment(loader=ChoiceLoader( 
     91            [FileSystemLoader(path) for path in paths['templates']])) 
     92    # Jinja's unable to request c's attributes without strict_c 
     93    config['pylons.strict_c'] = True 
     94    {{endif}} 
     95    {{if sqlalchemy}} 
     96    # Setup SQLAlchemy database engine 
     97    engine = engine_from_config(config, 'sqlalchemy.') 
     98    init_model(engine) 
    8599    {{endif}} 
    86100     

  • projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/controllers/error.py_tmpl

    r4488 r4587  
    33import paste.fileapp 
    44from pylons import request 
     5from pylons.controllers.util import forward 
    56from pylons.middleware import error_document_template, media_path 
    67 
    …… 
    3839        at the specified path 
    3940        """ 
    40         fapp = paste.fileapp.FileApp(path) 
    41         return fapp(request.environ, self.start_response) 
     41        return forward(paste.fileapp.FileApp(path)) 

  • projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/controllers/root.py_tmpl

    r4551 r4587  
    1414class RootController(BaseController): 
    1515{{if identity == "sqlalchemy"}} 
    16     #dbmechanic = DBMechanic(SAProvider(metadata), '/dbmechanic') 
     16    #admin = DBMechanic(SAProvider(metadata), '/admin') 
    1717{{endif}} 
    1818    @expose('{{package}}.templates.index') 

  • projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/lib/base.py_tmpl

    r4488 r4587  
    44""" 
    55from tg import TGController, tmpl_context 
    6 {{if template_engine in ('genshi', 'mako')}} 
     6{{if template_engine in ('genshi', 'jinja', 'mako')}} 
    77from pylons.templating import render_{{template_engine}} as render 
    88{{endif}} 
    99 
    1010{{if sqlalchemy}} 
     11 
    1112import {{package}}.model as model 
    1213{{endif}} 
    …… 
    4647            #to eliminate possible cross request DBSession polution. 
    4748            model.DBSession.remove() 
     49        {{if identity == "sqlalchemy"}} 
     50        tmpl_context.identity =  request.environ.get('repoze.who.identity')  
     51        {{endif}} 
    4852        {{else}} 
    4953        return TGController.__call__(self, environ, start_response)