fix composite and options templates for chrome

fafhrd91 · Jan 17, 2013 · 5cd2b03 · 5cd2b03
1 parent 2417283
commit 5cd2b03
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,12 @@ CHANGES
 =======
 
 
+0.6.2 (01-16-2013)
+------------------
+
+- Fixed composite and options templates for Chrome
+
+
 0.6.1 (01-09-2012)
 ------------------
 

diff --git a/pform/__init__.py b/pform/__init__.py
@@ -5,7 +5,7 @@
     'Field', 'FieldFactory', 'Fieldset',
     'field', 'fieldpreview', 'get_field_factory', 'get_field_preview',
 
-    'Term', 'Vocabulary', 'SimpleTerm', 'SimpleVocabulary',
+    'Term', 'Vocabulary',
 
     'All','Function','Regex','Email','Range', 'Length','OneOf',
 
@@ -120,9 +120,9 @@
 
 
 def includeme(cfg):
-    cfg.include('player')
     cfg.include('pyramid_amdjs')
     cfg.include('pyramid_jinja2')
+    cfg.include('player')
 
     # field
     from pform.directives import add_field

diff --git a/pform/templates/composite.jinja2 b/pform/templates/composite.jinja2
@@ -43,5 +43,6 @@
       <p class="help-block"></p>
     </div>
   </div>
+  <div class="clearfix"></div>
   {% endfor %}
 {% endif %}
diff --git a/pform/templates/options.jinja2 b/pform/templates/options.jinja2
@@ -20,4 +20,5 @@
       <p class="help-block"></p>
     </div>
   </div>
+  <div class="clearfix"></div>
 {% endfor %}
diff --git a/setup.py b/setup.py
@@ -2,11 +2,11 @@
 import sys
 from setuptools import setup, find_packages
 
-version = '0.6.1'
+version = '0.6.2'
 
 install_requires = ['setuptools',
                     'pyramid >= 1.4',
-                    'pyramid_amdjs >= 0.3',
+                    'pyramid_amdjs >= 0.5',
                     'pyramid_jinja2',
                     'player >= 0.6',
                     'pytz',