From e8aa9b1399bc96b1059cb199534296b7783ead1e Mon Sep 17 00:00:00 2001 From: yangjian Date: Wed, 18 Dec 2019 21:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AC=E5=9C=B0=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=8F=92=E5=85=A5=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=AB=99=E7=82=B9=E7=89=88=E6=9C=AC=E5=8F=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 6 ++++++ MrDoc/settings.py | 2 ++ app_admin/context_processors.py | 3 +++ static/mrdoc.css | 1 - template/app_admin/admin_doc.html | 2 +- template/app_admin/admin_doctemp.html | 2 +- template/app_admin/admin_project.html | 2 +- template/app_doc/create_base.html | 7 ++++++- template/app_doc/docs_base.html | 4 ++-- 9 files changed, 22 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7185679..c7d1f82 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,11 @@ ## 版本更新记录 +### v0.2.6 2019-12-18 + +- 优化文档编写页面布局； +- 添加文档编写页面可插入本地文本文件内容的功能； +- 添加站点版本号信息 + ### v0.2.5 - 添加文档的草稿功能； diff --git a/MrDoc/settings.py b/MrDoc/settings.py index 9f5ffd2..de9e6fb 100644 --- a/MrDoc/settings.py +++ b/MrDoc/settings.py @@ -25,6 +25,8 @@ SECRET_KEY = '5&71mt9@^58zdg*_!t(x6g14q*@84d%ptr%%s6e0l50zs0we3d' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False +VERSIONS = '0.2.6' + ALLOWED_HOSTS = ['*'] diff --git a/app_admin/context_processors.py b/app_admin/context_processors.py index 0bc4640..53a548e 100644 --- a/app_admin/context_processors.py +++ b/app_admin/context_processors.py @@ -4,10 +4,13 @@ # #日期：2019/11/16 # 博客地址：zmister.com from app_admin.models import SysSetting +from django.conf import settings # 系统设置 - 上下文变量 def sys_setting(request): setting_dict = dict() + # 设置网站版本 + setting_dict['mrdoc_version'] = settings.VERSIONS # 获取系统设置状态 datas = SysSetting.objects.filter(types="basic") for data in datas: diff --git a/static/mrdoc.css b/static/mrdoc.css index bea1c45..86d81e4 100644 --- a/static/mrdoc.css +++ b/static/mrdoc.css @@ -263,7 +263,6 @@ li.active > a,li.active > div > a{ border-top: 1px solid #dcdcdc; margin-top: 10px; font-size: 12px; - text-align:center; } .doc-header { font-family: helvetica neue,Helvetica,Arial,sans-serif; diff --git a/template/app_admin/admin_doc.html b/template/app_admin/admin_doc.html index 7945ed0..8437b28 100644 --- a/template/app_admin/admin_doc.html +++ b/template/app_admin/admin_doc.html @@ -69,7 +69,7 @@ 当前页： {{ docs.number }} 共 {{ docs.paginator.num_pages }} 页 {% if docs.has_next %} - 下一页 + 下一页 {% endif %} diff --git a/template/app_admin/admin_doctemp.html b/template/app_admin/admin_doctemp.html index 9c45884..cb20c4e 100644 --- a/template/app_admin/admin_doctemp.html +++ b/template/app_admin/admin_doctemp.html @@ -60,7 +60,7 @@ 当前页： {{ doctemps.number }} 共 {{ doctemps.paginator.num_pages }} 页 {% if doctemps.has_next %} - 下一页 + 下一页 {% endif %} diff --git a/template/app_admin/admin_project.html b/template/app_admin/admin_project.html index 18121b6..76f3127 100644 --- a/template/app_admin/admin_project.html +++ b/template/app_admin/admin_project.html @@ -69,7 +69,7 @@ 当前页： {{ projects.number }} 共 {{ projects.paginator.num_pages }} 页 {% if projects.has_next %} - 下一页 + 下一页 {% endif %} diff --git a/template/app_doc/create_base.html b/template/app_doc/create_base.html index fa4ea89..cdc5c8c 100644 --- a/template/app_doc/create_base.html +++ b/template/app_doc/create_base.html @@ -11,9 +11,14 @@ {% block title %}{% endblock %} - MrDoc - + + {% block custom_style %}{% endblock %} + diff --git a/template/app_doc/docs_base.html b/template/app_doc/docs_base.html index b5dd451..d23ea8c 100644 --- a/template/app_doc/docs_base.html +++ b/template/app_doc/docs_base.html @@ -15,7 +15,7 @@ - +