Merge pull request #104 from liangliangyy/dev

bug修复

DjangoBlog/feeds.py

@@ -26,9 +26,9 @@ from django.contrib.sites.models import Site
 class DjangoBlogFeed(Feed):
     feed_type = Rss201rev2Feed
 
-    description = settings.SITE_DESCRIPTION
+    description = '大巧无工,重剑无锋.'
     feed_url = 'https://www.lylinux.net/feed'
-    title = "%s %s " % (settings.SITE_NAME, settings.SITE_DESCRIPTION)
+    title = "且听风吟 大巧无工,重剑无锋. "
     link = "https://www.lylinux.net"
 
     def author_name(self):
@@ -48,7 +48,7 @@ class DjangoBlogFeed(Feed):
 
     def feed_copyright(self):
         # print(Site.objects.get_current().name)
-        return "Copyright© 2017  " + settings.SITE_NAME
+        return "Copyright© 2018 且听风吟"
 
     def item_link(self, item):
         return item.get_absolute_url()

bin/config.md

@@ -45,6 +45,7 @@ OAHUTH = {
 }
 ```
 将对应的appkey和appsecret修改为你自己的，将`callbackurl`的域名也修改为你的域名。
+## Update Oauth配置部分已经修改到配置表中
 
 ## owntracks：
 owntracks是一个位置追踪软件，可以定时的将你的坐标提交到你的服务器上，现在简单的支持owntracks功能，需要安装owntracks的app，然后将api地址设置为:

blog/templatetags/blog_tags.py

@@ -28,6 +28,7 @@ from comments.models import Comment
 from DjangoBlog.utils import cache_decorator, logger
 from django.contrib.auth import get_user_model
 from oauth.models import OAuthUser
+from django.contrib.sites.models import Site
 
 register = template.Library()
 
@@ -66,8 +67,9 @@ def truncatechars_content(content):
     :return:
     """
     from django.template.defaultfilters import truncatechars_html
-
-    return truncatechars_html(content, settings.ARTICLE_SUB_LENGTH)
+    from DjangoBlog.utils import get_blog_setting
+    blogsetting = get_blog_setting()
+    return truncatechars_html(content, blogsetting.article_sub_length)
 
 
 @register.filter(is_safe=True)
@@ -86,8 +88,10 @@ def load_breadcrumb(article):
     :return:
     """
     names = article.get_category_tree()
-
-    names.append((settings.SITE_NAME, settings.SITE_URL))
+    from DjangoBlog.utils import get_blog_setting
+    blogsetting = get_blog_setting()
+    site = Site.objects.get_current().domain
+    names.append((blogsetting.sitename, site))
     names = names[::-1]
 
     return {