diff --git a/app/settings.py b/app/settings.py index 974bf0a..0e527e3 100644 --- a/app/settings.py +++ b/app/settings.py @@ -102,6 +102,7 @@ PIPELINE_JS = { 'js/app.js', 'js/forms.js', 'js/tabs.js', + 'js/snippets.js', ), 'output_filename': 'js/zuykov.js', }, diff --git a/media/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg b/media/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg new file mode 100644 index 0000000..38e0eb5 Binary files /dev/null and b/media/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__16x16_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__16x16_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..1d440ef Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__16x16_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__250x353_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__250x353_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..bf6b422 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__250x353_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__32x32_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__32x32_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..1b3048b Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__32x32_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__350x495_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__350x495_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..08ebe2d Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__350x495_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__48x48_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__48x48_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..766d021 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__48x48_q85_crop_subsampling-2_upscale.jpg differ diff --git a/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__64x64_q85_crop_subsampling-2_upscale.jpg b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__64x64_q85_crop_subsampling-2_upscale.jpg new file mode 100644 index 0000000..1655a96 Binary files /dev/null and b/media/filer_public_thumbnails/filer_public/ed/0a/ed0a4f6a-74c8-444f-aeb5-6d12e968ca71/svidetelstvo_na_tz_rossiia.jpg__64x64_q85_crop_subsampling-2_upscale.jpg differ diff --git a/zsite/static/js/app.js b/zsite/static/js/app.js index 433f9fb..e32d7ed 100644 --- a/zsite/static/js/app.js +++ b/zsite/static/js/app.js @@ -2,7 +2,35 @@ angular.module('zuykov', ['ui.bootstrap', 'tabs']); angular.module('zuykov') +.controller('MainCtrl', function ($scope, $log) { + $scope.GetNoun = function(number, one, two, five) { + number = Math.abs(number); + number %= 100; + if (number >= 5 && number <= 20) { + return five; + } + number %= 10; + if (number == 1) { + return one; + } + if (number >= 2 && number <= 4) { + return two; + } + return five; + }; + // GetNoun(6, 'яблоко', 'яблока', 'яблок') // Вернет «яблок» + + $scope.GetAdj = function(number, one, two) { + number %= 100; + if (number == 11) return two; + number %= 10; + if (number == 1) return one; + return two; + }; + // GetAdj(6,'свежее', 'свежих') // Вернет «свежих» + +}) .controller('TabsCtrl', function ($scope, $log) { }) ; \ No newline at end of file diff --git a/zsite/static/js/snippets.js b/zsite/static/js/snippets.js new file mode 100644 index 0000000..7ef8245 --- /dev/null +++ b/zsite/static/js/snippets.js @@ -0,0 +1,23 @@ +GetNoun = function(number, one, two, five) { + number = Math.abs(number); + number %= 100; + if (number >= 5 && number <= 20) { + return five; + } + number %= 10; + if (number == 1) { + return one; + } + if (number >= 2 && number <= 4) { + return two; + } + return five; +}; + +GetAdj = function(number, one, two) { + number %= 100; + if (number == 11) return two; + number %= 10; + if (number == 1) return one; + return two; +}; \ No newline at end of file diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less index 5195e0a..191bb17 100644 --- a/zsite/static/less/main.less +++ b/zsite/static/less/main.less @@ -66,4 +66,10 @@ font-family: 'Roboto Slab'; font-weight: 500; +} + + +[type="checkbox"]:not(:checked), +[type="checkbox"]:checked { + margin-right: 2px; } \ No newline at end of file diff --git a/zsite/templates/base.html b/zsite/templates/base.html index 1717ead..c5291b6 100644 --- a/zsite/templates/base.html +++ b/zsite/templates/base.html @@ -13,7 +13,7 @@ {% render_block "css" %} - + {% cms_toolbar %}
diff --git a/zsite/templates/form_template/product_class.html b/zsite/templates/form_template/product_class.html index 4b95406..a83e252 100644 --- a/zsite/templates/form_template/product_class.html +++ b/zsite/templates/form_template/product_class.html @@ -55,10 +55,33 @@ var form = {
+ {% for field in form.visible_fields %} + {% if not field|is_checkboxselectmultiple %} +
+ + {% if field|is_checkbox %} + {{ field }} + {% endif %} + + {% if field|is_textarea %} +
{{ field.help_text|safe }}
+ {% endif %} + {% if not field|is_checkbox %} +

{{ field }}

+ {% endif %} + {% if not field|is_textarea and field.help_text %} +
{{ field.help_text|safe }}
+ {% endif %} +
+ {% endif %} + {% endfor %} {% csrf_token %} + {% for hidden in form.hidden_fields %} {{ hidden }} {% endfor %}