worldwide trademarks

master
fefa4ka 10 years ago
parent c2ed69cb8a
commit c95564542a
  1. 15
      djangocms_forms/forms.py
  2. 37
      djangocms_forms/templates/djangocms_forms/form_template/default.html
  3. BIN
      media/filer_public/05/7c/057c95f9-a55e-4b50-995f-e25caf26ede4/ru.png
  4. BIN
      media/filer_public/17/52/17529a00-4a46-4de4-8f27-9cf03c9e8ed4/eu.png
  5. BIN
      media/filer_public/3b/de/3bde947f-17b1-45d4-95ef-dc6271d2ed8c/ua.png
  6. BIN
      media/filer_public/4d/8f/4d8f56fd-f7cd-47d6-8937-6cc5e8dff1e1/by.png
  7. BIN
      media/filer_public/a1/c6/a1c609aa-7711-4eb0-ad21-5ffcdb1dd2d3/cn.png
  8. BIN
      media/filer_public/c8/87/c8875482-c3cb-4313-bb0d-bef4d4846054/by.png
  9. BIN
      media/filer_public/e1/28/e1281cda-082b-4e32-9f3b-cd44ddd990fa/by.png
  10. BIN
      media/filer_public/e6/55/e6550c44-0976-4c0e-a5be-84bd45dfce89/kz.png
  11. BIN
      media/filer_public/e7/5c/e75c01a9-697e-42bd-a4ad-b12f4a89270d/cn.png
  12. BIN
      media/filer_public/ee/b9/eeb97216-2587-4c00-9c47-8fb335b54901/us.png
  13. BIN
      media/filer_public_thumbnails/filer_public/05/7c/057c95f9-a55e-4b50-995f-e25caf26ede4/ru.png__16x16_q85_crop_subsampling-2_upscale.png
  14. BIN
      media/filer_public_thumbnails/filer_public/05/7c/057c95f9-a55e-4b50-995f-e25caf26ede4/ru.png__32x32_q85_crop_subsampling-2_upscale.png
  15. BIN
      media/filer_public_thumbnails/filer_public/05/7c/057c95f9-a55e-4b50-995f-e25caf26ede4/ru.png__48x48_q85_crop_subsampling-2_upscale.png
  16. BIN
      media/filer_public_thumbnails/filer_public/05/7c/057c95f9-a55e-4b50-995f-e25caf26ede4/ru.png__64x64_q85_crop_subsampling-2_upscale.png
  17. BIN
      media/filer_public_thumbnails/filer_public/17/52/17529a00-4a46-4de4-8f27-9cf03c9e8ed4/eu.png__16x16_q85_crop_subsampling-2_upscale.png
  18. BIN
      media/filer_public_thumbnails/filer_public/17/52/17529a00-4a46-4de4-8f27-9cf03c9e8ed4/eu.png__32x32_q85_crop_subsampling-2_upscale.png
  19. BIN
      media/filer_public_thumbnails/filer_public/17/52/17529a00-4a46-4de4-8f27-9cf03c9e8ed4/eu.png__48x48_q85_crop_subsampling-2_upscale.png
  20. BIN
      media/filer_public_thumbnails/filer_public/17/52/17529a00-4a46-4de4-8f27-9cf03c9e8ed4/eu.png__64x64_q85_crop_subsampling-2_upscale.png
  21. BIN
      media/filer_public_thumbnails/filer_public/36/15/36154587-f6b7-4e43-b7be-8a62f6a55c0c/sertifikat_ssha.jpg__150x212_q85_crop_subsampling-2_upscale.jpg
  22. BIN
      media/filer_public_thumbnails/filer_public/36/15/36154587-f6b7-4e43-b7be-8a62f6a55c0c/sertifikat_ssha.jpg__2476x3502_q85_crop_subsampling-2_upscale.jpg
  23. BIN
      media/filer_public_thumbnails/filer_public/37/d4/37d49355-9bb1-4021-a9fd-c21fb074b0ab/sertifikat_evrosoiuza_stranitsa_1.jpg__250x177_q85_crop_subsampling-2_upscale.jpg
  24. BIN
      media/filer_public_thumbnails/filer_public/3b/de/3bde947f-17b1-45d4-95ef-dc6271d2ed8c/ua.png__16x16_q85_crop_subsampling-2_upscale.png
  25. BIN
      media/filer_public_thumbnails/filer_public/3b/de/3bde947f-17b1-45d4-95ef-dc6271d2ed8c/ua.png__32x32_q85_crop_subsampling-2_upscale.png
  26. BIN
      media/filer_public_thumbnails/filer_public/3b/de/3bde947f-17b1-45d4-95ef-dc6271d2ed8c/ua.png__48x48_q85_crop_subsampling-2_upscale.png
  27. BIN
      media/filer_public_thumbnails/filer_public/3b/de/3bde947f-17b1-45d4-95ef-dc6271d2ed8c/ua.png__64x64_q85_crop_subsampling-2_upscale.png
  28. BIN
      media/filer_public_thumbnails/filer_public/61/3d/613df03f-9116-427b-a203-2c15ef049cc9/svidetelstvo_ukraina_stranitsa_1.jpg__150x211_q85_crop_subsampling-2_upscale.jpg
  29. BIN
      media/filer_public_thumbnails/filer_public/a1/c6/a1c609aa-7711-4eb0-ad21-5ffcdb1dd2d3/cn.png__16x16_q85_crop_subsampling-2_upscale.png
  30. BIN
      media/filer_public_thumbnails/filer_public/a1/c6/a1c609aa-7711-4eb0-ad21-5ffcdb1dd2d3/cn.png__32x32_q85_crop_subsampling-2_upscale.png
  31. BIN
      media/filer_public_thumbnails/filer_public/a1/c6/a1c609aa-7711-4eb0-ad21-5ffcdb1dd2d3/cn.png__48x48_q85_crop_subsampling-2_upscale.png
  32. BIN
      media/filer_public_thumbnails/filer_public/a1/c6/a1c609aa-7711-4eb0-ad21-5ffcdb1dd2d3/cn.png__64x64_q85_crop_subsampling-2_upscale.png
  33. BIN
      media/filer_public_thumbnails/filer_public/b5/04/b5041c69-67e0-4545-9251-7a74c605122c/svidetelstvo_kazakhstan_stranitsa_1.jpg__150x212_q85_crop_subsampling-2_upscale.jpg
  34. BIN
      media/filer_public_thumbnails/filer_public/b7/a8/b7a8750d-a0eb-4533-b09f-1fe0ac76ea5f/svidetelstvo_belarus.jpg__150x212_q85_crop_subsampling-2_upscale.jpg
  35. BIN
      media/filer_public_thumbnails/filer_public/bf/70/bf70a974-16b3-4845-8b37-d434c87693a8/svidetelstvo_na_tz_rossiia.jpg__150x212_q85_crop_subsampling-2_upscale.jpg
  36. BIN
      media/filer_public_thumbnails/filer_public/e1/28/e1281cda-082b-4e32-9f3b-cd44ddd990fa/by.png__16x16_q85_crop_subsampling-2_upscale.png
  37. BIN
      media/filer_public_thumbnails/filer_public/e1/28/e1281cda-082b-4e32-9f3b-cd44ddd990fa/by.png__32x32_q85_crop_subsampling-2_upscale.png
  38. BIN
      media/filer_public_thumbnails/filer_public/e1/28/e1281cda-082b-4e32-9f3b-cd44ddd990fa/by.png__48x48_q85_crop_subsampling-2_upscale.png
  39. BIN
      media/filer_public_thumbnails/filer_public/e1/28/e1281cda-082b-4e32-9f3b-cd44ddd990fa/by.png__64x64_q85_crop_subsampling-2_upscale.png
  40. BIN
      media/filer_public_thumbnails/filer_public/e4/fe/e4fe7e4e-d187-4e37-9cdf-03e9ee5bfed9/svidetelstvo_kitai.jpg__150x212_q85_crop_subsampling-2_upscale.jpg
  41. BIN
      media/filer_public_thumbnails/filer_public/e6/55/e6550c44-0976-4c0e-a5be-84bd45dfce89/kz.png__16x16_q85_crop_subsampling-2_upscale.png
  42. BIN
      media/filer_public_thumbnails/filer_public/e6/55/e6550c44-0976-4c0e-a5be-84bd45dfce89/kz.png__32x32_q85_crop_subsampling-2_upscale.png
  43. BIN
      media/filer_public_thumbnails/filer_public/e6/55/e6550c44-0976-4c0e-a5be-84bd45dfce89/kz.png__48x48_q85_crop_subsampling-2_upscale.png
  44. BIN
      media/filer_public_thumbnails/filer_public/e6/55/e6550c44-0976-4c0e-a5be-84bd45dfce89/kz.png__64x64_q85_crop_subsampling-2_upscale.png
  45. BIN
      media/filer_public_thumbnails/filer_public/ee/b9/eeb97216-2587-4c00-9c47-8fb335b54901/us.png__16x16_q85_crop_subsampling-2_upscale.png
  46. BIN
      media/filer_public_thumbnails/filer_public/ee/b9/eeb97216-2587-4c00-9c47-8fb335b54901/us.png__32x32_q85_crop_subsampling-2_upscale.png
  47. BIN
      media/filer_public_thumbnails/filer_public/ee/b9/eeb97216-2587-4c00-9c47-8fb335b54901/us.png__48x48_q85_crop_subsampling-2_upscale.png
  48. BIN
      media/filer_public_thumbnails/filer_public/ee/b9/eeb97216-2587-4c00-9c47-8fb335b54901/us.png__64x64_q85_crop_subsampling-2_upscale.png
  49. 14
      zsite/static/less/service.less

@ -264,15 +264,24 @@ class FormBuilder(forms.Form):
if request.session.get(form_slug, False):
try:
form_instance = FormSubmission.objects.get(id=request.session.get(form_slug, False))
form_instance.form_data += form_data
form_instance.save()
# Удаляем сессию, если это последний шаг. Признак последнего шага
for data in form_data:
if data['name'] == 'clear_session':
request.session[form_slug] = None
form_instance = None
if data['name'] == 'end_session':
request.session['last-completed-form-id'] = form_instance.id
return
if form_instance:
form_instance.form_data += form_data
form_instance.save()
return
except (FormSubmission.DoesNotExist):
pass
form_instance = FormSubmission.objects.create(
plugin=self.form_definition.plugin_reference,
ip=get_ip(request),

@ -1,7 +1,8 @@
{% load cms_tags djangocms_forms_tags i18n sekizai_tags staticfiles %}
<script type="application/javascript">
var form = {
'id': {{ results.id }},
{% for item in results.form_data %}
{% if item.label %}
'{{ item.label }}'
@ -9,21 +10,33 @@ var form = {
'{{ item.name }}'
{% endif %}
: {
'size':
{% if item.value == True %}
1
{% elif item.value == False or item.value == None %}
0
{% else %}
{{ item.value|length }}
{% endif %}
,
'values': '{{ item.value }}',
'name': '{{ item.name }}'
'size':
{% if item.value == True %}
1
{% elif item.value == False or item.value == None %}
0
{% else %}
{{ item.value|length }}
{% endif %}
,
{% if item.type != 'checkbox_multiple' %}
'values': '{{ item.value }}',
{% else %}
'values': [
{% if item.value|length > 0 %}
{% for val in item.value %}
'{{ val }}',
{% endfor %}
{% endif %}
],
{% endif %}
'name': '{{ item.name }}'
},
{% endfor %}
};
</script>
<div class="forms" id="{{ instance.form_id }}">
{% if instance.title %}
<h3 class="title">{{ instance.title }}</h3>

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1000 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 707 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

@ -119,8 +119,11 @@
margin-bottom: 5px;
h5 {
h5, p {
margin-left: 10px;
}
h5 {
font-weight: 700;
}
@ -293,7 +296,7 @@
.make-row();
.headers {
.make-xs-column(5);
.make-xs-column(6);
ul {
li {
margin-bottom: 5px;
@ -308,7 +311,7 @@
.variants {
border-left: 2px solid #ccc;
.make-xs-column(7);
.make-xs-column(6);
}
@ -401,6 +404,11 @@
}
.trademarks-world-certs {
.result-paper {
width: 150px;
}
}
.patents-portfolio {

Loading…
Cancel
Save