1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
|
Description: Add Django 1.10 fixtures
Author: Thomas Goirand <zigo@debian.org>
Forwarded: https://github.com/tzangms/django-bootstrap-form/pull/86
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" required type="radio" value="0" />
+ Zero
+ </label>
+ </div>
+
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_1" name="radio_choice" required type="radio" value="1" />
+ One
+ </label>
+ </div>
+
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_2" name="radio_choice" required 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" type="checkbox" value="0" /> Zero</label></li>
+ <li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" type="checkbox" value="1" /> One</label></li>
+ <li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" 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" required type="radio" value="0" />
+ Zero
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_1" name="radio_choice" required type="radio" value="1" />
+ One
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input id="id_radio_choice_2" name="radio_choice" required 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" type="checkbox" value="0" /> Zero</label></li>
+ <li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" type="checkbox" value="1" /> One</label></li>
+ <li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" 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'
|
