diff --git a/.gitignore b/.gitignore
index 6f9851c..1253596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ tx_*.jpg
*/migrations/*
*.swp
*.un~
+.idea
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..35a25b2
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..c912f2a
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vmaig_blog.iml b/.idea/vmaig_blog.iml
new file mode 100644
index 0000000..370d631
--- /dev/null
+++ b/.idea/vmaig_blog.iml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..9c9f4d7
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1593877104483
+
+
+ 1593877104483
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/blog/models.py b/blog/models.py
index fa8f801..7c10429 100644
--- a/blog/models.py
+++ b/blog/models.py
@@ -39,7 +39,7 @@ class Nav(models.Model):
name = models.CharField(max_length=40, verbose_name=u'导航条内容')
url = models.CharField(max_length=200, blank=True, null=True,
verbose_name=u'指向地址')
-
+ rank = models.IntegerField(default=0, verbose_name=u'排序')
status = models.IntegerField(default=0, choices=STATUS.items(),
verbose_name=u'状态')
create_time = models.DateTimeField(u'创建时间', auto_now_add=True)
diff --git a/blog/static/img/article/default.jpg b/blog/static/img/article/default.jpg
index 41d4add..c5d709a 100644
Binary files a/blog/static/img/article/default.jpg and b/blog/static/img/article/default.jpg differ
diff --git a/blog/static/img/article/docker1.jpg b/blog/static/img/article/docker1.jpg
new file mode 100644
index 0000000..317a9fe
Binary files /dev/null and b/blog/static/img/article/docker1.jpg differ
diff --git a/blog/static/img/article/linux1.jpg b/blog/static/img/article/linux1.jpg
new file mode 100644
index 0000000..5ba74dc
Binary files /dev/null and b/blog/static/img/article/linux1.jpg differ
diff --git a/blog/static/img/article/mysql1.jpg b/blog/static/img/article/mysql1.jpg
new file mode 100644
index 0000000..de0afef
Binary files /dev/null and b/blog/static/img/article/mysql1.jpg differ
diff --git a/blog/static/img/article/python1.jpg b/blog/static/img/article/python1.jpg
new file mode 100644
index 0000000..4c816f1
Binary files /dev/null and b/blog/static/img/article/python1.jpg differ
diff --git a/blog/static/img/article/redis0.jpg b/blog/static/img/article/redis0.jpg
new file mode 100644
index 0000000..4b31dbf
Binary files /dev/null and b/blog/static/img/article/redis0.jpg differ
diff --git a/blog/static/img/article/redis1.jpg b/blog/static/img/article/redis1.jpg
new file mode 100644
index 0000000..b41b1c9
Binary files /dev/null and b/blog/static/img/article/redis1.jpg differ
diff --git a/blog/static/img/article/shell1.jpg b/blog/static/img/article/shell1.jpg
new file mode 100644
index 0000000..ab4e374
Binary files /dev/null and b/blog/static/img/article/shell1.jpg differ
diff --git a/blog/static/img/article/windows1.jpg b/blog/static/img/article/windows1.jpg
new file mode 100644
index 0000000..ed18172
Binary files /dev/null and b/blog/static/img/article/windows1.jpg differ
diff --git a/blog/static/img/article/zabbix1.jpg b/blog/static/img/article/zabbix1.jpg
new file mode 100644
index 0000000..c735dbf
Binary files /dev/null and b/blog/static/img/article/zabbix1.jpg differ
diff --git a/blog/static/img/bg.jpg b/blog/static/img/bg.jpg
index d163b6b..71b6793 100644
Binary files a/blog/static/img/bg.jpg and b/blog/static/img/bg.jpg differ
diff --git a/blog/static/img/favicon.ico b/blog/static/img/favicon.ico
index 702d0a7..c4267fa 100644
Binary files a/blog/static/img/favicon.ico and b/blog/static/img/favicon.ico differ
diff --git a/blog/static/img/myself/wx.png b/blog/static/img/myself/wx.png
new file mode 100644
index 0000000..45eed80
Binary files /dev/null and b/blog/static/img/myself/wx.png differ
diff --git a/blog/static/tx/cat1.jpg b/blog/static/tx/cat1.jpg
new file mode 100644
index 0000000..376de0a
Binary files /dev/null and b/blog/static/tx/cat1.jpg differ
diff --git a/blog/static/tx/cat2.jpg b/blog/static/tx/cat2.jpg
new file mode 100644
index 0000000..05c52d3
Binary files /dev/null and b/blog/static/tx/cat2.jpg differ
diff --git a/blog/static/tx/cat3.jpg b/blog/static/tx/cat3.jpg
new file mode 100644
index 0000000..e11aad4
Binary files /dev/null and b/blog/static/tx/cat3.jpg differ
diff --git a/blog/static/tx/cat4.jpg b/blog/static/tx/cat4.jpg
new file mode 100644
index 0000000..b394611
Binary files /dev/null and b/blog/static/tx/cat4.jpg differ
diff --git a/blog/static/tx/default.jpg b/blog/static/tx/default.jpg
new file mode 100644
index 0000000..1c463c6
Binary files /dev/null and b/blog/static/tx/default.jpg differ
diff --git a/blog/static/tx/dog1.jpg b/blog/static/tx/dog1.jpg
new file mode 100644
index 0000000..b023312
Binary files /dev/null and b/blog/static/tx/dog1.jpg differ
diff --git a/blog/static/tx/dog2.jpg b/blog/static/tx/dog2.jpg
new file mode 100644
index 0000000..1ce986c
Binary files /dev/null and b/blog/static/tx/dog2.jpg differ
diff --git a/blog/static/tx/dog3.jpg b/blog/static/tx/dog3.jpg
new file mode 100644
index 0000000..d0c0841
Binary files /dev/null and b/blog/static/tx/dog3.jpg differ
diff --git a/blog/static/tx/pig1.jpg b/blog/static/tx/pig1.jpg
new file mode 100644
index 0000000..a82f2e4
Binary files /dev/null and b/blog/static/tx/pig1.jpg differ
diff --git a/blog/static/tx/tx-default.jog b/blog/static/tx/tx-default.jog
new file mode 100644
index 0000000..b023312
Binary files /dev/null and b/blog/static/tx/tx-default.jog differ
diff --git a/blog/templates/blog/all.html b/blog/templates/blog/all.html
index c14299a..9dcd4bf 100644
--- a/blog/templates/blog/all.html
+++ b/blog/templates/blog/all.html
@@ -23,7 +23,10 @@
+
- {% include "blog/widgets/tags_cloud.html"%}
+ {% include "blog/widgets/my_info.html"%}
{% include "blog/widgets/search.html"%}
{% include "blog/widgets/hotest_posts.html"%}
{% include "vmaig_comments/latest_comments.html"%}
diff --git a/blog/templates/blog/article.html b/blog/templates/blog/article.html
index 572da5f..2bd218f 100644
--- a/blog/templates/blog/article.html
+++ b/blog/templates/blog/article.html
@@ -47,7 +47,7 @@
{{article.title}}
- {% include "blog/widgets/tags_cloud.html"%}
+ {% include "blog/widgets/my_info.html"%}
{% include "blog/widgets/search.html"%}
{% include "blog/widgets/hotest_posts.html"%}
{% include "vmaig_comments/latest_comments.html"%}
diff --git a/blog/templates/blog/base.html b/blog/templates/blog/base.html
index 7c4f7be..27420c2 100644
--- a/blog/templates/blog/base.html
+++ b/blog/templates/blog/base.html
@@ -5,7 +5,15 @@
-
{{website_title}}
+ {% if article %}
+ {{article.category.name}}-{{article.title}}
+
+
+ {% else %}
+ {{website_title}}
+
+
+ {% endif %}
{% compress css %}
@@ -36,7 +44,8 @@
diff --git a/blog/templates/blog/category.html b/blog/templates/blog/category.html
index 3b5b58c..c98c27e 100644
--- a/blog/templates/blog/category.html
+++ b/blog/templates/blog/category.html
@@ -19,7 +19,7 @@
{% endif %}
- {% include "blog/widgets/tags_cloud.html"%}
+ {% include "blog/widgets/my_info.html"%}
{% include "blog/widgets/search.html"%}
{% include "blog/widgets/hotest_posts.html"%}
{% include "vmaig_comments/latest_comments.html"%}
diff --git a/blog/templates/blog/column.html b/blog/templates/blog/column.html
index b23b2e1..73b7912 100644
--- a/blog/templates/blog/column.html
+++ b/blog/templates/blog/column.html
@@ -29,7 +29,7 @@
- {% include "blog/widgets/tags_cloud.html"%}
+ {% include "blog/widgets/my_info.html"%}
{% include "blog/widgets/search.html"%}
{% include "blog/widgets/hotest_posts.html"%}
{% include "vmaig_comments/latest_comments.html"%}
diff --git a/blog/templates/blog/include/all_post.html b/blog/templates/blog/include/all_post.html
index 9a14d10..259268a 100644
--- a/blog/templates/blog/include/all_post.html
+++ b/blog/templates/blog/include/all_post.html
@@ -44,6 +44,10 @@
+
+
+ {{post.rank}}
+
{{post.pub_time|date:"Y-m-d" }}
diff --git a/blog/templates/blog/include/nav.html b/blog/templates/blog/include/nav.html
index af37f9b..25d90a0 100644
--- a/blog/templates/blog/include/nav.html
+++ b/blog/templates/blog/include/nav.html
@@ -32,13 +32,7 @@
全部文章
-
-
-
- 资讯
-
-
-
+
{% if nav_list%}
{% for nav in nav_list%}
@@ -69,6 +63,7 @@
{{notification_count}}