upd
This commit is contained in:
parent
a9e0752cf4
commit
67306c6032
|
@ -2,9 +2,9 @@ from django import template
|
||||||
|
|
||||||
register = template.Library()
|
register = template.Library()
|
||||||
|
|
||||||
|
|
||||||
def truncate(paginator, number):
|
def truncate(paginator, number):
|
||||||
print paginator
|
|
||||||
print number
|
|
||||||
if number < 5:
|
if number < 5:
|
||||||
truncated_paginator = xrange(1, number+3)
|
truncated_paginator = xrange(1, number+3)
|
||||||
elif number > 4 and number < (paginator-3):
|
elif number > 4 and number < (paginator-3):
|
||||||
|
|
|
@ -11,18 +11,21 @@ from django.contrib.auth.decorators import login_required
|
||||||
from taggit.models import Tag
|
from taggit.models import Tag
|
||||||
import math
|
import math
|
||||||
|
|
||||||
|
|
||||||
def cloud():
|
def cloud():
|
||||||
min_font = 11
|
min_font = 11
|
||||||
max_font = 28
|
max_font = 28
|
||||||
#size = max(min_font, round((min_font+(tag_list[i]-min_w)*step)*(math.log(tag_list[i])/Math.log(max_w))))
|
#size = max(min_font, round((min_font+(tag_list[i]-min_w)*step)*(math.log(tag_list[i])/Math.log(max_w))))
|
||||||
v = Tag.objects.all().annotate(c = Count('post')).filter(c__gt = 0).aggregate(Min('c'), Max('c'))
|
v = Tag.objects.all().annotate(c = Count('post')).filter(c__gt = 0).aggregate(Min('c'), Max('c'))
|
||||||
max_tag, min_tag = v["c__max"], v["c__min"]
|
max_tag, min_tag = v["c__max"], v["c__min"]
|
||||||
step = (max_font - min_font)/(max_tag-min_tag)
|
step = (max_font - min_font)/float(max_tag-min_tag)
|
||||||
|
#print step
|
||||||
tags = Tag.objects.all().annotate(
|
tags = Tag.objects.all().annotate(
|
||||||
c = Count('post'), f=min_font + (Count('post')-min_tag)*step).filter(
|
c = Count('post'), f=min_font + (Count('post')-min_tag)*step).filter(
|
||||||
c__gt = 0).order_by('name')
|
c__gt = 0).order_by('name')
|
||||||
return tags
|
return tags
|
||||||
|
|
||||||
|
|
||||||
def post_list(request, page='1', tag=None):
|
def post_list(request, page='1', tag=None):
|
||||||
if tag is None:
|
if tag is None:
|
||||||
post_list = Post.objects.filter(published_date__lte=timezone.now()).order_by('-published_date')#[int(page)*5-5:int(page)*5]
|
post_list = Post.objects.filter(published_date__lte=timezone.now()).order_by('-published_date')#[int(page)*5-5:int(page)*5]
|
||||||
|
@ -41,7 +44,7 @@ def post_list(request, page='1', tag=None):
|
||||||
posts = paginator.page(1)
|
posts = paginator.page(1)
|
||||||
except EmptyPage: # If page is out of range (e.g. 9999), deliver last page of results.
|
except EmptyPage: # If page is out of range (e.g. 9999), deliver last page of results.
|
||||||
posts = paginator.page(paginator.num_pages)
|
posts = paginator.page(paginator.num_pages)
|
||||||
print dir(posts.paginator)
|
#print dir(posts.paginator)
|
||||||
return render_to_response('blog/post_list.html', {'posts': posts, 'latest': latest, 'cloud': tag_cloud})
|
return render_to_response('blog/post_list.html', {'posts': posts, 'latest': latest, 'cloud': tag_cloud})
|
||||||
|
|
||||||
|
|
||||||
|
@ -55,10 +58,11 @@ def post_detail(request, pk):
|
||||||
post.delete()
|
post.delete()
|
||||||
return redirect('/')
|
return redirect('/')
|
||||||
else:
|
else:
|
||||||
return redirect('/admin/login/?next=/blog/')
|
return redirect('/admin/login/?next=/post/' + pk)
|
||||||
return render(request, 'blog/post_detail.html', {'post': post, 'tags': tags, 'latest': latest, 'cloud': tag_cloud})
|
return render(request, 'blog/post_detail.html', {'post': post, 'tags': tags, 'latest': latest, 'cloud': tag_cloud})
|
||||||
|
|
||||||
@login_required(login_url="/admin/login/?next=/blog/")
|
|
||||||
|
@login_required(login_url="/admin/login/?next=/")
|
||||||
def post_new(request):
|
def post_new(request):
|
||||||
tag_cloud = cloud()
|
tag_cloud = cloud()
|
||||||
latest = Post.objects.filter(published_date__lte=timezone.now()).order_by('-published_date')[0:9]
|
latest = Post.objects.filter(published_date__lte=timezone.now()).order_by('-published_date')[0:9]
|
||||||
|
@ -76,7 +80,7 @@ def post_new(request):
|
||||||
return render(request, 'blog/post_edit.html', {'form': form, 'latest': latest, 'cloud': tag_cloud})
|
return render(request, 'blog/post_edit.html', {'form': form, 'latest': latest, 'cloud': tag_cloud})
|
||||||
|
|
||||||
|
|
||||||
@login_required(login_url="/admin/login/?next=/blog/")
|
@login_required(login_url="/admin/login/?next=/")
|
||||||
def post_edit(request, pk):
|
def post_edit(request, pk):
|
||||||
tag_cloud = cloud()
|
tag_cloud = cloud()
|
||||||
latest = Post.objects.filter(published_date__lte=timezone.now()).order_by('-published_date')[0:9]
|
latest = Post.objects.filter(published_date__lte=timezone.now()).order_by('-published_date')[0:9]
|
||||||
|
|
|
@ -78,14 +78,24 @@ WSGI_APPLICATION = 'mysite.wsgi.application'
|
||||||
|
|
||||||
# Database
|
# Database
|
||||||
# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
|
# https://docs.djangoproject.com/en/1.9/ref/settings/#databases
|
||||||
|
'''
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
'default': {
|
'default': {
|
||||||
'ENGINE': 'django.db.backends.sqlite3',
|
'ENGINE': 'django.db.backends.sqlite3',
|
||||||
'NAME': os.path.join(BASE_DIR, '../db.sqlite3'),
|
'NAME': os.path.join(BASE_DIR, '../db.sqlite3'),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
'''
|
||||||
|
DATABASES = {
|
||||||
|
'default': {
|
||||||
|
'ENGINE': 'django.db.backends.postgresql_psycopg2',
|
||||||
|
'NAME': 'mysite',
|
||||||
|
'USER': 'anya',
|
||||||
|
'PASSWORD': 'pupsi4ek',
|
||||||
|
'HOST': '127.0.0.1',
|
||||||
|
'PORT': '5432',
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# Password validation
|
# Password validation
|
||||||
# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
|
# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators
|
||||||
|
|
Loading…
Reference in New Issue
Block a user