##// END OF EJS Templates
Merged with the old validation changes.
neko259 -
r75:bb74538a merge default
parent child Browse files
Show More
@@ -40,7 +40,6 b' class PostForm(forms.Form):'
40
40
41 class ThreadForm(PostForm):
41 class ThreadForm(PostForm):
42 regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE)
42 regex_tags = re.compile(ur'^[\w\s\d]+$', re.UNICODE)
43
44 tags = forms.CharField(max_length=100)
43 tags = forms.CharField(max_length=100)
45
44
46 def clean_tags(self):
45 def clean_tags(self):
@@ -8,6 +8,19 b' html {'
8 color: #00FF00
8 color: #00FF00
9 }
9 }
10
10
11 .input_field {
12
13 }
14
15 .input_field_name {
16
17 }
18
19 .input_field_error {
20 color: #FF0000;
21 }
22
23
11 .title {
24 .title {
12 font-weight: bold;
25 font-weight: bold;
13 color: #ffcc00;
26 color: #ffcc00;
@@ -62,6 +62,19 b' li {'
62 color: #fff;
62 color: #fff;
63 }
63 }
64
64
65 .input_field {
66
67 }
68
69 .input_field_name {
70
71 }
72
73 .input_field_error {
74 color: #FF0000;
75 }
76
77
65 .title {
78 .title {
66 color: #182F6F;
79 color: #182F6F;
67 font-weight: bold;
80 font-weight: bold;
@@ -108,18 +108,22 b''
108 <div class="form-row">
108 <div class="form-row">
109 <div class="form-label">{% trans 'Title' %}</div>
109 <div class="form-label">{% trans 'Title' %}</div>
110 <div class="form-input">{{ form.title }}</div>
110 <div class="form-input">{{ form.title }}</div>
111 <div class="form-errors">{{ form.title.errors }}</div>
111 </div>
112 </div>
112 <div class="form-row">
113 <div class="form-row">
113 <div class="form-label">{% trans 'Text' %}</div>
114 <div class="form-label">{% trans 'Text' %}</div>
114 <div class="form-input">{{ form.text }}</div>
115 <div class="form-input">{{ form.text }}</div>
116 <div class="form-errors">{{ form.text.errors }}</div>
115 </div>
117 </div>
116 <div class="form-row">
118 <div class="form-row">
117 <div class="form-label">{% trans 'Image' %}</div>
119 <div class="form-label">{% trans 'Image' %}</div>
118 <div class="form-input">{{ form.image }}</div>
120 <div class="form-input">{{ form.image }}</div>
121 <div class="form-errors">{{ form.image.errors }}</div>
119 </div>
122 </div>
120 <div class="form-row">
123 <div class="form-row">
121 <div class="form-label">{% trans 'Tags' %}</div>
124 <div class="form-label">{% trans 'Tags' %}</div>
122 <div class="form-input">{{ form.tags }}</div>
125 <div class="form-input">{{ form.tags }}</div>
126 <div class="form-errors">{{ form.tags.errors }}</div>
123 </div>
127 </div>
124 </div>
128 </div>
125 <div class="form-submit"><input type="submit"
129 <div class="form-submit"><input type="submit"
@@ -61,6 +61,7 b''
61 <hr />
61 <hr />
62 {% endif %}
62 {% endif %}
63
63
64 <<<<<<< local
64 <form id="form" enctype="multipart/form-data" method="post"
65 <form id="form" enctype="multipart/form-data" method="post"
65 >{% csrf_token %}
66 >{% csrf_token %}
66 <div class="post-form-w">
67 <div class="post-form-w">
@@ -69,14 +70,17 b''
69 <div class="form-row">
70 <div class="form-row">
70 <div class="form-label">{% trans 'Title' %}</div>
71 <div class="form-label">{% trans 'Title' %}</div>
71 <div class="form-input">{{ form.title }}</div>
72 <div class="form-input">{{ form.title }}</div>
73 <div class="form-errors">{{ form.title.errors }}</div>
72 </div>
74 </div>
73 <div class="form-row">
75 <div class="form-row">
74 <div class="form-label">{% trans 'Text' %}</div>
76 <div class="form-label">{% trans 'Text' %}</div>
75 <div class="form-input">{{ form.text }}</div>
77 <div class="form-input">{{ form.text }}</div>
78 <div class="form-errors">{{ form.text.errors }}</div>
76 </div>
79 </div>
77 <div class="form-row">
80 <div class="form-row">
78 <div class="form-label">{% trans 'Image' %}</div>
81 <div class="form-label">{% trans 'Image' %}</div>
79 <div class="form-input">{{ form.image }}</div>
82 <div class="form-input">{{ form.image }}</div>
83 <div class="form-errors">{{ form.image.errors }}</div>
80 </div>
84 </div>
81 </div>
85 </div>
82 <div class="form-submit"><input type="submit"
86 <div class="form-submit"><input type="submit"
General Comments 0
You need to be logged in to leave comments. Login now