Skip to content

Commit 6d77109

Browse files
tomhamiltonstubbertomhamiltonstubber
authored
Merge pull request #14 from tutorcruncher/fix-unclear-versions
2 parents 927a61d + a28566a commit 6d77109

File tree

12 files changed

+91
-509
lines changed

12 files changed

+91
-509
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Twitter Bootstrap for Django Forms.
1212

1313
**django-jinja-bootstrap-form** has been used in production for 6 months and is stable.
1414

15-
Supports Django >=1.8. Python >=3.5.
15+
Supports Django >=3.2. Python >=3.5.
1616

1717
See [django-bootstrap-form](https://github.com/tzangms/django-bootstrap-form) for documentation. Usage should
1818
be the same except:

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
url='https://github.com/tutorcruncher/django-jinja-bootstrap-form',
4545
license='BSD',
4646
install_requires=[
47-
'django>=3',
47+
'django>=3.2',
4848
'django-jinja>=2.6.0',
4949
],
5050
packages=find_packages(),

‎testing/fixtures/basic.html‎

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1+
12
<div class="form-group">
23
<label class="control-label required" for="id_char_field">Char field</label>
34

45
<div class="">
5-
<input class=" form-control" id="id_char_field" name="char_field" type="text" />
6+
<input type="text" name="char_field" class=" form-control" required id="id_char_field">
67
</div>
78
</div>
89
<div class="form-group">
910
<label class="control-label required" for="id_choice_field">Choice field</label>
1011

1112
<div class="">
12-
<select class=" form-control" id="id_choice_field" name="choice_field">
13-
<option value="0">Zero</option>
14-
<option value="1">One</option>
15-
<option value="2">Two</option>
13+
<select name="choice_field" class=" form-control" id="id_choice_field">
14+
<option value="0">Zero</option>
15+
16+
<option value="1">One</option>
17+
18+
<option value="2">Two</option>
19+
1620
</select>
1721
</div>
1822
</div>
@@ -21,19 +25,19 @@
2125
<div class="">
2226
<div class="radio">
2327
<label>
24-
<input id="id_radio_choice_0" name="radio_choice" type="radio" value="0" />
28+
<input type="radio" name="radio_choice" value="0" id="id_radio_choice_0" required>
2529
Zero
2630
</label>
2731
</div>
2832
<div class="radio">
2933
<label>
30-
<input id="id_radio_choice_1" name="radio_choice" type="radio" value="1" />
34+
<input type="radio" name="radio_choice" value="1" id="id_radio_choice_1" required>
3135
One
3236
</label>
3337
</div>
3438
<div class="radio">
3539
<label>
36-
<input id="id_radio_choice_2" name="radio_choice" type="radio" value="2" />
40+
<input type="radio" name="radio_choice" value="2" id="id_radio_choice_2" required>
3741
Two
3842
</label>
3943
</div>
@@ -44,49 +48,67 @@
4448
<label class="control-label required" for="id_multiple_choice">Multiple choice</label>
4549

4650
<div class="">
47-
<select multiple="multiple" class=" form-control" id="id_multiple_choice" name="multiple_choice">
48-
<option value="0">Zero</option>
49-
<option value="1">One</option>
50-
<option value="2">Two</option>
51+
<select name="multiple_choice" class=" form-control" required id="id_multiple_choice" multiple>
52+
<option value="0">Zero</option>
53+
54+
<option value="1">One</option>
55+
56+
<option value="2">Two</option>
57+
5158
</select>
5259
</div>
5360
</div>
5461
<div class="form-group">
55-
<label class="control-label required" for="id_multiple_checkbox">Multiple checkbox</label>
62+
<label class="control-label required">Multiple checkbox</label>
63+
<div class="">
64+
<div class="radio">
65+
<label>
66+
<input type="checkbox" name="multiple_checkbox" value="0" id="id_multiple_checkbox_0">
67+
Zero
68+
</label>
69+
</div>
70+
<div class="radio">
71+
<label>
72+
<input type="checkbox" name="multiple_checkbox" value="1" id="id_multiple_checkbox_1">
73+
One
74+
</label>
75+
</div>
76+
<div class="radio">
77+
<label>
78+
<input type="checkbox" name="multiple_checkbox" value="2" id="id_multiple_checkbox_2">
79+
Two
80+
</label>
81+
</div>
5682

57-
<div class=" multiple-checkbox">
58-
<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>
59-
<li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" type="checkbox" value="1" /> One</label></li>
60-
<li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" type="checkbox" value="2" /> Two</label></li></ul>
6183
</div>
6284
</div>
6385
<div class="form-group">
6486
<label class="control-label required" for="id_file_fied">File fied</label>
6587

6688
<div class="">
67-
<input id="id_file_fied" name="file_fied" type="file" />
89+
<input type="file" name="file_fied" required id="id_file_fied">
6890
</div>
6991
</div>
7092
<div class="form-group">
7193
<label class="control-label required" for="id_password_field">Password field</label>
7294

7395
<div class="">
74-
<input class=" form-control" id="id_password_field" name="password_field" type="password" />
96+
<input type="password" name="password_field" class=" form-control" required id="id_password_field">
7597
</div>
7698
</div>
7799
<div class="form-group">
78100
<label class="control-label required" for="id_textarea">Textarea</label>
79101

80102
<div class="">
81-
<textarea class=" form-control" cols="40" id="id_textarea" name="textarea" rows="10">
103+
<textarea name="textarea" cols="40" rows="10" class=" form-control" required id="id_textarea">
82104
</textarea>
83105
</div>
84106
</div>
85107
<div class="form-group">
86108
<div class="">
87109
<div class="checkbox">
88110
<label class="required">
89-
<input id="id_boolean_field" name="boolean_field" type="checkbox" /> <span>Boolean field</span>
111+
<input type="checkbox" name="boolean_field" required id="id_boolean_field"> <span>Boolean field</span>
90112
</label>
91113
</div>
92114
</div>

‎testing/fixtures/horizontal.html‎

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
1+
12
<div class="form-group">
23
<label class="control-label col-sm-2 col-lg-2 required" for="id_char_field">Char field</label>
34

45
<div class="col-sm-10 col-lg-10">
5-
<input class=" form-control" id="id_char_field" name="char_field" type="text" />
6+
<input type="text" name="char_field" class=" form-control" required id="id_char_field">
67
</div>
78
</div>
89
<div class="form-group">
910
<label class="control-label col-sm-2 col-lg-2 required" for="id_choice_field">Choice field</label>
1011

1112
<div class="col-sm-10 col-lg-10">
12-
<select class=" form-control" id="id_choice_field" name="choice_field">
13-
<option value="0">Zero</option>
14-
<option value="1">One</option>
15-
<option value="2">Two</option>
13+
<select name="choice_field" class=" form-control" id="id_choice_field">
14+
<option value="0">Zero</option>
15+
16+
<option value="1">One</option>
17+
18+
<option value="2">Two</option>
19+
1620
</select>
1721
</div>
1822
</div>
@@ -21,19 +25,19 @@
2125
<div class="col-sm-10 col-lg-10">
2226
<div class="radio">
2327
<label>
24-
<input id="id_radio_choice_0" name="radio_choice" type="radio" value="0" />
28+
<input type="radio" name="radio_choice" value="0" id="id_radio_choice_0" required>
2529
Zero
2630
</label>
2731
</div>
2832
<div class="radio">
2933
<label>
30-
<input id="id_radio_choice_1" name="radio_choice" type="radio" value="1" />
34+
<input type="radio" name="radio_choice" value="1" id="id_radio_choice_1" required>
3135
One
3236
</label>
3337
</div>
3438
<div class="radio">
3539
<label>
36-
<input id="id_radio_choice_2" name="radio_choice" type="radio" value="2" />
40+
<input type="radio" name="radio_choice" value="2" id="id_radio_choice_2" required>
3741
Two
3842
</label>
3943
</div>
@@ -44,49 +48,67 @@
4448
<label class="control-label col-sm-2 col-lg-2 required" for="id_multiple_choice">Multiple choice</label>
4549

4650
<div class="col-sm-10 col-lg-10">
47-
<select multiple="multiple" class=" form-control" id="id_multiple_choice" name="multiple_choice">
48-
<option value="0">Zero</option>
49-
<option value="1">One</option>
50-
<option value="2">Two</option>
51+
<select name="multiple_choice" class=" form-control" required id="id_multiple_choice" multiple>
52+
<option value="0">Zero</option>
53+
54+
<option value="1">One</option>
55+
56+
<option value="2">Two</option>
57+
5158
</select>
5259
</div>
5360
</div>
5461
<div class="form-group">
55-
<label class="control-label col-sm-2 col-lg-2 required" for="id_multiple_checkbox">Multiple checkbox</label>
62+
<label class="control-label col-sm-2 col-lg-2 required">Multiple checkbox</label>
63+
<div class="col-sm-10 col-lg-10">
64+
<div class="radio">
65+
<label>
66+
<input type="checkbox" name="multiple_checkbox" value="0" id="id_multiple_checkbox_0">
67+
Zero
68+
</label>
69+
</div>
70+
<div class="radio">
71+
<label>
72+
<input type="checkbox" name="multiple_checkbox" value="1" id="id_multiple_checkbox_1">
73+
One
74+
</label>
75+
</div>
76+
<div class="radio">
77+
<label>
78+
<input type="checkbox" name="multiple_checkbox" value="2" id="id_multiple_checkbox_2">
79+
Two
80+
</label>
81+
</div>
5682

57-
<div class="col-sm-10 col-lg-10 multiple-checkbox">
58-
<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>
59-
<li><label for="id_multiple_checkbox_1"><input id="id_multiple_checkbox_1" name="multiple_checkbox" type="checkbox" value="1" /> One</label></li>
60-
<li><label for="id_multiple_checkbox_2"><input id="id_multiple_checkbox_2" name="multiple_checkbox" type="checkbox" value="2" /> Two</label></li></ul>
6183
</div>
6284
</div>
6385
<div class="form-group">
6486
<label class="control-label col-sm-2 col-lg-2 required" for="id_file_fied">File fied</label>
6587

6688
<div class="col-sm-10 col-lg-10">
67-
<input id="id_file_fied" name="file_fied" type="file" />
89+
<input type="file" name="file_fied" required id="id_file_fied">
6890
</div>
6991
</div>
7092
<div class="form-group">
7193
<label class="control-label col-sm-2 col-lg-2 required" for="id_password_field">Password field</label>
7294

7395
<div class="col-sm-10 col-lg-10">
74-
<input class=" form-control" id="id_password_field" name="password_field" type="password" />
96+
<input type="password" name="password_field" class=" form-control" required id="id_password_field">
7597
</div>
7698
</div>
7799
<div class="form-group">
78100
<label class="control-label col-sm-2 col-lg-2 required" for="id_textarea">Textarea</label>
79101

80102
<div class="col-sm-10 col-lg-10">
81-
<textarea class=" form-control" cols="40" id="id_textarea" name="textarea" rows="10">
103+
<textarea name="textarea" cols="40" rows="10" class=" form-control" required id="id_textarea">
82104
</textarea>
83105
</div>
84106
</div>
85107
<div class="form-group">
86108
<div class="col-sm-10 col-sm-offset-2 col-lg-10 col-lg-offset-2">
87109
<div class="checkbox">
88110
<label class="required">
89-
<input id="id_boolean_field" name="boolean_field" type="checkbox" /> <span>Boolean field</span>
111+
<input type="checkbox" name="boolean_field" required id="id_boolean_field"> <span>Boolean field</span>
90112
</label>
91113
</div>
92114
</div>

‎testing/fixtures/partial.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<label class="control-label required" for="id_char_field">Char field</label>
44

55
<div class="">
6-
<input class=" form-control" id="id_char_field" name="char_field" type="text" />
6+
<input class=" form-control" id="id_char_field" name="char_field" type="text" required />
77
</div>
88
</div>
99

@@ -17,4 +17,4 @@
1717
<option value="2">Two</option>
1818
</select>
1919
</div>
20-
</div>
20+
</div>

‎testing/fixtures_10/basic.html‎

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)