Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v2.0.1 #10

Merged
merged 5 commits into from
Feb 24, 2020
Merged

v2.0.1 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e04fc7b
替换cdn连接
gojuukaze Feb 24, 2020
0dc594b
修改初始文章
gojuukaze Feb 24, 2020
de85ba1
替换cdn连接
gojuukaze Feb 24, 2020
5145d2e
修改初始文章
gojuukaze Feb 24, 2020
ba127db
替换cdn连接
gojuukaze Feb 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/migrations/0002_auto_20180716_1327.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def init_content(apps, schema_editor):

Article = apps.get_model("app", "Article")
a = Article.objects.create(title='欢迎使用DeerU',
content='<p><img src="%s" data-name="logo_black.png" data-id="2" style="width: 229px;" class="fr-fic fr-dib"></p><p><br></p><hr><p style="text-align: center;"><br></p><p style="text-align: center;"><span style="font-size: 18px;"><strong>感谢你使用DeerU<span class="fr-emoticon fr-deletable">😀</span> </strong> </span></p><p style="text-align: center;"><strong><span style="font-size: 18px;">DeerU是一个免费开源的博客系统</span></strong></p><p style="text-align: center;"><br></p><p style="text-align: center;"><strong><span style="font-size: 18px;">为什么使用DeerU ？</span></strong></p><p style="text-align: center;"><strong><span style="font-size: 18px;">1. <strong><span style="font-size: 18px;">DeerU</span></strong>更适合程序员 </span> </strong></p><p style="text-align: center;"><strong><span style="font-size: 18px;">（它所有的配置均采用json格式进行配置） </span></strong></p><p style="text-align: center;"><strong><span style="font-size: 18px;">2. DeerU对前端开发人员更友好 </span></strong></p><p style="text-align: center;"><strong><span style="font-size: 18px;">（它为每个页面都提供了返回json数据的接口，你可以不依赖Django模板开发主题）</span></strong></p><p style="text-align: center;"><br></p><p style="text-align: center;"><strong><span style="font-size: 18px;">如果你有什么问题或者建议欢迎联系反馈给我</span></strong></p><p style="text-align: center;"><br></p><p style="text-align: center;"><strong><span style="font-size: 18px;">GITHUB: </span></strong><a href="https://github.com/gojuukaze/DeerU" rel="noopener noreferrer" target="_blank"><strong><span style="font-size: 18px;">https://github.com/gojuukaze/DeerU</span></strong></a></p><p style="text-align: center;"><strong><span style="font-size: 18px;">Documentation: <a class="fr-strong" data-fr-linked="true" href="https://deeru.readthedocs.io​​​" rel="noopener noreferrer" target="_blank">https://deeru.readthedocs.io</a></span></strong></p><p style="text-align: center;"><strong><span style="font-size: 18px;">插件主题: <a class="fr-strong" data-fr-linked="true" href="https://github.com/gojuukaze/deeru_plugin_theme" rel="noopener noreferrer" target="_blank">https://github.com/gojuukaze/deeru_plugin_theme</a></span></strong></p>' % logo_black.img.url,
content='<p><img src="%s" data-name="logo_black.png" data-id="2" style="width: 229px;" class="fr-fic fr-dib"></p><p> <br></p><hr><p style="text-align: center;"> <br></p><p style="text-align: center;"><span style="font-size: 18px;"><strong>感谢你使用DeerU<span class="fr-emoticon fr-deletable">😀</span>&nbsp;</strong>&nbsp;</span></p><p style="text-align: center;"><strong><span style="font-size: 18px;">DeerU是一个免费开源的博客系统</span></strong></p><p style="text-align: center;"> <br></p><p style="text-align: center;"><strong><span style="font-size: 18px;">如果你有什么问题或者建议欢迎联系反馈给我</span></strong></p><p style="text-align: center;"> <br></p><p style="text-align: center;"><strong><span style="font-size: 18px;">文档:<a class="fr-strong" data-fr-linked="true" href="https://deeru.readthedocs.io​​​" rel="noopener noreferrer" target="_blank">https://deeru.readthedocs.io</a></span></strong></p><p style="text-align: center;"><strong><span style="font-size: 18px;"><strong>GITHUB:&nbsp;</strong><a href="https://github.com/gojuukaze/DeerU" rel="noopener noreferrer" target="_blank"><strong>https://github.com/gojuukaze/DeerU</strong></a></span></strong></p>' % logo_black.img.url,
summary='欢迎你使用DeerU😀<br>DeerU是一个免费开源的博客系统<br>如果你有什么问题或者建议欢迎联系反馈给我<br>...',
image=deeru_green.img.url
)
Expand Down
5 changes: 2 additions & 3 deletions app/templates/app/admin/article_title.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script src="https://cdn.bootcss.com/clipboard.js/2.0.1/clipboard.min.js"></script>
<script src="https://cdn.bootcss.com/layer/3.1.0/layer.js"></script>

<script src="https://lib.baomitu.com/layer/3.1.1/layer.js"></script>
<script src="https://cdn.staticfile.org/clipboard.js/2.0.1/clipboard.min.js"></script>
<div>
<strong style="font-size: 18px;"><a
href="{% url 'admin:app_article_change' article.id %}">{{ article.title }}</a></strong>
Expand Down
5 changes: 2 additions & 3 deletions app/templates/app/admin/flatpage_title.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<script src="https://cdn.bootcss.com/clipboard.js/2.0.1/clipboard.min.js"></script>
<script src="https://cdn.bootcss.com/layer/3.1.0/layer.js"></script>

<script src="https://lib.baomitu.com/layer/3.1.1/layer.js"></script>
<script src="https://cdn.staticfile.org/clipboard.js/2.0.1/clipboard.min.js"></script>
<div>
<strong style="font-size: 18px;"><a
href="{% url 'admin:app_flatpage_change' flatpage.id %}">{{ flatpage.title }}</a></strong>
Expand Down
2 changes: 2 additions & 0 deletions base_theme/static/base_theme/js/layer.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 4 additions & 7 deletions base_theme/templates/base_theme/detail_article.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@

{% block head_static %}
<title>{{ article.title }} |{{ config.v2_blog_config.title }}</title>
{# <link href="https://cdn.staticfile.org/jodit/3.2.55/jodit.min.css" rel="stylesheet">#}
<link href="{% static '/base_theme/css/jodit.es2018.min.css' %}" rel="stylesheet">
<link href="https://cdn.bootcss.com/froala-editor/2.8.1/css/froala_style.min.css" rel="stylesheet">
{# <script src="https://cdn.bootcss.com/jodit/3.1.94/jodit.min.js"></script>#}
{# <script src="https://cdn.staticfile.org/jodit/3.2.55/jodit.min.js"></script>#}
<link href="https://cdn.staticfile.org/froala-editor/2.9.5/css/froala_style.min.css" rel="stylesheet">
<script src="{% static '/base_theme/js/jodit.es2018.min.js' %}"></script>

<script src="https://cdn.bootcss.com/layer/3.1.0/layer.js"></script>
<script src="https://cdn.bootcss.com/clipboard.js/2.0.1/clipboard.min.js"></script>
<script src="https://cdn.bootcss.com/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
<script src="https://lib.baomitu.com/layer/3.1.1/layer.js"></script>
<script src="https://cdn.staticfile.org/clipboard.js/2.0.1/clipboard.min.js"></script>
<script src="https://cdn.staticfile.org/jquery.qrcode/1.0/jquery.qrcode.min.js"></script>
<script src="{% static '/base_theme/js/base_theme.js' %}"></script>

{% endblock %}
Expand Down
6 changes: 6 additions & 0 deletions docs/source/change_log.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Change Log
============

2.0.1
---------

* 替换主题中的cdn连接
* 修改初始文章

2.0.0
---------

Expand Down