openstack/deb-python-django-bootstrap-form
Code Issues Proposed changes

django-1.10-add-Django-1.10-fixtures.html.patch

Browse Source
This commit is contained in:
Thomas Goirand
2016-07-26 08:33:18 +00:00
parent f45ba8b1cd
commit de808a9291
3 changed files with 238 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@@ -11,6 +11,7 @@ python-django-bootstrap-form (3.2.1-1) unstable; urgency=medium
* Removed all patches.
* Added patch:
- django-1.10-fix-settings-in-runtests.py.patch
- django-1.10-add-Django-1.10-fixtures.html.patch
* Using pkgos-dh_auto_install from openstack-pkg-tools >= 52~.
* Standards-Version is now 3.9.8 (no change).

236
debian/patches/django-1.10-add-Django-1.10-fixtures.html.patch vendored Normal file
View File

@@ -0,0 +1,236 @@
Description: Add Django 1.10 fixtures
Author: Thomas Goirand <zigo@debian.org>
Forwarded: no
Last-Update: 2016-07-26
--- /dev/null
+++ python-django-bootstrap-form-3.2.1/bootstrapform/fixtures/basic_dj110.html
@@ -0,0 +1,99 @@
+<div class="form-group">
+ <label class="control-label " for="id_char_field">Char field</label>
+ <div class=" ">
+ <input class=" form-control" id="id_char_field" name="char_field" required type="text" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_choice_field">Choice field</label>
+ <div class=" ">
+ <select class=" form-control" id="id_choice_field" name="choice_field" required>
+ <option value="0">Zero</option>
+ <option value="1">One</option>
+ <option value="2">Two</option>
+ </select>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label ">Radio choice</label>
+ <div class="">
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_0" name="radio_choice" type="radio" value="0" />
+ Zero
+ </label>
+ </div>
+
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_1" name="radio_choice" type="radio" value="1" />
+ One
+ </label>
+ </div>
+
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_2" name="radio_choice" type="radio" value="2" />
+ Two
+ </label>
+ </div>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_multiple_choice">Multiple choice</label>
+ <div class=" ">
+ <select multiple="multiple" class=" form-control" id="id_multiple_choice" name="multiple_choice" required>
+ <option value="0">Zero</option>
+ <option value="1">One</option>
+ <option value="2">Two</option>
+ </select>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_multiple_checkbox">Multiple checkbox</label>
+ <div class=" multiple-checkbox">
+ <ul id="id_multiple_checkbox">
+ <li><label for="id_multiple_checkbox_0"><input id="id_multiple_checkbox_0" name="multiple_checkbox" required type="checkbox" value="0" /> Zero</label></li>
+ <li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" required type="checkbox" value="1" /> One</label></li>
+ <li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" required type="checkbox" value="2" /> Two</label></li>
+ </ul>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_file_fied">File fied</label>
+
+ <div class=" ">
+ <input id="id_file_fied" name="file_fied" required type="file" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_password_field">Password field</label>
+
+ <div class=" ">
+ <input class=" form-control" id="id_password_field" name="password_field" required type="password" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label " for="id_textarea">Textarea</label>
+ <div class=" ">
+ <textarea class=" form-control" cols="40" id="id_textarea" name="textarea" required rows="10">
+ </textarea>
+ </div>
+</div>
+
+<div class="form-group">
+ <div class="">
+ <div class="checkbox">
+ <label >
+ <input id="id_boolean_field" name="boolean_field" required type="checkbox" /> <span>Boolean field</span>
+ </label>
+ </div>
+ </div>
+</div>
--- /dev/null
+++ python-django-bootstrap-form-3.2.1/bootstrapform/fixtures/horizontal_dj110.html
@@ -0,0 +1,102 @@
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_char_field">Char field</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <input class=" form-control" id="id_char_field" name="char_field" required type="text" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_choice_field">Choice field</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <select class=" form-control" id="id_choice_field" name="choice_field" required>
+ <option value="0">Zero</option>
+ <option value="1">One</option>
+ <option value="2">Two</option>
+ </select>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 ">Radio choice</label>
+
+ <div class=" col-sm-10 col-lg-10">
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_0" name="radio_choice" type="radio" value="0" />
+ Zero
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_1" name="radio_choice" type="radio" value="1" />
+ One
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_2" name="radio_choice" type="radio" value="2" />
+ Two
+ </label>
+ </div>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_multiple_choice">Multiple choice</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <select multiple="multiple" class=" form-control" id="id_multiple_choice" name="multiple_choice" required>
+ <option value="0">Zero</option>
+ <option value="1">One</option>
+ <option value="2">Two</option>
+ </select>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_multiple_checkbox">Multiple checkbox</label>
+ <div class=" col-sm-10 col-lg-10 multiple-checkbox">
+ <ul id="id_multiple_checkbox">
+ <li><label for="id_multiple_checkbox_0"><input id="id_multiple_checkbox_0" name="multiple_checkbox" required type="checkbox" value="0" /> Zero</label></li>
+ <li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" required type="checkbox" value="1" /> One</label></li>
+ <li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" required type="checkbox" value="2" /> Two</label></li>
+ </ul>
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_file_fied">File fied</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <input id="id_file_fied" name="file_fied" required type="file" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_password_field">Password field</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <input class=" form-control" id="id_password_field" name="password_field" required type="password" />
+ </div>
+</div>
+
+<div class="form-group">
+ <label class="control-label col-sm-2 col-lg-2 " for="id_textarea">Textarea</label>
+
+ <div class=" col-sm-10 col-lg-10 ">
+ <textarea class=" form-control" cols="40" id="id_textarea" name="textarea" required rows="10">
+ </textarea>
+ </div>
+</div>
+
+<div class="form-group">
+ <div class=" col-sm-offset-2 col-sm-10 col-lg-offset-2 col-lg-10">
+ <div class="checkbox">
+ <label >
+ <input id="id_boolean_field" name="boolean_field" required type="checkbox" /> <span>Boolean field</span>
+ </label>
+ </div>
+ </div>
+</div>
--- python-django-bootstrap-form-3.2.1.orig/bootstrapform/tests.py
+++ python-django-bootstrap-form-3.2.1/bootstrapform/tests.py
@@ -43,7 +43,9 @@ class BootstrapTemplateTagTests(TestCase
html = Template("{% load bootstrap %}{{ form|bootstrap }}").render(Context({'form': form}))
- if StrictVersion(django.get_version()) >= StrictVersion('1.7'):
+ if StrictVersion(django.get_version()) >= StrictVersion('1.10b1'):
+ fixture = 'basic_dj110.html'
+ elif StrictVersion(django.get_version()) >= StrictVersion('1.7'):
fixture = 'basic.html'
elif StrictVersion(django.get_version()) >= StrictVersion('1.6'):
fixture = 'basic_dj16.html'
@@ -61,7 +63,9 @@ class BootstrapTemplateTagTests(TestCase
html = Template("{% load bootstrap %}{{ form|bootstrap_horizontal }}").render(Context({'form': form}))
- if StrictVersion(django.get_version()) >= StrictVersion('1.7'):
+ if StrictVersion(django.get_version()) >= StrictVersion('1.10b1'):
+ fixture = 'horizontal_dj110.html'
+ elif StrictVersion(django.get_version()) >= StrictVersion('1.7'):
fixture = 'horizontal.html'
elif StrictVersion(django.get_version()) >= StrictVersion('1.6'):
fixture = 'horizontal_dj16.html'

1
debian/patches/series vendored
View File

@@ -1 +1,2 @@
django-1.10-fix-settings-in-runtests.py.patch
django-1.10-add-Django-1.10-fixtures.html.patch