mitri4
/
batiskaf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

Browse Source
remotes/origin/artem
Gena 11 years ago
parent d938b5edc6
commit a72803a77c
4 changed files with 355 additions and 314 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      batiskaf/jinja2.py
  2. 362
      batiskaf/templates/jinja2/base.jinja
  3. 7
      main/views.py
  4. BIN
      static/favicon.ico

2
batiskaf/jinja2.py
Unescape View File

@ -4,6 +4,7 @@ from batiskaf.jinja2_ext.thumbnails import thumbnail
from batiskaf.jinja2_ext.cart import cart from batiskaf.jinja2_ext.cart import cart
from batiskaf.jinja2_ext.html_filters import * from batiskaf.jinja2_ext.html_filters import *
from jinja2 import Environment from jinja2 import Environment
from store.models import Category
def environment(**options): def environment(**options):
@ -11,6 +12,7 @@ def environment(**options):
env.globals.update({ env.globals.update({
'static': staticfiles_storage.url, 'static': staticfiles_storage.url,
'url': reverse, 'url': reverse,
'main_categories': Category.objects.filter(parent__isnull=True).order_by('pk'),
}) })
env.filters['linebreaks'] = linebreaks env.filters['linebreaks'] = linebreaks
env.filters['thumbnail'] = thumbnail env.filters['thumbnail'] = thumbnail

362
batiskaf/templates/jinja2/base.jinja
Unescape View File

@ -6,9 +6,9 @@
<!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
<title>{% block title %}Батискаф{% endblock %}</title> <title>{% block title %}Батискаф{% endblock %}</title>
<meta name="description" content="{% block meta_description %}{% endblock %}"> <meta name="description" content="{% block meta_description %}{% endblock %}">
<meta name="author" content="Sitio"> <meta name="author" content="Sitio.kz">
<link href='/static/favicon.ico?v=1' type='image/x-icon' rel='shortcut icon'/>
<!-- Bootstrap -->
<link href="/static/bower_components/Bootflat/css/bootstrap.min.css" rel="stylesheet"> <link href="/static/bower_components/Bootflat/css/bootstrap.min.css" rel="stylesheet">
<link href="/static/bower_components/Bootflat/bootflat/css/bootflat.min.css" rel="stylesheet"> <link href="/static/bower_components/Bootflat/bootflat/css/bootflat.min.css" rel="stylesheet">
@ -23,37 +23,46 @@
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> <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> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]--> <![endif]-->
</head> </head>
<body> <body>
<!-- Yandex.Metrika counter --> <!-- Yandex.Metrika counter -->
<script type="text/javascript"> <script type="text/javascript">
(function (d, w, c) { (function (d, w, c) {
(w[c] = w[c] || []).push(function() { (w[c] = w[c] || []).push(function () {
try { try {
w.yaCounter30685703 = new Ya.Metrika({id:30685703, w.yaCounter30685703 = new Ya.Metrika({
webvisor:true, id: 30685703,
clickmap:true, webvisor: true,
trackLinks:true, clickmap: true,
accurateTrackBounce:true}); trackLinks: true,
} catch(e) { } accurateTrackBounce: true
});
} catch (e) {
}
}); });
var n = d.getElementsByTagName("script")[0], var n = d.getElementsByTagName("script")[0],
s = d.createElement("script"), s = d.createElement("script"),
f = function () { n.parentNode.insertBefore(s, n); }; f = function () {
n.parentNode.insertBefore(s, n);
};
s.type = "text/javascript"; s.type = "text/javascript";
s.async = true; s.async = true;
s.src = (d.location.protocol == "https:" ? "https:" : "http:") + "//mc.yandex.ru/metrika/watch.js"; s.src = (d.location.protocol == "https:" ? "https:" : "http:") + "//mc.yandex.ru/metrika/watch.js";
if (w.opera == "[object Opera]") { if (w.opera == "[object Opera]") {
d.addEventListener("DOMContentLoaded", f, false); d.addEventListener("DOMContentLoaded", f, false);
} else { f(); } } else {
f();
}
})(document, window, "yandex_metrika_callbacks"); })(document, window, "yandex_metrika_callbacks");
</script> </script>
<noscript><div><img src="//mc.yandex.ru/watch/30685703" style="position:absolute; left:-9999px;" alt="" /></div></noscript> <noscript>
<!-- /Yandex.Metrika counter --> <div><img src="//mc.yandex.ru/watch/30685703" style="position:absolute; left:-9999px;" alt=""/></div>
</noscript>
<!-- /Yandex.Metrika counter -->
<div class="container-fluid header-top"> <div class="container-fluid header-top">
<div class="container"> <div class="container">
@ -61,14 +70,15 @@
href="#">Контакты</a></div> href="#">Контакты</a></div>
<div class="top-right-links"><span class="yellow">+7 (777) 163-14-34</span> | <div class="top-right-links"><span class="yellow">+7 (777) 163-14-34</span> |
<span class="yellow">+7 (775) 859-12-17</span> | <span class="yellow">+7 (775) 859-12-17</span> |
<a href="mailto:admin@batiskaf.kz">Написать нам</a> | <a href="skype:gurpun_u-ka1?chat"><img src="/static/img/skype.png" alt="" width="20" height="20"/></a> <a href="mailto:admin@batiskaf.kz">Написать нам</a> | <a href="skype:gurpun_u-ka1?chat"><img
src="/static/img/skype.png" alt="" width="20" height="20"/></a>
</div> </div>
</div> </div>
</div> </div>
<div class="container-fluid header-middle"> <div class="container-fluid header-middle">
<div class="container"> <div class="container">
<div class="logo-container"> <div class="logo-container">
<a href="/"><img src="/static/img/logo.png" alt="" width="457" height="104"/></a> <a href="/"><img src="/static/img/logo.png" alt="" width="457" height="104"/></a>
@ -86,9 +96,9 @@
href="#">Оформление заказа</a> | <a href="#">Войти</a></p> href="#">Оформление заказа</a> | <a href="#">Войти</a></p>
</div> </div>
</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="navbar navbar-inverse yamm navbar-static-top">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
@ -96,160 +106,186 @@
</div> </div>
<div> <div>
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% for category in main_categories %}
<li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Подводная <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown"
охота</a> class="dropdown-toggle">{{ category.title }}</a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li>
<div class="yamm-content"> <div class="yamm-content">
<div class="row"> <div class="row">
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3"> {% for child in category.childs.all() %}
<ul> <ul>
<li><a class="title" href="/store/spearfishing/spearguns/">Ружья</a> <li><a class="title" href="{{ child.get_absolute_url() }}">{{ child.title }}</a>
</li> </li>
<li><a href="#">Пневматика</a></li> {% for child2 in child.childs.all() %}
<li><a href="/store/spearfishing/spearguns/arbalets/">Арбалеты</a></li> <li><a href="{{ child2.get_absolute_url() }}">{{ child2.title }}</a></li>
<li><a href="#">Карбоновые арбалеты</a></li> {% endfor %}
</ul>
<ul>
<li><a class="title" href="#">Аксессуары к ружьям</a></li>
<li><a href="#">Гарпуны</a></li>
<li><a href="#">Наконечники</a></li>
<li><a href="#">Катушки</a></li>
<li><a href="#">Линь</a></li>
<li><a href="#">Амортизаторы</a></li>
<li><a href="#">Заряжалки</a></li>
<li><a href="#">Запчасти</a></li>
<li><a href="#">Тяжи и зацепы</a></li>
<li><a href="#">Прочее</a></li>
</ul>
</div>
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
<ul>
<li><a class="title" href="#">Неопрен</a></li>
<li><a href="#">Гидрокостюмы</a></li>
<li><a href="#">Перчатки</a></li>
<li><a href="#">Носки</a></li>
</ul>
<ul>
<li><a class="title" href="#">Экипировка</a></li>
<li><a href="#">Маски</a></li>
<li><a href="#">Ласты</a></li>
<li><a href="#">Трубки</a></li>
<li><a href="#">Куканы</a></li>
<li><a href="#">Сумки</a></li>
</ul>
</div>
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
<ul>
<li><a class="title" href="#">Грузовые системы</a></li>
<li><a href="#">Ремни</a></li>
<li><a href="#">Грузы</a></li>
<li><a href="#">Жилеты</a></li>
</ul>
<ul>
<li><a class="title" href="#">Приборы</a></li>
<li><a href="#">Компьютеры</a></li>
<li><a href="#">Компасы</a></li>
</ul>
</div>
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">
<ul>
<li><a class="title" href="#">Фонари</a></li>
<li><a href="#">На батарейках</a></li>
<li><a href="#">Аккумуляторные</a></li>
</ul>
<ul>
<li><a class="title" href="#">Безопасность</a></li>
<li><a href="#">Ножи</a></li>
<li><a href="#">Буи, плотики</a></li>
</ul>
</div>
</div>
</div>
</li>
</ul>
</li>
<li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Дайвинг</a>
<ul class="dropdown-menu">
<li>
<div class="yamm-content">
</div>
</li>
</ul>
</li>
<li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown"
class="dropdown-toggle">Фридайвинг</a>
<ul class="dropdown-menu">
<li>
<div class="yamm-content">
</div>
</li>
</ul>
</li>
<li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Отдых на
воде</a>
<ul class="dropdown-menu">
<li>
<div class="yamm-content">
</div>
</li>
</ul> </ul>
</li> {% endfor %}
<li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown"
class="dropdown-toggle">Распродажа</a>
<ul class="dropdown-menu">
<li>
<div class="yamm-content">
</div>
</li>
</ul>
</li>
<li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Детям</a>
<ul class="dropdown-menu">
<li>
<div class="yamm-content">
</div> </div>
</li>
</ul>
</li>
<li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Для
бассейна</a>
<ul class="dropdown-menu">
<li>
<div class="yamm-content">
</div> </div>
</li> </li>
</ul> </ul>
</li> </li>
<li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Подарочный {% endfor %}
сертификат</a>
<ul class="dropdown-menu">
<li>
<div class="yamm-content">
</div> {# <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Подводная#}
</li> {# охота</a>#}
</ul> {# <ul class="dropdown-menu">#}
</li> {# <li>#}
{# <div class="yamm-content">#}
{# <div class="row">#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <ul>#}
{# <li><a class="title" href="/store/spearfishing/spearguns/">Ружья</a>#}
{# </li>#}
{# <li><a href="#">Пневматика</a></li>#}
{# <li><a href="/store/spearfishing/spearguns/arbalets/">Арбалеты</a></li>#}
{# <li><a href="#">Карбоновые арбалеты</a></li>#}
{# </ul>#}
{# <ul>#}
{# <li><a class="title" href="#">Аксессуары к ружьям</a></li>#}
{# <li><a href="#">Гарпуны</a></li>#}
{# <li><a href="#">Наконечники</a></li>#}
{# <li><a href="#">Катушки</a></li>#}
{# <li><a href="#">Линь</a></li>#}
{# <li><a href="#">Амортизаторы</a></li>#}
{# <li><a href="#">Заряжалки</a></li>#}
{# <li><a href="#">Запчасти</a></li>#}
{# <li><a href="#">Тяжи и зацепы</a></li>#}
{# <li><a href="#">Прочее</a></li>#}
{# </ul>#}
{# </div>#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <ul>#}
{# <li><a class="title" href="#">Неопрен</a></li>#}
{# <li><a href="#">Гидрокостюмы</a></li>#}
{# <li><a href="#">Перчатки</a></li>#}
{# <li><a href="#">Носки</a></li>#}
{# </ul>#}
{# <ul>#}
{# <li><a class="title" href="#">Экипировка</a></li>#}
{# <li><a href="#">Маски</a></li>#}
{# <li><a href="#">Ласты</a></li>#}
{# <li><a href="#">Трубки</a></li>#}
{# <li><a href="#">Куканы</a></li>#}
{# <li><a href="#">Сумки</a></li>#}
{# </ul>#}
{# </div>#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <ul>#}
{# <li><a class="title" href="#">Грузовые системы</a></li>#}
{# <li><a href="#">Ремни</a></li>#}
{# <li><a href="#">Грузы</a></li>#}
{# <li><a href="#">Жилеты</a></li>#}
{# </ul>#}
{# <ul>#}
{# <li><a class="title" href="#">Приборы</a></li>#}
{# <li><a href="#">Компьютеры</a></li>#}
{# <li><a href="#">Компасы</a></li>#}
{# </ul>#}
{# </div>#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <ul>#}
{# <li><a class="title" href="#">Фонари</a></li>#}
{# <li><a href="#">На батарейках</a></li>#}
{# <li><a href="#">Аккумуляторные</a></li>#}
{# </ul>#}
{# <ul>#}
{# <li><a class="title" href="#">Безопасность</a></li>#}
{# <li><a href="#">Ножи</a></li>#}
{# <li><a href="#">Буи, плотики</a></li>#}
{# </ul>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </li>#}
{# </ul>#}
{# </li>#}
{# <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Дайвинг</a>#}
{# <ul class="dropdown-menu">#}
{# <li>#}
{# <div class="yamm-content">#}
{##}
{# </div>#}
{# </li>#}
{# </ul>#}
{# </li>#}
{# <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown"#}
{# class="dropdown-toggle">Фридайвинг</a>#}
{# <ul class="dropdown-menu">#}
{# <li>#}
{# <div class="yamm-content">#}
{##}
{# </div>#}
{# </li>#}
{# </ul>#}
{# </li>#}
{# <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Отдых на#}
{# воде</a>#}
{# <ul class="dropdown-menu">#}
{# <li>#}
{# <div class="yamm-content">#}
{##}
{# </div>#}
{# </li>#}
{# </ul>#}
{# </li>#}
{# <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown"#}
{# class="dropdown-toggle">Распродажа</a>#}
{# <ul class="dropdown-menu">#}
{# <li>#}
{# <div class="yamm-content">#}
{##}
{# </div>#}
{# </li>#}
{# </ul>#}
{# </li>#}
{# <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Детям</a>#}
{# <ul class="dropdown-menu">#}
{# <li>#}
{# <div class="yamm-content">#}
{##}
{# </div>#}
{# </li>#}
{# </ul>#}
{# </li>#}
{# <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Для#}
{# бассейна</a>#}
{# <ul class="dropdown-menu">#}
{# <li>#}
{# <div class="yamm-content">#}
{##}
{# </div>#}
{# </li>#}
{# </ul>#}
{# </li>#}
{# <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Подарочный#}
{# сертификат</a>#}
{# <ul class="dropdown-menu">#}
{# <li>#}
{# <div class="yamm-content">#}
{##}
{# </div>#}
{# </li>#}
{# </ul>#}
{# </li>#}
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="container main-container"> <div class="container main-container">
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</div> </div>
<footer class="footer"> <footer class="footer">
<div class="container-fluid footer-top"> <div class="container-fluid footer-top">
</div> </div>
<div class="container-fluid footer-bottom"> <div class="container-fluid footer-bottom">
@ -322,15 +358,15 @@
</p> </p>
</div> </div>
</div> </div>
</footer> </footer>
{% if request._messages %} {% if request._messages %}
<ul class="messages"> <ul class="messages">
{% for message in request._messages %} {% for message in request._messages %}
<li{% if message.tags %} data-type="{{ message.tags }}"{% endif %}>{{ message|safe }}</li> <li{% if message.tags %} data-type="{{ message.tags }}"{% endif %}>{{ message|safe }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endif %} {% endif %}
{% block footer_scripts %} {% block footer_scripts %}
<script src="/static/bower_components/jquery/dist/jquery.min.js"></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/bootstrap/dist/js/bootstrap.min.js"></script>
<script src="/static/bower_components/Bootflat/bootflat/js/icheck.min.js"></script> <script src="/static/bower_components/Bootflat/bootflat/js/icheck.min.js"></script>
@ -342,14 +378,14 @@
<script src="/static/js/jquery.elevateZoom-3.0.8.min.js"></script> <script src="/static/js/jquery.elevateZoom-3.0.8.min.js"></script>
<script src="/static/js/Selecter/jquery.fs.selecter.min.js"></script> <script src="/static/js/Selecter/jquery.fs.selecter.min.js"></script>
<script src="/static/js/_.js?v=2"></script> <script src="/static/js/_.js?v=2"></script>
{% endblock footer_scripts %} {% endblock footer_scripts %}
{% block jss %}{% endblock jss %} {% block jss %}{% endblock jss %}
{% if messages %} {% if messages %}
<script> <script>
{% for message in messages %} {% for message in messages %}
swal("", "{{ message }}", "{{ message.tags|default('success') }}"); swal("", "{{ message }}", "{{ message.tags|default('success') }}");
{% endfor %} {% endfor %}
</script> </script>
{% endif %} {% endif %}
</body> </body>
</html> </html>

7
main/views.py
Unescape View File

@ -1,6 +1,9 @@
from django.shortcuts import render from django.shortcuts import render
from store.models import Product from store.models import Product, Category
def index(request): def index(request):
c = dict(products=Product.objects.order_by('-pk')[:8]) c = dict(
products=Product.objects.order_by('-pk')[:8],
)
return render(request, 'index.jinja', c) return render(request, 'index.jinja', c)

BIN
static/favicon.ico
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

Write Preview
Loading…
Cancel
Save