calculator - ts register

11 years ago · 80028817ae
parent 9210795a33
commit 80028817ae
13 changed files with 82 additions and 1 deletions
--- 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',
    },
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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) {
 })
 ;
--- a/zsite/static/js/snippets.js
+++ 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;
 };
--- 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;
 }
--- a/zsite/templates/base.html
+++ b/zsite/templates/base.html
@ -13,7 +13,7 @@
        {% render_block "css" %}
    </head>
-    <body>
+    <body ng-controller="MainCtrl">
        {% cms_toolbar %}            
        <div class="container">
--- a/zsite/templates/form_template/product_class.html
+++ b/zsite/templates/form_template/product_class.html
@ -55,10 +55,33 @@ var form = {
                </div>
            </div>
            {% for field in form.visible_fields %}
                {% if not field|is_checkboxselectmultiple %}
                    <div class="field-wrapper {{ field|input_class }} {{ field.css_classes }}">
                        <div class="field-errors" style="display:none;"></div>
                        {% if field|is_checkbox %}
                            {{ field }}
                        {% endif %}
                        <label for="{{ field.id_for_label }}">
                            {{ field.label }}
                        </label>
                        {% if field|is_textarea %}
                            <div id="help-text-{{ field.auto_id }}" class="help-text">{{ field.help_text|safe }}</div>
                        {% endif %}
                        {% if not field|is_checkbox %}
                            <p>{{ field }}</p>
                        {% endif %}
                        {% if not field|is_textarea and field.help_text %}
                            <div id="help-text-{{ field.auto_id }}" class="help-text">{{ field.help_text|safe }}</div>
                        {% endif %}
                    </div>
                {% endif %}
            {% endfor %}
            {% csrf_token %}
            {% for hidden in form.hidden_fields %}
                {{ hidden }}
            {% endfor %}