remotes/origin/artem
Gena 11 years ago
parent e81a56dbd2
commit aa76f9f7c3
  1. 53
      batiskaf/templates/jinja2/index.jinja
  2. 7
      main/admin.py
  3. 25
      main/migrations/0007_banner.py
  4. 17
      main/models.py
  5. 2
      main/views.py
  6. 19
      store/migrations/0023_auto_20150619_1520.py

@ -1,36 +1,43 @@
{% extends 'base.jinja' %} {% extends 'base.jinja' %}
{% block content %} {% block content %}
{% if banners %}
<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
<li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
</ol>
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
<div class="item active">
<a href="/store/sale/">
<img src="/static/img/banner1.jpg" alt="Распродажа!" title="Распродажа!">
</a>
<div class="carousel-caption"> <div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
</div> {% for c in range(banners.count()) %}
<li data-target="#carousel-example-generic" data-slide-to="{{ c }}" class="{% if loop.first %}active{% endif %}"></li>
{% endfor %}
</ol>
<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
{% for b in banners %}
<div class="item {% if loop.first %}active{% endif %}">
<a href="{{ b.link }}">
<img src="/static/{{ b.image }}" alt="{{ b.title }}" title="{{ b.title }}">
</a>
</div>
{% endfor %}
</div> </div>
<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="sr-only">Назад</span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Вперед</span>
</a>
</div> </div>
{% endif %}
<!-- Controls -->
<a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
<span class="sr-only">Назад</span>
</a>
<a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
<span class="sr-only">Вперед</span>
</a>
</div>
<div class="index-goods"> <div class="index-goods">
<div class="row"> <div class="row">
{% for product in products %} {% for product in products %}

@ -0,0 +1,7 @@
from django.contrib import admin
from .models import Banner
class BannerAdmin(admin.ModelAdmin):
list_display = ('title', 'link', 'is_active')
admin.site.register(Banner, BannerAdmin)

@ -0,0 +1,25 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import main.models
class Migration(migrations.Migration):
dependencies = [
('main', '0006_auto_20150328_1507'),
]
operations = [
migrations.CreateModel(
name='Banner',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, verbose_name='ID', serialize=False)),
('title', models.CharField(max_length=256, verbose_name='Альтернативный текст')),
('image', models.ImageField(verbose_name='Баннер', upload_to=main.models.photo_filename)),
('link', models.CharField(max_length=1024, verbose_name='Ссылка')),
('is_active', models.BooleanField(default=True, verbose_name='Публиковать')),
],
),
]

@ -0,0 +1,17 @@
from django.db import models
def photo_filename(instance, filename):
from slugify import slugify_filename
return 'photo_uploads/' + slugify_filename(filename)
class Banner(models.Model):
title = models.CharField(
'Альтернативный текст', max_length=256, blank=False, null=False)
image = models.ImageField('Баннер', upload_to=photo_filename)
link = models.CharField(
'Ссылка', max_length=1024, blank=False, null=False)
is_active = models.BooleanField('Публиковать', default=True)
def __str__(self):
return self.title

@ -1,5 +1,6 @@
from django.http import JsonResponse from django.http import JsonResponse
from django.shortcuts import render from django.shortcuts import render
from main.models import Banner
from store.models import Product, Category, ProductVariation from store.models import Product, Category, ProductVariation
@ -7,6 +8,7 @@ def index(request):
c = dict( c = dict(
products=Product.objects.order_by('-pk')[:8], products=Product.objects.order_by('-pk')[:8],
aaa=[1,2,3,4,5,6,7,8,9,0], aaa=[1,2,3,4,5,6,7,8,9,0],
banners=Banner.objects.filter(is_active=True),
) )
return render(request, 'index.jinja', c) return render(request, 'index.jinja', c)

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save