From 29714c9278c05c98cced7f3edeb062f096837c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BD=A6=E4=BA=AE=E4=BA=AE?= <liangliangyy@gmail.com>
Date: Sun, 15 Jan 2017 17:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BA=BF=E4=B8=8A=E9=94=99=E8=AF=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DjangoBlog/feeds.py                        |  3 +--
 blog/models.py                             | 11 ++++----
 blog/views.py                              |  4 +--
 templates/blog/article_detail.html         | 29 +++++++++++-----------
 templates/blog/tags/article_info.html      | 12 ++++++---
 templates/blog/tags/article_meta_info.html | 22 ++++++++--------
 templates/share_layout/footer.html         |  2 +-
 7 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/DjangoBlog/feeds.py b/DjangoBlog/feeds.py
index bef50d5..245ef8c 100644
--- a/DjangoBlog/feeds.py
+++ b/DjangoBlog/feeds.py
@@ -18,7 +18,6 @@ from blog.models import Article
 from django.conf import settings
 from django.utils.feedgenerator import Rss201rev2Feed
 from DjangoBlog.common_markdown import common_markdown
-from django.utils.safestring import mark_safe
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
@@ -45,7 +44,7 @@ class DjangoBlogFeed(Feed):
         return item.title
 
     def item_description(self, item):
-        return mark_safe(common_markdown.get_markdown(item.body))
+        return common_markdown.get_markdown(item.body)
 
     def feed_copyright(self):
         # print(Site.objects.get_current().name)
diff --git a/blog/models.py b/blog/models.py
index 6e4c344..93d7680 100644
--- a/blog/models.py
+++ b/blog/models.py
@@ -5,6 +5,7 @@ from django.conf import settings
 from uuslug import slugify
 from DjangoBlog.spider_notify import sipder_notify
 
+
 class Article(models.Model):
     """文章"""
     STATUS_CHOICES = (
@@ -71,11 +72,11 @@ class Article(models.Model):
         if not self.slug or self.slug == 'no-slug' or not self.id:
             # Only set the slug when the object is created.
             self.slug = slugify(self.title)
-        try:
-            notify = sipder_notify()
-            notify.notify(self.get_absolute_url())
-        except Exception as e:
-            print(e)
+            try:
+                notify = sipder_notify()
+                notify.notify(self.get_absolute_url())
+            except Exception as e:
+                print(e)
         super().save(*args, **kwargs)
 
     def viewed(self):
diff --git a/blog/views.py b/blog/views.py
index 2c670a1..85490e5 100644
--- a/blog/views.py
+++ b/blog/views.py
@@ -55,7 +55,7 @@ class ArticleListView(ListView):
 
 class IndexView(ArticleListView):
     def get_queryset(self):
-        article_list = Article.objects.filter(status='p')
+        article_list = Article.objects.filter(type='a',status='p')
 
         # for article in article_list:
         #     article.body = article.body[0:settings.ARTICLE_SUB_LENGTH]
@@ -228,7 +228,7 @@ def fileupload(request):
 @login_required
 def refresh_memcache(request):
     try:
-        result = os.popen(' service memcache restart ').readline()
+        result = os.popen(' service memcached restart ').readline()
         return HttpResponse(result)
     except Exception as e:
         return HttpResponse(e);
diff --git a/templates/blog/article_detail.html b/templates/blog/article_detail.html
index 9639308..ec32c06 100755
--- a/templates/blog/article_detail.html
+++ b/templates/blog/article_detail.html
@@ -22,20 +22,21 @@
         <div id="content" role="main">
             {% load_article_detail article False user %}
 
-
-            <nav class="nav-single">
-                <h3 class="assistive-text">文章导航</h3>
-                {% if next_article %}
-
-                    <span class="nav-previous"><a href="{{ next_article.get_absolute_url }}" rel="prev"><span
-                            class="meta-nav">&larr;</span> {{ next_article.title }}</a></span>
-                {% endif %}
-                {% if prev_article %}
-                    <span class="nav-next"><a href="{{ prev_article.get_absolute_url }}"
-                                              rel="next">{{ prev_article.title }} <span
-                            class="meta-nav">&rarr;</span></a></span>
-                {% endif %}
-            </nav><!-- .nav-single -->
+            {% if article.type == 'a' %}
+                <nav class="nav-single">
+                    <h3 class="assistive-text">文章导航</h3>
+                    {% if next_article %}
+
+                        <span class="nav-previous"><a href="{{ next_article.get_absolute_url }}" rel="prev"><span
+                                class="meta-nav">&larr;</span> {{ next_article.title }}</a></span>
+                    {% endif %}
+                    {% if prev_article %}
+                        <span class="nav-next"><a href="{{ prev_article.get_absolute_url }}"
+                                                  rel="next">{{ prev_article.title }} <span
+                                class="meta-nav">&rarr;</span></a></span>
+                    {% endif %}
+                </nav><!-- .nav-single -->
+            {% endif %}
 
         </div><!-- #content -->
         {% if article.comment_status == "o" %}
diff --git a/templates/blog/tags/article_info.html b/templates/blog/tags/article_info.html
index 270815a..df7164b 100644
--- a/templates/blog/tags/article_info.html
+++ b/templates/blog/tags/article_info.html
@@ -1,7 +1,7 @@
 {% load blog_tags %}
 <article id="post-{{ article.pk }} "
-         class="post-3815 post type-post status-publish format-standard hentry category-python tag-python"
-        itemscope itemtype="http://schema.org/Article">
+         class="post-3815 post type-post status-publish format-standard hentry"
+         itemscope itemtype="http://schema.org/Article">
     <header class="entry-header">
 
         <h1 class="entry-title" itemprop="name">
@@ -30,8 +30,10 @@
             </div>
         </div><!-- .comments-link -->
         <br/>
-        {% if not isindex %}
-            {% load_breadcrumb article %}
+        {% if article.type == 'a' %}
+            {% if not isindex %}
+                {% load_breadcrumb article %}
+            {% endif %}
         {% endif %}
     </header><!-- .entry-header -->
 
@@ -45,5 +47,7 @@
         {% endif %}
 
     </div><!-- .entry-content -->
+
     {% load_article_metas article user %}
+
 </article><!-- #post -->
\ No newline at end of file
diff --git a/templates/blog/tags/article_meta_info.html b/templates/blog/tags/article_meta_info.html
index 4a90c4e..75b5a3e 100644
--- a/templates/blog/tags/article_meta_info.html
+++ b/templates/blog/tags/article_meta_info.html
@@ -8,18 +8,20 @@
           datetime="{{ article.created_time }}">
         {% datetimeformat article.created_time %}</time>
 </a>
-    。属于<a href="{{ article.category.get_absolute_url }}" rel="category tag">{{ article.category.name }}</a>分类，
-    {% if article.tags.all %}
-        被贴了
+    {% if article.type == 'a' %}
+        。属于<a href="{{ article.category.get_absolute_url }}" rel="category tag">{{ article.category.name }}</a>分类，
+        {% if article.tags.all %}
+            被贴了
 
-        {% for t in article.tags.all %}
-            <a href="{{ t.get_absolute_url }}" rel="tag">{{ t.name }}</a>
-            {% if t != article.tags.all.last %}
-                ，
-            {% endif %}
-        {% endfor %}
+            {% for t in article.tags.all %}
+                <a href="{{ t.get_absolute_url }}" rel="tag">{{ t.name }}</a>
+                {% if t != article.tags.all.last %}
+                    ，
+                {% endif %}
+            {% endfor %}
 
-        标签。
+            标签。
+        {% endif %}
     {% endif %}
     <span class="by-author">作者是<span class="author vcard"><a class="url fn n"
                                                              href="{{ article.author.get_absolute_url }}"
diff --git a/templates/share_layout/footer.html b/templates/share_layout/footer.html
index 98a3e95..bbcbf66 100644
--- a/templates/share_layout/footer.html
+++ b/templates/share_layout/footer.html
@@ -1,7 +1,7 @@
 <footer id="colophon" role="contentinfo">
     <div class="site-info">
         Copyright&copy;&nbsp;2017&nbsp;
-        <a href="{{ SITE_BASE_URL }}" target="blank">逝去日子的博客</a>
+        <a href="{{ SITE_BASE_URL }}" target="blank">{{ SITE_NAME }}</a>
         &nbsp;|&nbsp;
         <a href="{{ SITE_BASE_URL }}sitemap.xml" title="SiteMap" target="_blank">
             SiteMap