pv7szbh4j
/
git-test
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

暂存

Browse Source
master
车亮亮 9 years ago
parent f150a723b4
commit 6627780883
7 changed files with 154 additions and 46 deletions
Show Stats Download Patch File Download Diff File

26
DjangoBlog/settings.py
Unescape View File

@ -41,14 +41,17 @@ INSTALLED_APPS = [
]
MIDDLEWARE = [
MIDDLEWARE_CLASSES = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
#'django.middleware.cache.UpdateCacheMiddleware',
'django.middleware.common.CommonMiddleware',
#'django.middleware.cache.FetchFromCacheMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
]
ROOT_URLCONF = 'DjangoBlog.urls'
@ -65,7 +68,7 @@ TEMPLATES = [
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'blog.context_processors.seo_processor',
'blog.context_processors.seo_processor'
],
},
},
@ -82,7 +85,7 @@ DATABASES = {
'NAME': 'djangoblog',
'USER': 'root',
'PASSWORD': 'root',
'HOST': '192.168.33.10',
'HOST': '192.168.21.130',
'PORT': 3306,
}
}
@ -127,13 +130,26 @@ STATICFILES = os.path.join(BASE_DIR, 'static')
AUTH_USER_MODEL = 'accounts.BlogUser'
TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
DATE_TIME_FORMAT = '%Y-%m-%d %H:%M:%S'
DATE_TIME_FORMAT = '%Y-%m-%d'
SITE_NAME = 'Django Blog'
SITE_DESCRIPTION = '大巧无工,重剑无锋.'
ARTICLE_SUB_LENGTH = 300
#bootstrap颜色样式
# bootstrap颜色样式
BOOTSTRAP_COLOR_TYPES = [
'default', 'primary', 'success', 'info', 'warning', 'danger'
]
# 侧边栏文章数目
SIDEBAR_ARTICLE_COUNT = 10
# cache setting
"""
CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
'LOCATION': '192.168.21.130:11211',
}
}
"""

27
blog/templatetags/blog_tags.py
Unescape View File

@ -19,6 +19,7 @@ import markdown
from django.template.defaultfilters import stringfilter
from django.utils.safestring import mark_safe
import random
from blog.models import Article, Category, Tag
register = template.Library()
@ -33,6 +34,14 @@ def timeformat(data):
return ""
@register.simple_tag
def datetimeformat(data):
try:
return data.strftime(settings.DATE_TIME_FORMAT)
except:
return ""
@register.filter(is_safe=True)
@stringfilter
def custom_markdown(content):
@ -43,7 +52,7 @@ def custom_markdown(content):
safe_mode=True, enable_attributes=False))
@register.inclusion_tag('blog/categorytree.html')
@register.inclusion_tag('blog/breadcrumb.html')
def parsecategoryname(article):
names = article.get_category_tree()
@ -68,6 +77,22 @@ def loadarticletags(article):
}
@register.inclusion_tag('blog/sidebar.html')
def loadsidebartags():
recent_articles = Article.objects.filter(status='p')[:settings.SIDEBAR_ARTICLE_COUNT]
sidebar_categorys = Category.objects.all()
most_read_articles = Article.objects.filter(status='p').order_by('-views')[:settings.SIDEBAR_ARTICLE_COUNT]
dates = Article.objects.datetimes('created_time', 'month', order='DESC')
print(dates)
# tags=
return {
'recent_articles': recent_articles,
'sidebar_categorys': sidebar_categorys,
'most_read_articles': most_read_articles,
'article_dates': dates
}
"""
@register.tag
def parseCategoryName(parser,token):

3
blog/urls.py
Unescape View File

@ -14,10 +14,11 @@
"""
from django.conf.urls import url
from django.views.decorators.cache import cache_page
from . import views
urlpatterns = [
# url(r'^$', cache_page(60 * 15)(views.IndexView.as_view()), name='index'),
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^article/(?P<article_id>\d+)$', views.ArticleDetailView.as_view(), name='detail'),
url(r'^category/(?P<category_name>\w+)$', views.CategoryDetailView.as_view(), name='category_detail'),

8
templates/blog/articledetail.html
Unescape View File

@ -68,8 +68,10 @@
</nav>
</div><!-- /.blog-main -->
<div class="col-sm-3 col-sm-offset-1 blog-sidebar">
{% block sidebar %}
{% loadsidebartags %}
{% endblock %}
{% comment %} <div class="col-sm-3 col-sm-offset-1 blog-sidebar">
<div class="sidebar-module sidebar-module-inset">
<h4>About</h4>
<p>Etiam porta <em>sem malesuada magna</em> mollis euismod. Cras mattis consectetur purus sit amet
@ -100,7 +102,7 @@
<li><a href="#">Facebook</a></li>
</ol>
</div>
</div><!-- /.blog-sidebar -->
</div><!-- /.blog-sidebar -->{% endcomment %}
</div><!-- /.row -->
{% endblock %}

0
templates/blog/categorytree.html → templates/blog/breadcrumb.html
Unescape View File

74
templates/blog/index.html
Unescape View File

@ -14,7 +14,6 @@
{% endif %}
<div class="col-sm-8 blog-main">
{% for article in article_list %}
<div class="blog-post">
@ -30,8 +29,8 @@
by <a href="{{ article.author.get_absolute_url }}">{{ article.author }}</a>
<span class="views">{{ article.views }} views</span>
</p>
{{ article.summary|custom_markdown }}
{{ article.summary|custom_markdown }}
<p class="blog-read-more">
<a href="{{ article.get_absolute_url }}">
Read more
@ -87,39 +86,42 @@
</nav>
</div><!-- /.blog-main -->
<div class="col-sm-3 col-sm-offset-1 blog-sidebar">
<div class="sidebar-module sidebar-module-inset">
<h4>About</h4>
<p>Etiam porta <em>sem malesuada magna</em> mollis euismod. Cras mattis consectetur purus sit amet
fermentum. Aenean lacinia bibendum nulla sed consectetur.</p>
</div>
<div class="sidebar-module">
<h4>Archives</h4>
<ol class="list-unstyled">
<li><a href="#">March 2014</a></li>
<li><a href="#">February 2014</a></li>
<li><a href="#">January 2014</a></li>
<li><a href="#">December 2013</a></li>
<li><a href="#">November 2013</a></li>
<li><a href="#">October 2013</a></li>
<li><a href="#">September 2013</a></li>
<li><a href="#">August 2013</a></li>
<li><a href="#">July 2013</a></li>
<li><a href="#">June 2013</a></li>
<li><a href="#">May 2013</a></li>
<li><a href="#">April 2013</a></li>
</ol>
</div>
<div class="sidebar-module">
<h4>Elsewhere</h4>
<ol class="list-unstyled">
<li><a href="#">GitHub</a></li>
<li><a href="#">Twitter</a></li>
<li><a href="#">Facebook</a></li>
</ol>
</div>
</div><!-- /.blog-sidebar -->
{% block sidebar %}
{% loadsidebartags %}
{% endblock %}
{% comment %} {% block sidebar %}
<div class="col-sm-3 col-sm-offset-1 blog-sidebar">
<div class="sidebar-module sidebar-module-inset">
<h4>About</h4>
<p>Etiam porta <em>sem malesuada magna</em> mollis euismod. Cras mattis consectetur purus sit amet
fermentum. Aenean lacinia bibendum nulla sed consectetur.</p>
</div>
<div class="sidebar-module">
<h4>Archives</h4>
<ol class="list-unstyled">
<li><a href="#">March 2014</a></li>
<li><a href="#">February 2014</a></li>
<li><a href="#">January 2014</a></li>
<li><a href="#">December 2013</a></li>
<li><a href="#">November 2013</a></li>
<li><a href="#">October 2013</a></li>
<li><a href="#">September 2013</a></li>
<li><a href="#">August 2013</a></li>
<li><a href="#">July 2013</a></li>
<li><a href="#">June 2013</a></li>
<li><a href="#">May 2013</a></li>
<li><a href="#">April 2013</a></li>
</ol>
</div>
<div class="sidebar-module">
<h4>Elsewhere</h4>
<ol class="list-unstyled">
<li><a href="#">GitHub</a></li>
<li><a href="#">Twitter</a></li>
<li><a href="#">Facebook</a></li>
</ol>
</div>
</div><!-- /.blog-sidebar -->
{% endblock %}{% endcomment %}
</div><!-- /.row -->
{% endblock %}

62
templates/blog/sidebar.html
Unescape View File

@ -0,0 +1,62 @@
<div class="col-sm-3 col-sm-offset-1 blog-sidebar">
{% load blog_tags %}
<div class="sidebar-module sidebar-module-inset">
<h4>About</h4>
<p>Etiam porta <em>sem malesuada magna</em> mollis euismod. Cras mattis consectetur purus sit amet
fermentum. Aenean lacinia bibendum nulla sed consectetur.</p>
</div>
<div class="sidebar-module">
<h4>Most Viewed</h4>
<ol class="list-unstyled">
{% for m in most_read_articles %}
<li>
<a href="{{ m.get_absolute_url }}">{{ m.title }} ({{ m.views }} views) </a>
</li>
{% endfor %}
</ol>
</div>
<div class="sidebar-module">
<h4>Archives</h4>
<ol class="list-unstyled">
{% for d in article_dates %}
<li>
<a href="#">
{% datetimeformat d %}
</a>
</li>
{% endfor %}
</ol>
</div>
{% comment %} <div class="sidebar-module">
<h4>Archives</h4>
<ol class="list-unstyled">
<li><a href="#">March 2014</a></li>
<li><a href="#">February 2014</a></li>
<li><a href="#">January 2014</a></li>
<li><a href="#">December 2013</a></li>
<li><a href="#">November 2013</a></li>
<li><a href="#">October 2013</a></li>
<li><a href="#">September 2013</a></li>
<li><a href="#">August 2013</a></li>
<li><a href="#">July 2013</a></li>
<li><a href="#">June 2013</a></li>
<li><a href="#">May 2013</a></li>
<li><a href="#">April 2013</a></li>
</ol>
</div>{% endcomment %}
<div class="sidebar-module">
<h4>Elsewhere</h4>
<ol class="list-unstyled">
<li><a href="#">GitHub</a></li>
<li><a href="#">Twitter</a></li>
<li><a href="#">Facebook</a></li>
</ol>
</div>
</div><!-- /.blog-sidebar -->
Write Preview
Loading…
Cancel
Save