Merge pull request #33 from liangliangyy/dev

界面修改

DjangoBlog/settings.py

@@ -164,7 +164,7 @@ SITE_NAME = '且听风吟'
 SITE_URL = 'http://www.lylinux.net'
 SITE_DESCRIPTION = '大巧无工,重剑无锋.'
 SITE_SEO_DESCRIPTION = '小站主要用来分享和记录学习经验,教程,记录个人生活的点滴以及一些随笔.欢迎大家访问小站'
-SITE_SEO_KEYWORDS = 'linux,apache,mysql,服务器,ubuntu,shell,web,csharp,.net,asp,mac,swift'
+SITE_SEO_KEYWORDS = 'linux,apache,mysql,服务器,ubuntu,shell,web,csharp,.net,asp,mac,swift,python,django'
 ARTICLE_SUB_LENGTH = 300
 SHOW_GOOGLE_ADSENSE = False
 # bootstrap颜色样式
@@ -186,10 +186,12 @@ CACHE_CONTROL_MAX_AGE = 2592000
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'TIMEOUT': 10800,
         'LOCATION': '127.0.0.1:11211',
     },
     'locmemcache': {
         'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        'TIMEOUT': 10800,
         'LOCATION': 'unique-snowflake',
     }
 }

oauth/views.py

@@ -53,7 +53,7 @@ def authorize(request):
     if user:
         if not user.nikename:
             import datetime
-            user.nikename = "djangoblog" + datetime.datetime.now().strftime('%Y%m%f%H%m%s')
+            user.nikename = "djangoblog" + datetime.datetime.now().strftime('%y%m%d%I')
         try:
             token = user.token
             user = OAuthUser.objects.get(type=type, openid=user.openid)

templates/blog/tags/sidebar.html

@@ -41,8 +41,7 @@
                 {% for c in sidebar_comments %}
                     <li class="recentcomments">
                 <span class="comment-author-link">
-                    <a href="{{ c.author.get_absolute_url }}" rel="external"
-                       class="url">{{ c.author.username }}</a></span>
+                    {{ c.author.username }}</span>
                         发表在《
                         <a href="{{ c.article.get_absolute_url }}">{{ c.article.title }}</a>》
                     </li>
@@ -112,5 +111,5 @@
 
         </ul>
     </aside>
-<div id="rocket" class="show" title="点我返回顶部"></div>
+    <div id="rocket" class="show" title="点我返回顶部"></div>
 </div><!-- #secondary -->