auto

11 years ago · 6f1550bc50
parent 031b85bdbd
commit 6f1550bc50
3 changed files with 332 additions and 287 deletions
--- a/batiskaf/settings.py
+++ b/batiskaf/settings.py
@ -248,8 +248,11 @@ CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
 CELERY_SEND_TASK_ERROR_EMAILS = True

 if DEBUG:
-    EMAIL_BACKEND = 'main.backends.email_backends.EmailBackend'
-    EMAIL_FILE_PATH = 'tmp/eml/'
+    EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+    # EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
+    # EMAIL_FILE_PATH = '/tmp/app-messages'
+    # EMAIL_BACKEND = 'main.backends.email_backends.EmailBackend'
+    # EMAIL_FILE_PATH = 'tmp/eml/'

 GRAPPELLI_ADMIN_TITLE = 'Батискаф'
 GRAPPELLI_SWITCH_USER = True
--- a/batiskaf/templates/jinja2/base.jinja
+++ b/batiskaf/templates/jinja2/base.jinja
@ -34,11 +34,11 @@
      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
      <![endif]-->
-</head>
-<body>
+  </head>
+  <body>


-<div class="container-fluid header-top">
+    <div class="container-fluid header-top">
        <div class="container">
            <div class="top-left-links"><a href="/news/">Новости</a> | <a href="/payment/">Оплата</a> | <a
                href="/delivery/">Доставка</a> | <a
@ -58,8 +58,8 @@

                    </div>
                </div>
-</div>
-<div class="container-fluid header-middle">
+            </div>
+            <div class="container-fluid header-middle">
                <div class="container">
                    <div class="logo-container">
                        <a href="/"><img src="/static/img/logo.png" alt="Батискаф-Казахстан" title="Батискаф-Казахстан" width="457"
@ -89,9 +89,9 @@
                        </p>
                    </div>
                </div>
-</div>
+            </div>

-<div class="container-fluid navbar-container" id="shop-categories" data-spy="affix" data-offset-top="170">
+            <div class="container-fluid navbar-container" id="shop-categories" data-spy="affix" data-offset-top="170">
                <div class="navbar navbar-inverse yamm navbar-static-top">
                    <div class="container">
                        <div class="navbar-header">
@ -147,13 +147,13 @@
                    </div>
                </div>
            </div>
-</div>
-<div class="container main-container">
+        </div>
+        <div class="container main-container">
            {% block content %}

            {% endblock %}
-</div>
-<footer class="footer">
+        </div>
+        <footer class="footer">
            <div class="container-fluid footer-top">
            </div>
            <div class="container-fluid footer-bottom">
@ -285,13 +285,13 @@
                            </noscript>
                            <!-- /Yandex.Metrika counter -->
                            <!-- ZERO.kz -->
-<span id="_zero_64378">
-<noscript>
+                            <span id="_zero_64378">
+                                <noscript>
                                    <a href="http://zero.kz/?s=64378" target="_blank">
                                        <img src="http://c.zero.kz/z.png?u=64378" width="88" height="31" alt="ZERO.kz"/>
                                    </a>
-</noscript>
-</span>
+                                </noscript>
+                            </span>

                            <script type="text/javascript"><!--
                                var _zero_kz_ = _zero_kz_ || [];
@ -316,6 +316,17 @@
                border=0 height=31 width=88
                alt='Дайвинг - рейтинг DIVEtop'></a>
                <!--/COUNTER-->
+                <!--LiveInternet counter--><script type="text/javascript"><!--
+                document.write("<a href='//www.liveinternet.ru/click' "+
+                    "target=_blank><img src='//counter.yadro.ru/hit?t16.6;r"+
+                    escape(document.referrer)+((typeof(screen)=="undefined")?"":
+                        ";s"+screen.width+"*"+screen.height+"*"+(screen.colorDepth?
+                            screen.colorDepth:screen.pixelDepth))+";u"+escape(document.URL)+
+                    ";"+Math.random()+
+                    "' alt='' title='LiveInternet: показано число просмотров за 24"+
+                    " часа, посетителей за 24 часа и за сегодня' "+
+                    "border='0' width='88' height='31'><\/a>")
+                    //--></script><!--/LiveInternet-->
                </div>
            </div>

@ -323,11 +334,11 @@
    </div>
 </footer>
 {% if request._messages %}
-    <ul class="messages">
+<ul class="messages">
    {% for message in request._messages %}
    <li{% if message.tags %} data-type="{{ message.tags }}"{% endif %}>{{ message|safe }}</li>
    {% endfor %}
-    </ul>
+</ul>
 {% endif %}
 <form action="/" id="call-form" class="form mfp-hide call-form" method="post">
    <h3>Заказать бесплатный звонок</h3>
@ -398,28 +409,28 @@
  </div>
 </form>
 {% block footer_scripts %}
-    <script src="/static/bower_components/jquery/dist/jquery.min.js"></script>
-    <script src="/static/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
-    <script src="/static/bower_components/Bootflat/bootflat/js/jquery.fs.stepper.min.js"></script>
-    <script src="/static/bower_components/sweetalert/lib/sweet-alert.min.js"></script>
-    <script src="/static/js/jquery.ba-bbq.min.js"></script>
-    <script src="/static/js/jquery.elevateZoom-3.0.8.min.js"></script>
-    <script src="/static/js/select2.min.js"></script>
-    <script src="/static/js/mp/dist/jquery.magnific-popup.min.js"></script>
-    <script src="/static/js/formstone/js/core.js"></script>
-    <script src="/static/js/formstone/js/touch.js"></script>
-    <script src="/static/js/formstone/js/dropdown.js"></script>
-    <script src="/static/star-rating/jquery.rating.pack.js"></script>
-    <script src="/static/js/_.js?v=10"></script>
+<script src="/static/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="/static/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="/static/bower_components/Bootflat/bootflat/js/jquery.fs.stepper.min.js"></script>
+<script src="/static/bower_components/sweetalert/lib/sweet-alert.min.js"></script>
+<script src="/static/js/jquery.ba-bbq.min.js"></script>
+<script src="/static/js/jquery.elevateZoom-3.0.8.min.js"></script>
+<script src="/static/js/select2.min.js"></script>
+<script src="/static/js/mp/dist/jquery.magnific-popup.min.js"></script>
+<script src="/static/js/formstone/js/core.js"></script>
+<script src="/static/js/formstone/js/touch.js"></script>
+<script src="/static/js/formstone/js/dropdown.js"></script>
+<script src="/static/star-rating/jquery.rating.pack.js"></script>
+<script src="/static/js/_.js?v=10"></script>

 {% endblock footer_scripts %}
 {% block jss %}{% endblock jss %}
 {% if messages %}
-    <script>
+<script>
    {% for message in messages %}
    swal("", "{{ message }}", "{{ message.tags|default('success') }}");
    {% endfor %}
-    </script>
+</script>
 {% endif %}
 </body>
 </html>
--- a/requirements.txt
+++ b/requirements.txt
@ -0,0 +1,31 @@
+cffi==1.1.2
+cryptography==0.9.3
+Django==1.8.3
+django-extensions==1.5.5
+django-jinja==1.4.1
+django-jinja-bootstrap-form==4.0.3
+djangorestframework==3.1.3
+docopt==0.6.2
+easy-thumbnails==2.2
+idna==2.0
+jedi==0.9.0
+Jinja2==2.8
+kkb==0.6
+MarkupSafe==0.23
+pbr==1.3.0
+Pillow==2.9.0
+prompt-toolkit==0.42
+psycopg2==2.6.1
+ptpython==0.16
+pyasn1==0.1.8
+pycparser==2.14
+Pygments==2.0.2
+pyOpenSSL==0.15.1
+requests==2.7.0
+six==1.9.0
+stevedore==1.6.0
+virtualenv==13.1.0
+virtualenv-clone==0.2.6
+virtualenvwrapper==4.6.0
+wcwidth==0.1.4
+wheel==0.24.0