summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2016-10-22 16:08:44 -0400
committerGitHub <noreply@github.com>2016-10-22 16:08:44 -0400
commitad1ac118dc3f2f5602d0548c8e594ce2c5d816d5 (patch)
tree29b5e0f9d1907fde398dd468279b6ecb4ee26561
parent6eb58d7211652de50ebca8ae12bbffb375022b65 (diff)
parent6cb93803ae4bfabee422269192035c5c477564ea (diff)
downloadpyramid-ad1ac118dc3f2f5602d0548c8e594ce2c5d816d5.tar.gz
pyramid-ad1ac118dc3f2f5602d0548c8e594ce2c5d816d5.tar.bz2
pyramid-ad1ac118dc3f2f5602d0548c8e594ce2c5d816d5.zip
Merge pull request #2798 from palindromed/move-to-jinja2
Move to jinja2
Diffstat
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--pyramid/scaffolds/starter/+package+/__init__.py2
-rw-r--r--pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl (renamed from pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl)13
-rw-r--r--pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl8
-rw-r--r--pyramid/scaffolds/starter/+package+/views.py_tmpl2
-rw-r--r--pyramid/scaffolds/starter/MANIFEST.in_tmpl2
-rw-r--r--pyramid/scaffolds/starter/setup.py_tmpl2
-rw-r--r--pyramid/scaffolds/zodb/+package+/__init__.py2
-rw-r--r--pyramid/scaffolds/zodb/+package+/templates/layout.jinja2_tmpl (renamed from pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl)11
-rw-r--r--pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl7
-rw-r--r--pyramid/scaffolds/zodb/+package+/views.py_tmpl2
-rw-r--r--pyramid/scaffolds/zodb/MANIFEST.in_tmpl2
-rw-r--r--pyramid/scaffolds/zodb/setup.py_tmpl2
13 files changed, 36 insertions, 21 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index bb21337e2..dcca62d48 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -284,3 +284,5 @@ Contributors
- Jon Davidson, 2016/07/18
- Keith Yang, 2016/07/22
+
+- Hannah Krager, 2016/10/22 \ No newline at end of file
diff --git a/pyramid/scaffolds/starter/+package+/__init__.py b/pyramid/scaffolds/starter/+package+/__init__.py
index ad5ecbc6f..49dde36d4 100644
--- a/pyramid/scaffolds/starter/+package+/__init__.py
+++ b/pyramid/scaffolds/starter/+package+/__init__.py
@@ -5,7 +5,7 @@ def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
config = Configurator(settings=settings)
- config.include('pyramid_chameleon')
+ config.include('pyramid_jinja2')
config.add_static_view('static', 'static', cache_max_age=3600)
config.add_route('home', '/')
config.scan()
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl
index 87fae3817..360855602 100644
--- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/starter/+package+/templates/layout.jinja2_tmpl
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="${request.locale_name}">
+<html lang="\{\{request.locale_name\}\}">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -14,7 +14,7 @@
<link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this scaffold -->
- <link href="${request.static_url('{{package}}:static/theme.css')}" rel="stylesheet">
+ <link href="\{\{request.static_url('{{package}}:static/theme.css')\}\}" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@@ -29,13 +29,12 @@
<div class="container">
<div class="row">
<div class="col-md-2">
- <img class="logo img-responsive" src="${request.static_url('{{package}}:static/pyramid.png')}" alt="pyramid web framework">
+ <img class="logo img-responsive" src="\{\{request.static_url('{{package}}:static/pyramid.png')\}\}" alt="pyramid web framework">
</div>
<div class="col-md-10">
- <div class="content">
- <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Starter scaffold</span></h1>
- <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework {{pyramid_version}}</span>.</p>
- </div>
+ {% block content %}
+ <p>No content</p>
+ {% endblock content %}
</div>
</div>
<div class="row">
diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl
new file mode 100644
index 000000000..f826ff9e7
--- /dev/null
+++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.jinja2_tmpl
@@ -0,0 +1,8 @@
+{% extends "layout.jinja2" %}
+
+{% block content%}
+<div class="content">
+ <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">Starter scaffold</span></h1>
+ <p class="lead">Welcome to <span class="font-normal">\{\{project\}\}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework {{pyramid_version}}</span>.</p>
+</div>
+{% endblock content %}
diff --git a/pyramid/scaffolds/starter/+package+/views.py_tmpl b/pyramid/scaffolds/starter/+package+/views.py_tmpl
index ad9af7292..01b9d0130 100644
--- a/pyramid/scaffolds/starter/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/starter/+package+/views.py_tmpl
@@ -1,6 +1,6 @@
from pyramid.view import view_config
-@view_config(route_name='home', renderer='templates/mytemplate.pt')
+@view_config(route_name='home', renderer='templates/mytemplate.jinja2')
def my_view(request):
return {'project': '{{project}}'}
diff --git a/pyramid/scaffolds/starter/MANIFEST.in_tmpl b/pyramid/scaffolds/starter/MANIFEST.in_tmpl
index 0ff6eb7a0..4d1c86b44 100644
--- a/pyramid/scaffolds/starter/MANIFEST.in_tmpl
+++ b/pyramid/scaffolds/starter/MANIFEST.in_tmpl
@@ -1,2 +1,2 @@
include *.txt *.ini *.cfg *.rst
-recursive-include {{package}} *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
+recursive-include {{package}} *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
diff --git a/pyramid/scaffolds/starter/setup.py_tmpl b/pyramid/scaffolds/starter/setup.py_tmpl
index 2e5ce92c7..7f50bbbc2 100644
--- a/pyramid/scaffolds/starter/setup.py_tmpl
+++ b/pyramid/scaffolds/starter/setup.py_tmpl
@@ -10,7 +10,7 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
requires = [
'pyramid',
- 'pyramid_chameleon',
+ 'pyramid_jinja2',
'pyramid_debugtoolbar',
'waitress',
]
diff --git a/pyramid/scaffolds/zodb/+package+/__init__.py b/pyramid/scaffolds/zodb/+package+/__init__.py
index f2a86df47..0ca5198b6 100644
--- a/pyramid/scaffolds/zodb/+package+/__init__.py
+++ b/pyramid/scaffolds/zodb/+package+/__init__.py
@@ -12,7 +12,7 @@ def main(global_config, **settings):
""" This function returns a Pyramid WSGI application.
"""
config = Configurator(root_factory=root_factory, settings=settings)
- config.include('pyramid_chameleon')
+ config.include('pyramid_jinja2')
config.add_static_view('static', 'static', cache_max_age=3600)
config.scan()
return config.make_wsgi_app()
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/layout.jinja2_tmpl
index e109ab829..a0b3f22f4 100644
--- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/templates/layout.jinja2_tmpl
@@ -14,7 +14,7 @@
<link href="//oss.maxcdn.com/libs/twitter-bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this scaffold -->
- <link href="${request.static_url('{{package}}:static/theme.css')}" rel="stylesheet">
+ <link href="\{\{request.static_url('{{package}}:static/theme.css')\}\}" rel="stylesheet">
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
@@ -29,13 +29,12 @@
<div class="container">
<div class="row">
<div class="col-md-2">
- <img class="logo img-responsive" src="${request.static_url('{{package}}:static/pyramid.png')}" alt="pyramid web framework">
+ <img class="logo img-responsive" src="\{\{request.static_url('{{package}}:static/pyramid.png')\}\}" alt="pyramid web framework">
</div>
<div class="col-md-10">
- <div class="content">
- <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">ZODB scaffold</span></h1>
- <p class="lead">Welcome to <span class="font-normal">${project}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework {{pyramid_version}}</span>.</p>
- </div>
+ {% block content %}
+ <p>No content</p>
+ {% endblock content %}
</div>
</div>
<div class="row">
diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl
new file mode 100644
index 000000000..bb075e91d
--- /dev/null
+++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.jinja2_tmpl
@@ -0,0 +1,7 @@
+{% extends "layout.jinja2" %}
+{% block content %}
+<div class="content">
+ <h1><span class="font-semi-bold">Pyramid</span> <span class="smaller">ZODB scaffold</span></h1>
+ <p class="lead">Welcome to <span class="font-normal">\{\{project\}\}</span>, an&nbsp;application generated&nbsp;by<br>the <span class="font-normal">Pyramid Web Framework {{pyramid_version}}</span>.</p>
+</div>
+{% endblock content %}
diff --git a/pyramid/scaffolds/zodb/+package+/views.py_tmpl b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
index 1e8a9b65a..0b176b365 100644
--- a/pyramid/scaffolds/zodb/+package+/views.py_tmpl
+++ b/pyramid/scaffolds/zodb/+package+/views.py_tmpl
@@ -2,6 +2,6 @@ from pyramid.view import view_config
from .models import MyModel
-@view_config(context=MyModel, renderer='templates/mytemplate.pt')
+@view_config(context=MyModel, renderer='templates/mytemplate.jinja2')
def my_view(request):
return {'project': '{{project}}'}
diff --git a/pyramid/scaffolds/zodb/MANIFEST.in_tmpl b/pyramid/scaffolds/zodb/MANIFEST.in_tmpl
index 0ff6eb7a0..4d1c86b44 100644
--- a/pyramid/scaffolds/zodb/MANIFEST.in_tmpl
+++ b/pyramid/scaffolds/zodb/MANIFEST.in_tmpl
@@ -1,2 +1,2 @@
include *.txt *.ini *.cfg *.rst
-recursive-include {{package}} *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml
+recursive-include {{package}} *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml *.jinja2
diff --git a/pyramid/scaffolds/zodb/setup.py_tmpl b/pyramid/scaffolds/zodb/setup.py_tmpl
index 19771d756..a503d60ab 100644
--- a/pyramid/scaffolds/zodb/setup.py_tmpl
+++ b/pyramid/scaffolds/zodb/setup.py_tmpl
@@ -10,7 +10,7 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
requires = [
'pyramid',
- 'pyramid_chameleon',
+ 'pyramid_jinja2',
'pyramid_debugtoolbar',
'pyramid_tm',
'pyramid_zodbconn',
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-12 00:35:32 +0000