Merge pull request #13 from tahajahangir/bootstrap3

Compatible with Bootstrap 3.
Thx!

Author: amleczko

fa/bootstrap/__init__.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 from pyramid_formalchemy import events
 from fa.bootstrap import fanstatic_resources
+from fa.bootstrap.forms import BootstrapFieldSet
 
 
 #object listening rendering events
 @events.subscriber([object, events.IBeforeListingRenderEvent])
 def before_object_listing_render(context, event):
     fanstatic_resources.listing.need()
 
+
 def includeme(config):
     config.add_translation_dirs('fa.bootstrap:locale/')
     config.include('fa.jquery')

fa/bootstrap/actions.py

@@ -1,44 +1,53 @@
 from pyramid_formalchemy.i18n import TranslationStringFactory
 from pyramid_formalchemy import actions
 from pyramid_formalchemy.actions import Actions
-from pyramid_formalchemy.actions import action; action
 from webhelpers.html import literal
 
 _ = TranslationStringFactory('fa_bootstrap')
 
 
+class RealButton(actions.Action):
+    body = '<button class="${_class}" tal:attributes="%(attributes)s">' \
+           '<span tal:condition="action.icon" class="${action.icon}"></span> ${content}</button>'
+
+    @property
+    def icon(self):
+        return self.rcontext.get('icon', None)
+
+
 class UIButton(actions.UIButton):
     """Overwrite default pyramid_formalchemy action to support bootstrap style."""
 
-    body = '''<a class="${_class}" tal:attributes="%(attributes)s"><i tal:condition="action.icon" class="${action.icon}"></i> ${content}</a>'''
+    body = '<a class="${_class}" tal:attributes="%(attributes)s">' \
+           '<span tal:condition="action.icon" class="${action.icon}"></span> ${content}</a>'
 
     @property
     def icon(self):
         return self.rcontext.get('icon', None)
 
 
-
 class TabAction(actions.Action):
     """New action type - comaptible with boostrap style."""
-    body = u'<li tal:attributes="class action.isActive(request) and \'active\' or \'\'"><a tal:attributes="%(attributes)s">${content}</a></li>'
+    body = u"<li tal:attributes=\"class action.is_active(request) and 'active' or ''\">" \
+           u'<a tal:attributes="%(attributes)s">${content}</a></li>'
 
-    def isActive(self, request):
+    def is_active(self, request):
         for _id in self.rcontext.get('children', ()):
             if _id in request.matchdict.get('traverse'):
                 return True
         return request.path_url.strip('/') == eval(self.attrs['href']).strip('/')
 
 
 class BreadcrumbAction(TabAction):
-    body = u'''<li tal:attributes="class action.isActive(request) and \'active\' or \'\'">
-                    <a tal:condition="not action.isActive(request)" tal:attributes="%(attributes)s">${content}</a>
-                    <span tal:condition="action.isActive(request)" tal:omit-tag="">${content}</span>
-                    <span tal:condition="not action.isActive(request)" class="divider">/</span>
+    body = u'''<li tal:attributes="class action.is_active(request) and \'active\' or \'\'">
+                    <a tal:condition="not action.is_active(request)" tal:attributes="%(attributes)s">${content}</a>
+                    <span tal:condition="action.is_active(request)" tal:omit-tag="">${content}</span>
+                    <span tal:condition="not action.is_active(request)" class="divider">/</span>
                </li>'''
 
 
 class TabsActions(Actions, actions.Action):
-    body='''<ul class="nav nav-tabs">${items}</ul>'''
+    body = '''<ul class="nav nav-tabs">${items}</ul>'''
 
     def __init__(self, *args, **kwargs):
         Actions.__init__(self, *args, **kwargs)
@@ -51,7 +60,7 @@ def render(self, request, **kwargs):
 
 
 class PillsActions(TabsActions):
-    body='''<ul class="nav nav-pills">${items}</ul>'''
+    body = '''<ul class="nav nav-pills">${items}</ul>'''
 
 
 class DropdownActions(Actions, actions.Action):
@@ -74,70 +83,69 @@ def render(self, request, **kwargs):
 
 
 new = UIButton(
-        id='new',
-        content=_('New ${model_label}'),
-        permission='new',
-        _class='btn btn-primary',
-        icon='icon-white icon-plus',
-        attrs=dict(href="request.fa_url(request.model_name, 'new')"),
-        )
-
-
-save = UIButton(
-        id='save',
-        content=_('Save'),
-        permission='edit',
-        _class='btn btn-success',
-        icon='icon-white icon-ok',
-        attrs=dict(onclick="jQuery(this).parents('form').submit();"),
-        )
+    id='new',
+    content=_('New ${model_label}'),
+    permission='new',
+    _class='btn btn-primary',
+    icon='glyphicon glyphicon-plus',
+    attrs=dict(href="request.fa_url(request.model_name, 'new')"),
+)
+
+save = RealButton(
+    id='save',
+    type='submit',
+    content=_('Save'),
+    permission='edit',
+    _class='btn btn-success',
+    icon='glyphicon glyphicon-ok',
+)
 
 save_and_add_another = UIButton(
-        id='save_and_add_another',
-        content=_('Save and add another'),
-        permission='edit',
-        _class='btn btn-success',
-        icon='icon-white icon-plus',
-        attrs=dict(onclick=("var f = jQuery(this).parents('form');"
-                            "jQuery('#next', f).val(window.location.href);"
-                            "f.submit();")),
-        )
+    id='save_and_add_another',
+    content=_('Save and add another'),
+    permission='edit',
+    _class='btn btn-success',
+    icon='glyphicon glyphicon-plus',
+    attrs=dict(onclick=("var f = jQuery(this).parents('form');"
+                        "jQuery('#next', f).val(window.location.href);"
+                        "f.submit();")),
+)
 
 edit = UIButton(
-        id='edit',
-        content=_('Edit'),
-        permission='edit',
-        _class='btn btn-info',
-        icon='icon-white icon-edit',
-        attrs=dict(href="request.fa_url(request.model_name, request.model_id, 'edit')"),
-        )
+    id='edit',
+    content=_('Edit'),
+    permission='edit',
+    _class='btn btn-info',
+    icon='glyphicon glyphicon-edit',
+    attrs=dict(href="request.fa_url(request.model_name, request.model_id, 'edit')"),
+)
 
 back = UIButton(
-        id='back',
-        content=_('Back'),
-        _class='btn',
-        attrs=dict(href="request.fa_url(request.model_name)"),
-        )
+    id='back',
+    content=_('Back'),
+    _class='btn btn-default',
+    attrs=dict(href="request.fa_url(request.model_name)"),
+)
 
 delete = UIButton(
-        id='delete',
-        content=_('Delete'),
-        permission='delete',
-        _class='btn btn-danger',
-        icon='icon-white icon-trash',
-        attrs=dict(onclick=("var f = jQuery(this).parents('form');"
-                      "f.attr('action', window.location.href.replace('/edit', '/delete'));"
-                      "f.submit();")),
-        )
+    id='delete',
+    content=_('Delete'),
+    permission='delete',
+    _class='btn btn-danger',
+    icon='glyphicon glyphicon-trash',
+    attrs=dict(onclick=("var f = jQuery(this).parents('form');"
+                        "f.attr('action', window.location.href.replace('/edit', '/delete'));"
+                        "f.submit();")),
+)
 
 cancel = UIButton(
-        id='cancel',
-        content=_('Cancel'),
-        permission='view',
-        _class='btn',
-        icon='icon-remove',
-        attrs=dict(href="request.fa_url(request.model_name)"),
-        )
+    id='cancel',
+    content=_('Cancel'),
+    permission='view',
+    _class='btn btn-default',
+    icon='glyphicon glyphicon-remove',
+    attrs=dict(href="request.fa_url(request.model_name)"),
+)
 
 defaults_actions = actions.defaults_actions.copy()
 defaults_actions['listing_buttons'] = Actions(new)

fa/bootstrap/forms.py

@@ -0,0 +1,16 @@
+from formalchemy import FieldSet, fatypes
+from fa.bootstrap import renderers
+
+
+class BootstrapFieldSet(FieldSet):
+    default_renderers = dict(FieldSet.default_renderers)
+    default_renderers.update({
+        fatypes.String: renderers.BootstrapTextFieldRenderer,
+        fatypes.Unicode: renderers.BootstrapTextFieldRenderer,
+        fatypes.Text: renderers.BootstrapTextFieldRenderer,
+        fatypes.Integer: renderers.BootstrapIntegerFieldRenderer,
+        fatypes.Float: renderers.BootstrapFloatFieldRenderer,
+        fatypes.Numeric: renderers.BootstrapFloatFieldRenderer,
+        fatypes.Interval: renderers.BootstrapIntervalFieldRenderer,
+        fatypes.Boolean: renderers.BootstrapBooleanFieldRenderer,
+    })

fa/bootstrap/renderers.py

@@ -17,13 +17,13 @@ def __init__(self, *args, **kwargs):
 
         def update_options(self, options, kwargs):
             kwargs['source'] = self.request.fa_url(
-                    self.field.relation_type().__name__, 'autocomplete')
+                self.field.relation_type().__name__, 'autocomplete')
 
         def render(self, **kwargs):
             fanstatic_resources.autocomplete.need()
-            filter_by = self.jq_options.get('filter_by')
+            filter_value = self.jq_options.get('filter_by')
             if self.raw_value:
-                label = getattr(self.raw_value, filter_by, u'Not selected')
+                label = getattr(self.raw_value, filter_value, u'Not selected')
             else:
                 label = u''
 
@@ -36,13 +36,51 @@ def render(self, **kwargs):
 
         def _serialized_value(self):
             try:
-                return super(Renderer,self)._serialized_value()
+                return super(Renderer, self)._serialized_value()
             except FieldNotFoundError:
                 return None
 
     jq_options.update(filter_by=filter_by, show_input=True)
 
     return renderers.jQueryFieldRenderer('bootstrap_autocomplete_relation', renderer=Renderer, **jq_options)
 
+
 @renderers.alias(AutocompleteRelationRenderer)
-def autocomplete_relation(): pass
+def autocomplete_relation():
+    pass
+
+
+class BootstrapFieldMixin(object):
+    """
+        Mixin to add `class="form-control"` to renderers
+    """
+
+    def render(self, **kwargs):
+        if 'class' in kwargs:
+            kwargs['class'] += ' form-control'
+        else:
+            kwargs['class'] = ' form-control'
+        return super(BootstrapFieldMixin, self).render(**kwargs)
+
+
+class BootstrapBooleanFieldRenderer(fields.CheckBoxFieldRenderer):
+    def render(self, **kwargs):
+        checkbox = super(BootstrapBooleanFieldRenderer, self).render(**kwargs)
+        return '<span class="input-group" style="width:1px"><span class="input-group-addon">%s</span>' \
+               '<span class="form-control">%s</span></span>' % (checkbox, 'True')
+
+
+class BootstrapTextFieldRenderer(BootstrapFieldMixin, fields.TextFieldRenderer):
+    pass
+
+
+class BootstrapIntegerFieldRenderer(BootstrapFieldMixin, fields.IntegerFieldRenderer):
+    pass
+
+
+class BootstrapFloatFieldRenderer(BootstrapFieldMixin, fields.FloatFieldRenderer):
+    pass
+
+
+class BootstrapIntervalFieldRenderer(BootstrapFieldMixin, fields.IntervalFieldRenderer):
+    pass

fa/bootstrap/scaffolds/__init__.py

@@ -1,6 +1,7 @@
 from paste.util.template import paste_script_template_renderer
 from pyramid.scaffolds import PyramidTemplate
 
+
 class PyramidFormAlchemyBootstrapTemplate(PyramidTemplate):
     _template_dir = ('pyramid_fa_bootstrap')
     summary = "Pyramid SQLAlchemy project using fa.bootstrap"

fa/bootstrap/scaffolds/pyramid_fa_bootstrap/+package+/__init__.py_tmpl

@@ -16,7 +16,8 @@ def main(global_config, **settings):
                     renderer="templates/home.pt")
 
     config.include('pyramid_formalchemy')
-    # Adding the jquery libraries
+    config.include('pyramid_chameleon')
+    # Adding the jquery/bootstrap libraries
     config.include('fa.bootstrap')
     # Adding the package specific routes
     config.include('{{package}}.routes')

fa/bootstrap/scaffolds/pyramid_fa_bootstrap/+package+/forms.py_tmpl

@@ -1,11 +1,10 @@
-from formalchemy import forms
 from formalchemy import tables
 from pyramid.renderers import get_renderer
 from fa.bootstrap.views import ModelView as Base
-from fa.bootstrap import fanstatic_resources
+from fa.bootstrap import fanstatic_resources, BootstrapFieldSet
 
 
-class FieldSet(forms.FieldSet):
+class FieldSet(BootstrapFieldSet):
     pass
 
 

fa/bootstrap/scaffolds/pyramid_fa_bootstrap/+package+/models.py_tmpl

@@ -1,16 +1,11 @@
-import transaction
+from datetime import timedelta
 
+import transaction
 from sqlalchemy.orm import scoped_session
 from sqlalchemy.orm import sessionmaker
-
 from sqlalchemy.ext.declarative import declarative_base
-
 from sqlalchemy.exc import IntegrityError
-
-from sqlalchemy import Integer
-from sqlalchemy import Unicode
-from sqlalchemy import Column
-
+from sqlalchemy import Integer, Unicode, Column, Float, Interval, Boolean
 from zope.sqlalchemy import ZopeTransactionExtension
 
 DBSession = scoped_session(sessionmaker(extension=ZopeTransactionExtension()))
@@ -21,18 +16,23 @@ class MyModel(Base):
     id = Column(Integer, primary_key=True)
     name = Column(Unicode(255), unique=True)
     value = Column(Integer)
+    float_value = Column(Float)
+    boolean = Column(Boolean)
+    interval = Column(Interval)
+
+    def __init__(self, **kwargs):
+        for key, value in kwargs.items():
+            setattr(self, key, value)
 
-    def __init__(self, name='', value=''):
-        self.name = name
-        self.value = value
 
 def populate():
     session = DBSession()
-    model = MyModel(name=u'test name', value=55)
+    model = MyModel(name=u'test name', value=55, float_value=3.5, interval=timedelta(4), boolean=True)
     session.add(model)
     session.flush()
     transaction.commit()
 
+
 def initialize_sql(engine):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
@@ -43,5 +43,6 @@ def initialize_sql(engine):
         transaction.abort()
     return DBSession
 
+
 def appmaker(engine):
     initialize_sql(engine)