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

master to dev #333

Merged
merged 6 commits into from
Jan 26, 2021
Merged

master to dev #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2bdabbe
Merge pull request #321 from newpanjing/dev
newpanjing Nov 30, 2020
f0c69db
Adds autofocus to the username input field.
emorozov Dec 1, 2020
20b2307
Fixes issue with Vue breaking on log entries resembling mustache temp…
emorozov Dec 3, 2020
477641f
Update README.md
newpanjing Dec 7, 2020
8d7dee6
Merge pull request #324 from emorozov/vue-escaping
newpanjing Jan 26, 2021
b7399f6
Merge pull request #323 from emorozov/master
newpanjing Jan 26, 2021
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea/
django_simpleui.egg-info
dist
build
/simpleui.egg-info/
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Django admin theme the simpleui

---
<p align="center">
<a href="https://simpleui.88cto.com/docs/simpleui" target="_blank">文档</a> |
<a href="https://simpleui.88cto.com/docs/simpleui" target="_blank">Documents</a>
<a href="https://simpleui.72wo.com/docs/simpleui" target="_blank">文档</a> |
<a href="https://simpleui.72wo.com/docs/simpleui" target="_blank">Documents</a>
</p>
---
<a href="https://www.88cto.com/admin/">
Expand Down Expand Up @@ -67,11 +67,11 @@ Django Admin默认界面设计语言存在着的一些不足，比如色彩单

👇👇👇👇👇👇👇👇👇👇👇

👉 1.[simpleui文档教程使用说明](https://simpleui.88cto.com/docs/simpleui) 👈
👉 1.[simpleui文档教程使用说明](https://simpleui.72wo.com/docs/simpleui) 👈

👉 2.[simpleui文档教程使用说明](https://simpleui.88cto.com/docs/simpleui)👈
👉 2.[simpleui文档教程使用说明](https://simpleui.72wo.com/docs/simpleui)👈

👉 3.[simpleui文档教程使用说明](https://simpleui.88cto.com/docs/simpleui)👈
👉 3.[simpleui文档教程使用说明](https://simpleui.72wo.com/docs/simpleui)👈

👆👆👆👆👆👆👆👆👆👆👆

Expand Down
2 changes: 1 addition & 1 deletion simpleui/templates/admin/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<el-timeline-item timestamp="{{ entry.action_time }}" placement="top">
<el-card>
<p>{{ entry.user }} {{ entry.action_time }}</p>
<h4>{{ entry.content_type }}: {{ entry }}</h4>
<h4 v-pre="true">{{ entry.content_type }}: {{ entry }}</h4>
</el-card>
</el-timeline-item>
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion simpleui/templates/admin/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
{% csrf_token %}
<div class="simpleui-input-inline">
<el-input prefix-icon="fas fa-user" v-model="username" name="username"
placeholder="{% trans 'username' %}"></el-input>
placeholder="{% trans 'username' %}" autofocus></el-input>
</div>
<div class="simpleui-input-inline">
<el-input prefix-icon="fas fa-lock" type="password" v-model="password" name="password"
Expand Down