remotes/origin/artem
Gena 11 years ago
parent 0024cd8e1e
commit c2d6886f4e
  1. 4
      batiskaf/templates/jinja2/base.jinja
  2. 2
      batiskaf/templates/jinja2/cart_detail.jinja
  3. 2
      batiskaf/templates/jinja2/category.jinja
  4. 233
      batiskaf/templates/jinja2/index.jinja
  5. 2
      batiskaf/templates/jinja2/news/detail.jinja
  6. 2
      batiskaf/templates/jinja2/news/list.jinja
  7. 4
      batiskaf/templates/jinja2/product.jinja
  8. 2
      batiskaf/templates/jinja2/size/beuchat.jinja
  9. 2
      batiskaf/templates/jinja2/size/omer_sporasub.jinja
  10. 2
      batiskaf/templates/jinja2/size/sargan.jinja
  11. 4
      batiskaf/templates/jinja2/size/scorpena.jinja

@ -82,7 +82,7 @@
<a href="mailto:admin@batiskaf-kz.kz"><span class="glyphicon glyphicon-envelope" <a href="mailto:admin@batiskaf-kz.kz"><span class="glyphicon glyphicon-envelope"
aria-hidden="true"></span> Написать нам</a> | <a aria-hidden="true"></span> Написать нам</a> | <a
href="skype:batiskaf_kz?chat"><img href="skype:batiskaf_kz?chat"><img
src="/static/img/skype.png" alt="" width="20" height="20"/></a> src="/static/img/skype.png" alt="Написать в Skype" title="Написать в Skype" width="20" height="20"/></a>
</div> </div>
@ -92,7 +92,7 @@
<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="Батискаф-Казахстан" title="Батискаф-Казахстан" width="457" height="104"/></a>
</div> </div>
<div class="quick-access-container"> <div class="quick-access-container">

@ -35,7 +35,7 @@
<td class="text-center table-cart-image"> <td class="text-center table-cart-image">
{% set im = item.item.product.main_image()|thumbnail("80x80") %} {% set im = item.item.product.main_image()|thumbnail("80x80") %}
<a href="{{ item.item.product.get_absolute_url() }}"><img src="/static/{{ im.url }}" <a href="{{ item.item.product.get_absolute_url() }}"><img src="/static/{{ im.url }}"
alt="" alt="{{ item.item.product.title }}" title="{{ item.item.product.title }}"
class="img-thumbnail"/></a> class="img-thumbnail"/></a>
</td> </td>
<td> <td>

@ -92,7 +92,7 @@
<div class="thumbnail"> <div class="thumbnail">
{% set im = product.main_image()|thumbnail("420x420") %} {% set im = product.main_image()|thumbnail("420x420") %}
<a href="{{ product.get_absolute_url() }}"><img src="/static/{{ im.url }}" <a href="{{ product.get_absolute_url() }}"><img src="/static/{{ im.url }}"
class="img-responsive"></a> class="img-responsive" alt="{{ product.title }}" title="{{ product.title }}"></a>
<div class="caption"> <div class="caption">
<div class="title"> <div class="title">

@ -6,55 +6,17 @@
<!-- Indicators --> <!-- Indicators -->
<ol class="carousel-indicators"> <ol class="carousel-indicators">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li> <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
{# <li data-target="#carousel-example-generic" data-slide-to="1"></li>#}
{# <li data-target="#carousel-example-generic" data-slide-to="2"></li>#}
{# <li data-target="#carousel-example-generic" data-slide-to="3"></li>#}
{# <li data-target="#carousel-example-generic" data-slide-to="4"></li>#}
{# <li data-target="#carousel-example-generic" data-slide-to="5"></li>#}
</ol> </ol>
<!-- Wrapper for slides --> <!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox"> <div class="carousel-inner" role="listbox">
<div class="item active"> <div class="item active">
<a href="/store/spearfishing/spearguns/pneumatic/product-ruzhe-pnevmovakuumnoe-salvimar-predathor-vuoto/"><img src="/static/img/Salvima1940.jpg" alt=""></a> <a href="/store/spearfishing/spearguns/pneumatic/product-ruzhe-pnevmovakuumnoe-salvimar-predathor-vuoto/"><img src="/static/img/Salvima1940.jpg" alt="Акция Salvimar" title="Акция Salvimar"></a>
<div class="carousel-caption"> <div class="carousel-caption">
</div> </div>
</div> </div>
{# <div class="item">#}
{# <img src="/static/img/banner2.jpg" alt="">#}
{##}
{# <div class="carousel-caption">#}
{# </div>#}
{# </div>#}
{##}
{# <div class="item">#}
{# <img src="/static/img/banner3.jpg" alt="">#}
{##}
{# <div class="carousel-caption">#}
{# </div>#}
{# </div>#}
{##}
{# <div class="item">#}
{# <img src="/static/img/banner4.jpg" alt="">#}
{##}
{# <div class="carousel-caption">#}
{# </div>#}
{# </div>#}
{##}
{# <div class="item">#}
{# <img src="/static/img/banner5.jpg" alt="">#}
{##}
{# <div class="carousel-caption">#}
{# </div>#}
{# </div>#}
{##}
{# <div class="item">#}
{# <img src="/static/img/banner6.jpg" alt="">#}
{##}
{# <div class="carousel-caption">#}
{# </div>#}
{# </div>#}
</div> </div>
<!-- Controls --> <!-- Controls -->
@ -77,7 +39,7 @@
<div class="thumbnail"> <div class="thumbnail">
{% set im = product.main_image()|thumbnail("420x420") %} {% set im = product.main_image()|thumbnail("420x420") %}
<a href="{{ product.get_absolute_url() }}"><img src="/static/{{ im.url }}" <a href="{{ product.get_absolute_url() }}"><img src="/static/{{ im.url }}"
class="img-responsive"></a> class="img-responsive" alt="{{ product.title }}" title="{{ product.title }}"></a>
<div class="caption"> <div class="caption">
<div class="title"> <div class="title">
@ -120,194 +82,7 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
{# <div class="row">#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <div class="thumbnail">#}
{# <a href="#"><img src="/static/img/shop1.jpg" alt=""></a>#}
{##}
{# <div class="caption">#}
{# <div class="title">#}
{# <a href="#">#}
{# Гидрокостюм <br/>STORM 3 мм женский, розовый#}
{# </a>#}
{# </div>#}
{# <div class="price">#}
{# 6 170,00 ₸#}
{# </div>#}
{# <div class="state-yes">#}
{# <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товар есть в наличии#}
{# </div>#}
{# <div class="in-cart">#}
{# <a class="cart-link" href="#"><span>Добавить в корзину <span#}
{# class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span></span></a>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <div class="thumbnail">#}
{# <a href="#"><img src="/static/img/shop2.jpg" alt=""></a>#}
{##}
{# <div class="caption">#}
{# <div class="title">#}
{# <a href="#">#}
{# Гидрокостюм TX2 BZ <br/>5 мм мужской, оранжевый#}
{# </a>#}
{# </div>#}
{# <div class="price">#}
{# 13 190,00 ₸#}
{# </div>#}
{# <div class="state-yes">#}
{# <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товар есть в наличии#}
{# </div>#}
{# <div class="in-cart">#}
{# <a class="cart-link" href="#"><span>Добавить в корзину <span#}
{# class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span></span></a>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <div class="thumbnail">#}
{# <a href="#"><img src="/static/img/shop3.jpg" alt=""></a>#}
{##}
{# <div class="caption">#}
{# <div class="title">#}
{# <a href="#">#}
{# Гидрокостюм <br/>SCORPENA A, 9 мм#}
{# </a>#}
{# </div>#}
{# <div class="price">#}
{# 9 000,00 ₸#}
{# </div>#}
{# <div class="state-yes">#}
{# <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товар есть в наличии#}
{# </div>#}
{# <div class="in-cart">#}
{# <a class="cart-link" href="#"><span>Добавить в корзину <span#}
{# class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span></span></a>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <div class="thumbnail">#}
{# <a href="#"><img src="/static/img/shop4.jpg" alt=""></a>#}
{##}
{# <div class="caption">#}
{# <div class="title">#}
{# <a href="#">#}
{# Гидрокостюм <br/>SCORPENA А, 7 мм#}
{# </a>#}
{# </div>#}
{# <div class="price">#}
{# 8 400,00 ₸#}
{# </div>#}
{# <div class="state-yes">#}
{# <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товар есть в наличии#}
{# </div>#}
{# <div class="in-cart">#}
{# <a class="cart-link" href="#"><span>Добавить в корзину <span#}
{# class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span></span></a>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="row">#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <div class="thumbnail">#}
{# <a href="#"><img src="/static/img/shop5.jpg" alt=""></a>#}
{##}
{# <div class="caption">#}
{# <div class="title">#}
{# <a href="#">#}
{# Ружье <br/>Marlin Oceania#}
{# </a>#}
{# </div>#}
{# <div class="price">#}
{# 19 425,00 ₸#}
{# </div>#}
{# <div class="state-yes">#}
{# <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товар есть в наличии#}
{# </div>#}
{# <div class="in-cart">#}
{# <a class="cart-link" href="#"><span>Добавить в корзину <span#}
{# class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span></span></a>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <div class="thumbnail">#}
{# <a href="#"><img src="/static/img/shop6.jpg" alt=""></a>#}
{##}
{# <div class="caption">#}
{# <div class="title">#}
{# <a href="#">#}
{# Экшн камера <br/>Polaroid Cube синяя#}
{# </a>#}
{# </div>#}
{# <div class="price">#}
{# 6 800,00 ₸#}
{# </div>#}
{# <div class="state-yes">#}
{# <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товар есть в наличии#}
{# </div>#}
{# <div class="in-cart">#}
{# <a class="cart-link" href="#"><span>Добавить в корзину <span#}
{# class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span></span></a>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <div class="thumbnail">#}
{# <a href="#"><img src="/static/img/shop7.jpg" alt=""></a>#}
{##}
{# <div class="caption">#}
{# <div class="title">#}
{# <a href="#">#}
{# Экшн камера <br/>Polaroid Cube красная#}
{# </a>#}
{# </div>#}
{# <div class="price">#}
{# 6 800,00 ₸#}
{# </div>#}
{# <div class="state-yes">#}
{# <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товар есть в наличии#}
{# </div>#}
{# <div class="in-cart">#}
{# <a class="cart-link" href="#"><span>Добавить в корзину <span#}
{# class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span></span></a>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3">#}
{# <div class="thumbnail">#}
{# <a href="#"><img src="/static/img/shop8.jpg" alt=""></a>#}
{##}
{# <div class="caption">#}
{# <div class="title">#}
{# <a href="#">#}
{# Гидрокостюм <br/>Marlin Prestige 5 мм#}
{# </a>#}
{# </div>#}
{# <div class="price">#}
{# 20 990,00 ₸#}
{# </div>#}
{# <div class="state-yes">#}
{# <span class="glyphicon glyphicon-ok-sign" aria-hidden="true"></span> Товар есть в наличии#}
{# </div>#}
{# <div class="in-cart">#}
{# <a class="cart-link" href="#"><span>Добавить в корзину <span#}
{# class="glyphicon glyphicon-shopping-cart" aria-hidden="true"></span></span></a>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
{# </div>#}
</div> </div>
<embed height="188" width="355" bgcolor="#ffffff" name="vishnu" src="http://iii.ru/static/Vishnu3.swf" wmode="transparent" flashvars="uuid=9a13ee03-be70-459d-b7d4-f3911cd9621f&disableRuOverride=1&home=7d5fe16c606e3884d1b1329a3cfd3dd4&skin_color=0xFFF8C1&vertical_layout=0" type="application/x-shockwave-flash" quality="high" style="position: fixed; bottom: 0; right: 0; z-index:4000"></embed> <embed height="188" width="355" bgcolor="#ffffff" name="vishnu" src="http://iii.ru/static/Vishnu3.swf" wmode="transparent" flashvars="uuid=9a13ee03-be70-459d-b7d4-f3911cd9621f&disableRuOverride=1&home=7d5fe16c606e3884d1b1329a3cfd3dd4&skin_color=0xFFF8C1&vertical_layout=0" type="application/x-shockwave-flash" quality="high" style="position: fixed; bottom: 0; right: 0; z-index:4000"></embed>

@ -26,7 +26,7 @@
<p class="text-center"> <p class="text-center">
{% set im = object.image %} {% set im = object.image %}
<img src="/static/{{ im.url }}" alt="" style="max-width: 100%" class=""/> <img src="/static/{{ im.url }}" alt="{{ object.title }}" title="{{ object.title }}" style="max-width: 100%" class=""/>
</p> </p>
{{ object.text|linebreaks|safe }} {{ object.text|linebreaks|safe }}

@ -35,7 +35,7 @@
</p> </p>
<p class="text-center"> <p class="text-center">
{% set im = object.image|thumbnail("400x400") %} {% set im = object.image|thumbnail("400x400") %}
<a href="{{ url('news_detail', args=(object.slug,)) }}"><img src="/static/{{ im.url }}" alt=""/></a> <a href="{{ url('news_detail', args=(object.slug,)) }}"><img src="/static/{{ im.url }}" alt="{{ object.title }}" title="{{ object.title }}"/></a>
</p> </p>
{{ object.text|truncate(520)|linebreaks|safe }} {{ object.text|truncate(520)|linebreaks|safe }}
<p class="text-right"><a href="{{ url('news_detail', args=(object.slug,)) }}">Продолжить читать &rarr;</a> <p class="text-right"><a href="{{ url('news_detail', args=(object.slug,)) }}">Продолжить читать &rarr;</a>

@ -20,14 +20,14 @@
{% set im = image.image|thumbnail("80x80") %} {% set im = image.image|thumbnail("80x80") %}
{% set im_big = image.image|thumbnail("398x398") %} {% set im_big = image.image|thumbnail("398x398") %}
<a href="/static/{{ im_big.url }}" data-big-url="/static/{{ image.image.url }}"><img <a href="/static/{{ im_big.url }}" data-big-url="/static/{{ image.image.url }}"><img
src="/static/{{ im.url }}" alt="" class="img-thumbnail"/></a> src="/static/{{ im.url }}" alt="{{ product.title }}" title="{{ product.title }}" class="img-thumbnail"/></a>
{% endfor %} {% endfor %}
</div> </div>
<div class="product-big-thumbnail col-xs-10"> <div class="product-big-thumbnail col-xs-10">
<div class="product-big-thumbnail-container"> <div class="product-big-thumbnail-container">
{% set im = product.main_image()|thumbnail("398x398") %} {% set im = product.main_image()|thumbnail("398x398") %}
<!-- <a href="/static/{{ product.main_image().url }}" id="product-big-image-url"> --> <!-- <a href="/static/{{ product.main_image().url }}" id="product-big-image-url"> -->
<img src="/static/{{ im.url }}" alt="" width="398" height="392" id='product-big-img' class="" <img src="/static/{{ im.url }}" alt="{{ product.title }}" title="{{ product.title }}" width="398" height="392" id='product-big-img' class=""
data-zoom-image='/static/{{ product.main_image().url }}'/> data-zoom-image='/static/{{ product.main_image().url }}'/>
<!-- </a> --> <!-- </a> -->
</div> </div>

@ -15,7 +15,7 @@
<div class="well well-large"> <div class="well well-large">
<p> <p>
<img src="/static/img/size_beuchat.jpg" alt="" style="max-width: 100%"/> <img src="/static/img/size_beuchat.jpg" alt="Размерная сетка Beuchat" title="Размерная сетка Beuchat" style="max-width: 100%"/>
</p> </p>
</div> </div>
{% endblock %} {% endblock %}

@ -14,7 +14,7 @@
<h2>Размерная сетка для гидрокостюмов <br/>Omer и Sporasub</h2> <h2>Размерная сетка для гидрокостюмов <br/>Omer и Sporasub</h2>
<div class="well well-large"> <div class="well well-large">
<p> <p>
<img src="/static/img/size_omer_sporasub.jpg" alt="" style="max-width: 100%"/> <img src="/static/img/size_omer_sporasub.jpg" alt="Размерная сетка Omer и Sporasub" title="Размерная сетка Omer и Sporasub" style="max-width: 100%"/>
</p> </p>
</div> </div>

@ -15,7 +15,7 @@
<div class="well well-large"> <div class="well well-large">
<p> <p>
<img src="/static/img/size_sargan.jpg" alt="" style="max-width: 100%"/> <img src="/static/img/size_sargan.jpg" alt="Размерная сетка Sargan" title="Размерная сетка Sargan" style="max-width: 100%"/>
</p> </p>
</div> </div>

@ -15,10 +15,10 @@
<div class="well well-large"> <div class="well well-large">
<p> <p>
<img src="/static/img/size_scorpena1.jpg" alt="" style="max-width: 100%"/> <img src="/static/img/size_scorpena1.jpg" alt="Размерная сетка Scorpena 1" title="Размерная сетка Scorpena 1" style="max-width: 100%"/>
</p> </p>
<p> <p>
<img src="/static/img/size_scorpena2.jpg" alt="" style="max-width: 100%"/> <img src="/static/img/size_scorpena2.jpg" alt="Размерная сетка Scorpena 2" title="Размерная сетка Scorpena 2" style="max-width: 100%"/>
</p> </p>
</div> </div>
{% endblock %} {% endblock %}

Loading…
Cancel
Save