Permalink
Browse files

index page serving

  • Loading branch information...
1 parent 8816795 commit dbffb9e1b6d9124c9f5e25a91a38d2a333549741 Whit Morriss committed Nov 7, 2011
Showing with 12 additions and 14 deletions.
  1. +2 −2 cheeseprism/__init__.py
  2. +3 −1 cheeseprism/templates/base.html
  3. +2 −2 cheeseprism/views.py
  4. +2 −5 development.ini
  5. +0 −1 production.ini
  6. +3 −3 setup.py
@@ -1,8 +1,8 @@
-#from pyramid_jinja2 import renderer_factory
from cheeseprism.resources import App
from pyramid.config import Configurator
from pyramid.decorator import reify
from pyramid.request import Request
+from pyramid_jinja2 import renderer_factory
def main(global_config, **settings):
@@ -17,7 +17,7 @@ def main(global_config, **settings):
config = Configurator(root_factory=App, settings=settings)
config.add_translation_dirs('locale/')
config.include('pyramid_jinja2')
- #config.add_renderer('.html', renderer_factory)
+ config.add_renderer('.html', renderer_factory)
config.add_static_view('static', 'static')
config.scan('cheeseprism.views')
@@ -18,6 +18,7 @@
<div class="bodywrapper">
<div class="body">
<div class="section" id="flask-themes">
+ {#
{% with messages = get_flashed_messages() %}
{% if messages %}
<div class='note'>
@@ -29,6 +30,7 @@
</div>
{% endif %}
{% endwith %}
+ #}
{%block content%}
{%endblock%}
@@ -40,4 +42,4 @@
</div>
<div class="clearer"></div>
</body>
-</html>
+</html>
@@ -2,7 +2,7 @@
from cheeseprism import resources
from cheeseprism import utils
from path import path
-from pyramid.exceptions import HTTPFound
+from pyramid.httpexceptions import HTTPFound
from pyramid.i18n import TranslationStringFactory
from pyramid.view import view_config
from werkzeug import secure_filename
@@ -11,7 +11,7 @@
_ = TranslationStringFactory('CheesePrism')
-@view_config(renderer='index.html', context=resources.App)
+@view_config(renderer='instructions.html', context=resources.App)
def index(context, request):
return {}
View
@@ -1,4 +1,4 @@
-[app:CheesePrism]
+[app:main]
use = egg:CheesePrism
reload_templates = true
debug_authorization = false
@@ -7,11 +7,8 @@ debug_routematch = false
debug_templates = true
default_locale_name = en
jinja2.directories = cheeseprism:templates
+pyramid.includes = pyramid_debugtoolbar
-[pipeline:main]
-pipeline =
- egg:WebError#evalerror
- CheesePrism
[server:main]
use = egg:Paste#http
View
@@ -8,7 +8,6 @@ debug_templates = false
default_locale_name = en
[filter:weberror]
-use = egg:WebError#error_catcher
debug = false
;error_log =
;show_exceptions_in_wsgi_errors = true
View
@@ -1,12 +1,12 @@
+from setuptools import find_packages
+from setuptools import setup
import os
-from setuptools import setup, find_packages
-
here = os.path.abspath(os.path.dirname(__file__))
README = open(os.path.join(here, 'README.txt')).read()
CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
-requires=['pyramid>=1.0a10', 'pyramid_jinja2', 'path.py', 'werkzeug']
+requires=['pyramid', 'pyramid_jinja2', 'path.py', 'werkzeug', 'pyramid_debugtoolbar']
setup(name='CheesePrism',
version='0.0',

0 comments on commit dbffb9e

Please sign in to comment.