From 3688ac7b7966f92ef621151fb4c4dec974eca533 Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Thu, 26 Sep 2013 10:52:37 -0700 Subject: [PATCH 1/5] Fix for pyramid 1.5a2 (require pyramid_chameleon) --- deformdemo/__init__.py | 1 + setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/deformdemo/__init__.py b/deformdemo/__init__.py index f03b3912..7c72470e 100644 --- a/deformdemo/__init__.py +++ b/deformdemo/__init__.py @@ -2274,6 +2274,7 @@ def main(global_config, **settings): renderer = settings['deformdemo.renderer'] session_factory = UnencryptedCookieSessionFactoryConfig('seekrit!') config = Configurator(settings=settings, session_factory=session_factory) + config.include('pyramid_chameleon') renderer = config.maybe_dotted(renderer) deform.Form.set_default_renderer(renderer) config.add_static_view('static_deform', 'deform:static') diff --git a/setup.py b/setup.py index 7ea9fa54..0960c345 100644 --- a/setup.py +++ b/setup.py @@ -31,6 +31,7 @@ requires = ['deform>=2.0dev', 'pyramid>=1.5a1', # route_name argument to resource_url + 'pyramid_chameleon', 'pygments', 'waitress'] From c591e613f5368594770336d6baf8690bb182ef67 Mon Sep 17 00:00:00 2001 From: Jeff Dairiki Date: Mon, 30 Sep 2013 20:46:33 -0700 Subject: [PATCH 2/5] Add buttons to change form.bootstrap_form_style --- deformdemo/__init__.py | 11 +++++++++++ deformdemo/templates/main.pt | 31 +++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/deformdemo/__init__.py b/deformdemo/__init__.py index 7c72470e..6b91a36f 100644 --- a/deformdemo/__init__.py +++ b/deformdemo/__init__.py @@ -73,9 +73,19 @@ def __init__(self, request): self.request = request self.macros = get_renderer('templates/main.pt').implementation().macros + if 'bs_form_style' in self.request.GET: + session = self.request.session + bs_form_style = self.request.GET['bs_form_style'] + if bs_form_style not in ('form-horizontal', 'form-inline'): + bs_form_style = None + session['bootstrap_form_style'] = bs_form_style + def render_form(self, form, appstruct=colander.null, submitted='submit', success=None, readonly=False, is_i18n=False): + session = self.request.session + form.bootstrap_form_style = session.get('bootstrap_form_style') + captured = None if submitted in self.request.POST: @@ -118,6 +128,7 @@ def render_form(self, form, appstruct=colander.null, submitted='submit', 'end':end, 'is_i18n':is_i18n, 'locale': locale_name, + 'bs_form_style': form.bootstrap_form_style, 'demos':self.get_demos(), 'title':self.get_title(), 'css_links':reqts['css'], diff --git a/deformdemo/templates/main.pt b/deformdemo/templates/main.pt index 22d03d00..5d1f7be8 100644 --- a/deformdemo/templates/main.pt +++ b/deformdemo/templates/main.pt @@ -45,14 +45,33 @@ -