diff --git a/DjangoBlog/spider_notify.py b/DjangoBlog/spider_notify.py index ca5fb64..d00b0c4 100644 --- a/DjangoBlog/spider_notify.py +++ b/DjangoBlog/spider_notify.py @@ -36,7 +36,7 @@ class SpiderNotify(): print(e) @staticmethod - def notify(self, url): + def notify(url): SpiderNotify.baidu_notify(url) SpiderNotify.__google_notify() diff --git a/accounts/tests.py b/accounts/tests.py index ea7a1e1..f7c2b1d 100644 --- a/accounts/tests.py +++ b/accounts/tests.py @@ -4,6 +4,7 @@ from django.contrib.auth import get_user_model from django.contrib.sites.models import Site import datetime from accounts.models import BlogUser +from django.core.urlresolvers import reverse # Create your tests here. @@ -39,3 +40,45 @@ class AccountTest(TestCase): response = self.client.get(article.get_admin_url()) self.assertEqual(response.status_code, 200) + + def test_validate_register(self): + self.assertEquals(0, len(BlogUser.objects.filter(email='user123@user.com'))) + response = self.client.post(reverse('account:register'), { + 'username': 'user1233', + 'email': 'user123@user.com', + 'password1': 'password123', + 'password2': 'password123', + }) + self.assertEquals(1, len(BlogUser.objects.filter(email='user123@user.com'))) + + self.client.login(username='user1233', password='password123') + user = BlogUser.objects.filter(email='user123@user.com')[0] + user.is_superuser = True + user.is_staff = True + user.save() + article = Article() + article.title = "nicetitle333" + article.body = "nicecontentttt" + article.author = user + + article.type = 'a' + article.status = 'p' + article.save() + + response = self.client.get(article.get_admin_url()) + self.assertEqual(response.status_code, 200) + + response = self.client.get(reverse('account:logout')) + self.assertIn(response.status_code, [301, 302]) + + response = self.client.get(article.get_admin_url()) + self.assertIn(response.status_code, [301, 302]) + + response = self.client.post(reverse('account:login'), { + 'username': 'user1233', + 'password': 'password123' + }) + self.assertIn(response.status_code, [301, 302]) + + response = self.client.get(article.get_admin_url()) + self.assertEqual(response.status_code, 200) diff --git a/blog/templatetags/blog_tags.py b/blog/templatetags/blog_tags.py index c06a596..c0e4775 100644 --- a/blog/templatetags/blog_tags.py +++ b/blog/templatetags/blog_tags.py @@ -128,7 +128,17 @@ def load_sidebar(user): links = Links.objects.all() commment_list = Comment.objects.order_by('-id')[:settings.SIDEBAR_COMMENT_COUNT] show_adsense = settings.SHOW_GOOGLE_ADSENSE - # tags= + # 标签云 计算字体大小 + # 根据总数计算出平均值 大小为 (数目/平均值)*步长 + increment = 10 + tags = Tag.objects.all() + sidebar_tags = None + if tags: + s = list(map(lambda t: (t, t.get_article_count()), tags)) + count = sum(map(lambda t: t[1], s)) + dd = count / len(tags) + sidebar_tags = list(map(lambda x: (x[0], x[1], (x[1] / dd) * increment), s)) + return { 'recent_articles': recent_articles, 'sidebar_categorys': sidebar_categorys, @@ -137,7 +147,8 @@ def load_sidebar(user): 'sidabar_links': links, 'sidebar_comments': commment_list, 'user': user, - 'show_adsense': show_adsense + 'show_adsense': show_adsense, + 'sidebar_tags': sidebar_tags } @@ -252,4 +263,3 @@ def query(qs, **kwargs): {% endfor %} """ return qs.filter(**kwargs) - diff --git a/blog/tests.py b/blog/tests.py index 0e2345e..d1a1920 100644 --- a/blog/tests.py +++ b/blog/tests.py @@ -27,8 +27,6 @@ class ArticleTest(TestCase): category.last_mod_time = datetime.datetime.now() category.save() - response = self.client.get(category.get_absolute_url()) - self.assertEqual(response.status_code, 200) tag = Tag() tag.name = "nicetag" tag.save() @@ -53,6 +51,12 @@ class ArticleTest(TestCase): response = self.client.get(tag.get_absolute_url()) self.assertEqual(response.status_code, 200) + response = self.client.get(category.get_absolute_url()) + self.assertEqual(response.status_code, 200) + + from DjangoBlog.spider_notify import SpiderNotify + SpiderNotify.baidu_notify([article.get_full_url()]) + def test_validate_feed(self): user = BlogUser.objects.get_or_create(email="liangliangyy12@gmail.com", username="liangliangyy")[0] user.set_password("liangliangyy") diff --git a/templates/blog/tags/sidebar.html b/templates/blog/tags/sidebar.html index 06bad41..dd6b1fc 100755 --- a/templates/blog/tags/sidebar.html +++ b/templates/blog/tags/sidebar.html @@ -77,6 +77,18 @@ {% if show_adsense %} {% include 'share_layout/adsense.html' %} {% endif %} + {% if sidebar_tags %} + + {% endif %}