remotes/origin/artem
Gena 11 years ago
parent bb7063d2e0
commit da10eee1d6
  1. 1
      batiskaf/settings.py
  2. 5
      batiskaf/templates/jinja2/base.jinja
  3. 37
      batiskaf/urls.py
  4. 10
      news/views.py
  5. 5
      store/urls.py
  6. 18
      store/views.py

@ -57,6 +57,7 @@ INSTALLED_APPS = (
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django.contrib.postgres', 'django.contrib.postgres',
'django.contrib.sitemaps',
'django_extensions', 'django_extensions',
'rest_framework', 'rest_framework',
'easy_thumbnails', 'easy_thumbnails',

@ -211,9 +211,8 @@
<br/><br/><br/><br/> <br/><br/><br/><br/>
<p> <p>
<a href="#">Карта сайта</a> &nbsp;|&nbsp; <a href="#">Поисковые запросы</a> &nbsp;|&nbsp; <a <a href="/sitemap.xml">Карта сайта</a> &nbsp;|&nbsp; <a
href="/store/search/?q=">Поиск</a> &nbsp;|&nbsp; <a href="/contacts/">Контакты</a> &nbsp;|&nbsp; <a href="/store/search/?q=">Поиск</a> &nbsp;|&nbsp; <a href="/contacts/">Контакты</a> &nbsp;
href="#">RSS</a>
</p><br/> </p><br/>
<br/> <br/>

@ -1,12 +1,16 @@
from django.conf.urls import patterns, include, url from django.conf.urls import patterns, include, url
from django.contrib import admin from django.contrib import admin
from api.views import call_order from api.views import call_order
from store.views import order_view, order_print from news.views import NewsSitemap
from store.views import order_view, order_print, ProductSitemap, CategorySitemap
from main.views import * from main.views import *
from rest_framework import routers from rest_framework import routers
# from api.urls import router # from api.urls import router
from rest_framework import routers from rest_framework import routers
from api.views import * from api.views import *
from django.contrib import sitemaps
from django.core.urlresolvers import reverse
from django.contrib.sitemaps.views import sitemap
# Serializers define the API representation. # Serializers define the API representation.
# Routers provide an easy way of automatically determining the URL conf. # Routers provide an easy way of automatically determining the URL conf.
@ -16,10 +20,39 @@ admin.site.site_header = 'Админка Batiskaf-kz.kz'
admin.site.site_title = 'Админка Batiskaf-kz.kz' admin.site.site_title = 'Админка Batiskaf-kz.kz'
admin.site.index_title = 'Модели' admin.site.index_title = 'Модели'
class StaticViewSitemap(sitemaps.Sitemap):
priority = 0.5
changefreq = 'daily'
def items(self):
return [
'index', 'size_index', 'size_beuchat',
'size_omer_sporasub', 'size_sargan', 'size_scorpena',
'advantages', 'payment', 'delivery',
'contacts', 'faq',
'store_cart_detail', 'store_search', 'store_sale',
'accounts_index', 'accounts_login', 'news_index',
]
def location(self, item):
return reverse(item)
sitemaps1 = {
'static': StaticViewSitemap,
'items': ProductSitemap,
'news': NewsSitemap,
'categories': CategorySitemap,
}
urlpatterns = patterns( urlpatterns = patterns(
'', '',
url(r'^$', 'main.views.index', url(r'^$', 'main.views.index',
name='index'), name='index'),
url(r'^sitemap\.xml$', sitemap, {'sitemaps': sitemaps1},
name='django.contrib.sitemaps.views.sitemap'),
url(r'^size/$', 'main.views.size_index', url(r'^size/$', 'main.views.size_index',
name='size_index'), name='size_index'),
url(r'^size/beuchat/$', 'main.views.size_beuchat', url(r'^size/beuchat/$', 'main.views.size_beuchat',
@ -47,6 +80,6 @@ urlpatterns = patterns(
url(r'^payment/$', payment, name='payment'), url(r'^payment/$', payment, name='payment'),
url(r'^delivery/$', delivery, name='delivery'), url(r'^delivery/$', delivery, name='delivery'),
url(r'^contacts/$', contacts, name='contacts'), url(r'^contacts/$', contacts, name='contacts'),
url(r'^faq/$', faq, name='contacfaqts'), url(r'^faq/$', faq, name='faq'),
url(r'^admin2517_garpun/', include(admin.site.urls)), url(r'^admin2517_garpun/', include(admin.site.urls)),
) )

@ -1,4 +1,5 @@
from django.contrib import messages from django.contrib import messages
from django.contrib.sitemaps import Sitemap
from django.shortcuts import render, get_object_or_404, redirect from django.shortcuts import render, get_object_or_404, redirect
from django.views.generic import ListView, DetailView from django.views.generic import ListView, DetailView
from django.views.generic.edit import FormView, CreateView from django.views.generic.edit import FormView, CreateView
@ -46,3 +47,12 @@ def news_detail(request, slug):
return render(request, 'news/detail.jinja', c) return render(request, 'news/detail.jinja', c)
class NewsSitemap(Sitemap):
changefreq = "never"
priority = 1
def items(self):
return News.objects.all()
def lastmod(self, obj):
return obj.created

@ -2,6 +2,11 @@ from django.conf.urls import patterns, url
from django.views.generic import RedirectView from django.views.generic import RedirectView
from .views import * from .views import *
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^$', RedirectView.as_view( url(r'^$', RedirectView.as_view(
url='/', permanent=True), name='store_index'), url='/', permanent=True), name='store_index'),

@ -13,7 +13,7 @@ from store.forms import OrderForm
from django.http import JsonResponse from django.http import JsonResponse
from datetime import datetime from datetime import datetime
from django.conf import settings from django.conf import settings
from django.contrib.sitemaps import Sitemap
class CategoryBaseView(object): class CategoryBaseView(object):
category = None category = None
@ -273,3 +273,19 @@ def order_print(request, order):
order = get_object_or_404(OrderData, pk=order) order = get_object_or_404(OrderData, pk=order)
c = dict(order=order, date=datetime.now()) c = dict(order=order, date=datetime.now())
return render(request, 'order_print.jinja', c) return render(request, 'order_print.jinja', c)
class ProductSitemap(Sitemap):
changefreq = "daily"
priority = 1
def items(self):
return Product.objects.all()
class CategorySitemap(Sitemap):
changefreq = "daily"
priority = 1
def items(self):
return Category.objects.all()

Loading…
Cancel
Save