master
fefa4ka 10 years ago
parent 80028817ae
commit add0b0b23f
  1. 2
      app/settings.py
  2. 3
      djangocms_forms/cms_plugins.py
  3. 1
      djangocms_forms/forms.py
  4. 3
      djangocms_forms/templates/djangocms_forms/form_template/default.html
  5. BIN
      media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-16/Logo-vitek_6cff33dd1a58c22e66e4e37cd720b7c89f2799a3.png
  6. BIN
      media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-16/Logo-vitek_a067bf99cc3d607f34880b7edcd755fbd85e81e4.png
  7. BIN
      media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-6/Logo-vitek_11cbc0a691a301b2f95d30fa8c19fc9516be7f84.png
  8. BIN
      media/djangocms_forms/poisk-i-proverka-tovarnogo-znaka-6/Logo-vitek_f7b0af8fc337db815804a02f0f30af5d572ca1b5.png
  9. BIN
      media/djangocms_forms/poisk-tovarnogo-znaka-6/Logo-vitek_63895441ed550a2829766251d7c07193953c1aab.png
  10. BIN
      media/djangocms_forms/registratsiia-tovarnogo-znaka-6/Logo-vitek_67c289417c084cc3be67e0ec2f577f520dd83665.png
  11. BIN
      media/djangocms_forms/registratsiia-tovarnogo-znaka-6/bbk_new_logo_gradient_5d45c4e43106f7ed9aa01717041600d0bca79327.jpg
  12. BIN
      media/djangocms_forms/registratsiia-tovarnogo-znaka-6/bbk_new_logo_gradient_a3a6dea2aa3250c956443e56013f33f84e384df4.jpg
  13. BIN
      media/filer_public/07/90/0790cec6-cee7-4b46-842f-d4ef29d665de/svidetelstvo-na-nmpt.jpg
  14. BIN
      media/filer_public/4b/fa/4bfadaed-10ad-4aa9-b6ce-52cf1170a231/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_vnesenie_izmenenii.jpg
  15. BIN
      media/filer_public/55/b6/55b619a4-6cd6-4068-8024-0df28a32c54f/rf_uvedomlenie_o_vnesenie_izmenenii.jpg
  16. BIN
      media/filer_public/7e/e0/7ee08b38-fe46-4b8f-a4b8-a383a433fe67/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_prodlenie_sroka_deistviia_iskliuchitelnogo_prava_na_tovarnyi_znak.jpg
  17. BIN
      media/filer_public/a3/0e/a30e5a0f-8056-4483-bef3-1602932a9876/poiski.pdf
  18. BIN
      media/filer_public_thumbnails/filer_public/07/90/0790cec6-cee7-4b46-842f-d4ef29d665de/svidetelstvo-na-nmpt.jpg__16x16_q85_crop_subsampling-2_upscale.jpg
  19. BIN
      media/filer_public_thumbnails/filer_public/07/90/0790cec6-cee7-4b46-842f-d4ef29d665de/svidetelstvo-na-nmpt.jpg__250x350_q85_crop_subsampling-2_upscale.jpg
  20. BIN
      media/filer_public_thumbnails/filer_public/07/90/0790cec6-cee7-4b46-842f-d4ef29d665de/svidetelstvo-na-nmpt.jpg__32x32_q85_crop_subsampling-2_upscale.jpg
  21. BIN
      media/filer_public_thumbnails/filer_public/07/90/0790cec6-cee7-4b46-842f-d4ef29d665de/svidetelstvo-na-nmpt.jpg__48x48_q85_crop_subsampling-2_upscale.jpg
  22. BIN
      media/filer_public_thumbnails/filer_public/07/90/0790cec6-cee7-4b46-842f-d4ef29d665de/svidetelstvo-na-nmpt.jpg__64x64_q85_crop_subsampling-2_upscale.jpg
  23. BIN
      media/filer_public_thumbnails/filer_public/4b/fa/4bfadaed-10ad-4aa9-b6ce-52cf1170a231/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_vnesenie_izmenenii.jpg__16x16_q85_crop_subsampling-2_upscale.jpg
  24. BIN
      media/filer_public_thumbnails/filer_public/4b/fa/4bfadaed-10ad-4aa9-b6ce-52cf1170a231/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_vnesenie_izmenenii.jpg__250x353_q85_crop_subsampling-2_upscale.jpg
  25. BIN
      media/filer_public_thumbnails/filer_public/4b/fa/4bfadaed-10ad-4aa9-b6ce-52cf1170a231/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_vnesenie_izmenenii.jpg__32x32_q85_crop_subsampling-2_upscale.jpg
  26. BIN
      media/filer_public_thumbnails/filer_public/4b/fa/4bfadaed-10ad-4aa9-b6ce-52cf1170a231/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_vnesenie_izmenenii.jpg__48x48_q85_crop_subsampling-2_upscale.jpg
  27. BIN
      media/filer_public_thumbnails/filer_public/4b/fa/4bfadaed-10ad-4aa9-b6ce-52cf1170a231/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_vnesenie_izmenenii.jpg__64x64_q85_crop_subsampling-2_upscale.jpg
  28. BIN
      media/filer_public_thumbnails/filer_public/55/b6/55b619a4-6cd6-4068-8024-0df28a32c54f/rf_uvedomlenie_o_vnesenie_izmenenii.jpg__1651x2335_q85_crop_subsampling-2_upscale.jpg
  29. BIN
      media/filer_public_thumbnails/filer_public/55/b6/55b619a4-6cd6-4068-8024-0df28a32c54f/rf_uvedomlenie_o_vnesenie_izmenenii.jpg__16x16_q85_crop_subsampling-2_upscale.jpg
  30. BIN
      media/filer_public_thumbnails/filer_public/55/b6/55b619a4-6cd6-4068-8024-0df28a32c54f/rf_uvedomlenie_o_vnesenie_izmenenii.jpg__250x353_q85_crop_subsampling-2_upscale.jpg
  31. BIN
      media/filer_public_thumbnails/filer_public/55/b6/55b619a4-6cd6-4068-8024-0df28a32c54f/rf_uvedomlenie_o_vnesenie_izmenenii.jpg__32x32_q85_crop_subsampling-2_upscale.jpg
  32. BIN
      media/filer_public_thumbnails/filer_public/55/b6/55b619a4-6cd6-4068-8024-0df28a32c54f/rf_uvedomlenie_o_vnesenie_izmenenii.jpg__48x48_q85_crop_subsampling-2_upscale.jpg
  33. BIN
      media/filer_public_thumbnails/filer_public/55/b6/55b619a4-6cd6-4068-8024-0df28a32c54f/rf_uvedomlenie_o_vnesenie_izmenenii.jpg__64x64_q85_crop_subsampling-2_upscale.jpg
  34. BIN
      media/filer_public_thumbnails/filer_public/7e/e0/7ee08b38-fe46-4b8f-a4b8-a383a433fe67/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_prodlenie_sroka_deistviia_iskliuchitelnogo_prava_na_tovarnyi_znak.jpg__16x16_q85_crop_subsampling-2_upscale.jpg
  35. BIN
      media/filer_public_thumbnails/filer_public/7e/e0/7ee08b38-fe46-4b8f-a4b8-a383a433fe67/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_prodlenie_sroka_deistviia_iskliuchitelnogo_prava_na_tovarnyi_znak.jpg__250x353_q85_crop_subsampling-2_upscale.jpg
  36. BIN
      media/filer_public_thumbnails/filer_public/7e/e0/7ee08b38-fe46-4b8f-a4b8-a383a433fe67/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_prodlenie_sroka_deistviia_iskliuchitelnogo_prava_na_tovarnyi_znak.jpg__32x32_q85_crop_subsampling-2_upscale.jpg
  37. BIN
      media/filer_public_thumbnails/filer_public/7e/e0/7ee08b38-fe46-4b8f-a4b8-a383a433fe67/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_prodlenie_sroka_deistviia_iskliuchitelnogo_prava_na_tovarnyi_znak.jpg__48x48_q85_crop_subsampling-2_upscale.jpg
  38. BIN
      media/filer_public_thumbnails/filer_public/7e/e0/7ee08b38-fe46-4b8f-a4b8-a383a433fe67/rf_prilozhenie_k_svidetelsvu_na_tovarnyi_znak_prodlenie_sroka_deistviia_iskliuchitelnogo_prava_na_tovarnyi_znak.jpg__64x64_q85_crop_subsampling-2_upscale.jpg
  39. 3
      zsite/static/less/main.less
  40. 33
      zsite/static/less/service.less
  41. 22
      zsite/templates/form_template/product_class.html

@ -245,7 +245,7 @@ INSTALLED_APPS = (
'blog',
'aldryn_bootstrap3',
'debug_toolbar',
# 'debug_toolbar',
'djangocms_forms',
'smartsnippets',
)

@ -106,6 +106,7 @@ class FormPlugin(CMSPluginBase):
form_slug = "form-%d" % instance.plugin_reference.id
submission_instance = instance
if request.session.get(form_slug, False):
try:
submission_instance = FormSubmission.objects.get(id=request.session.get(form_slug, False))
@ -121,7 +122,7 @@ class FormPlugin(CMSPluginBase):
'form': form,
'results': submission_instance
})
return context

@ -268,7 +268,6 @@ class FormBuilder(forms.Form):
# Удаляем сессию, если это последний шаг. Признак последнего шага
for data in form_data:
if data['name'] == 'end_session':
request.session[form_slug] = None
request.session['last-completed-form-id'] = form_instance.id
return
except (FormSubmission.DoesNotExist):

@ -1,6 +1,7 @@
{% 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 }}'
@ -11,7 +12,7 @@ var form = {
'size':
{% if item.value == True %}
1
{% elif item.value == False %}
{% elif item.value == False or item.value == None %}
0
{% else %}
{{ item.value|length }}

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

@ -68,6 +68,9 @@
font-weight: 500;
}
.field-wrapper label {
display: inline;
}
[type="checkbox"]:not(:checked),
[type="checkbox"]:checked {

@ -320,6 +320,39 @@
}
}
#trademark-info {
position: absolute;
padding-top: 121px;
#trademark-id {
font-size: 10px;
left: 115px;
position: relative;
}
#trademark-image {
width: 120px;
left: 66px;
position: relative;
}
#trademark-name {
text-align: center;
width: 250px;
}
}
.result-paper {
width: 250px;
background-color: #fff;
-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
}
.patents-portfolio {
margin-top: 55px;

@ -8,7 +8,18 @@ var form = {
{% else %}
'{{ item.name }}'
{% endif %}
: '{{ item.value|friendly|default_if_none:'—' }}',
: {
'size':
{% if item.value == True %}
1
{% elif item.value == False or item.value == None %}
0
{% else %}
{{ item.value|length }}
{% endif %}
,
'values': '{{ item.value }}'
},
{% endfor %}
};
</script>
@ -120,11 +131,18 @@ var form = {
scope = angular.element($('.bill')).scope();
if(count == 0) {
count = 1;
if(scope.classes > 0) {
count = scope.classes;
} else {
count = 1;
}
}
scope.$apply(function () {
scope.classes = count;
if(scope.classes > 5) {
scope.extra_classes = scope.classes - 5;
}
});
};
});

Loading…
Cancel
Save