diff --git a/captrue/mrdoc-admin-register-code.png b/captrue/mrdoc-admin-register-code.png deleted file mode 100644 index 2271b55..0000000 Binary files a/captrue/mrdoc-admin-register-code.png and /dev/null differ diff --git a/captrue/mrdoc-admin-settings.png b/captrue/mrdoc-admin-settings.png deleted file mode 100644 index a1bc573..0000000 Binary files a/captrue/mrdoc-admin-settings.png and /dev/null differ diff --git a/captrue/mrdoc-admin-user.png b/captrue/mrdoc-admin-user.png deleted file mode 100644 index cf5ad66..0000000 Binary files a/captrue/mrdoc-admin-user.png and /dev/null differ diff --git a/captrue/mrdoc-create-doc-create-project.png b/captrue/mrdoc-create-doc-create-project.png deleted file mode 100644 index dda3289..0000000 Binary files a/captrue/mrdoc-create-doc-create-project.png and /dev/null differ diff --git a/captrue/mrdoc-create-doc-select-temp.png b/captrue/mrdoc-create-doc-select-temp.png deleted file mode 100644 index fbf5ca0..0000000 Binary files a/captrue/mrdoc-create-doc-select-temp.png and /dev/null differ diff --git a/captrue/mrdoc-create-doc.png b/captrue/mrdoc-create-doc.png deleted file mode 100644 index 5d036dd..0000000 Binary files a/captrue/mrdoc-create-doc.png and /dev/null differ diff --git a/captrue/mrdoc-doc-closeleft.png b/captrue/mrdoc-doc-closeleft.png deleted file mode 100644 index fa7ea95..0000000 Binary files a/captrue/mrdoc-doc-closeleft.png and /dev/null differ diff --git a/captrue/mrdoc-doc.png b/captrue/mrdoc-doc.png deleted file mode 100644 index 4278759..0000000 Binary files a/captrue/mrdoc-doc.png and /dev/null differ diff --git a/captrue/mrdoc-login.png b/captrue/mrdoc-login.png deleted file mode 100644 index 66b63cc..0000000 Binary files a/captrue/mrdoc-login.png and /dev/null differ diff --git a/captrue/mrdoc-manage-attachment.png b/captrue/mrdoc-manage-attachment.png deleted file mode 100644 index 5d4119a..0000000 Binary files a/captrue/mrdoc-manage-attachment.png and /dev/null differ diff --git a/captrue/mrdoc-manage-doc.png b/captrue/mrdoc-manage-doc.png deleted file mode 100644 index bbb4aef..0000000 Binary files a/captrue/mrdoc-manage-doc.png and /dev/null differ diff --git a/captrue/mrdoc-manage-doctemp.png b/captrue/mrdoc-manage-doctemp.png deleted file mode 100644 index ca18f14..0000000 Binary files a/captrue/mrdoc-manage-doctemp.png and /dev/null differ diff --git a/captrue/mrdoc-manage-project.png b/captrue/mrdoc-manage-project.png deleted file mode 100644 index dbd41ff..0000000 Binary files a/captrue/mrdoc-manage-project.png and /dev/null differ diff --git a/captrue/mrdoc-manage-token.png b/captrue/mrdoc-manage-token.png deleted file mode 100644 index af1c6c3..0000000 Binary files a/captrue/mrdoc-manage-token.png and /dev/null differ diff --git a/captrue/mrdoc-project-index.png b/captrue/mrdoc-project-index.png deleted file mode 100644 index 4e760c4..0000000 Binary files a/captrue/mrdoc-project-index.png and /dev/null differ diff --git a/captrue/mrdoc-register.png b/captrue/mrdoc-register.png deleted file mode 100644 index bc1802d..0000000 Binary files a/captrue/mrdoc-register.png and /dev/null differ diff --git a/MONACO.TTF b/static/MONACO.TTF similarity index 100% rename from MONACO.TTF rename to static/MONACO.TTF diff --git a/template/app_doc/modify_doc.html b/template/app_doc/modify_doc.html index fd83ee4..7e6a201 100644 --- a/template/app_doc/modify_doc.html +++ b/template/app_doc/modify_doc.html @@ -92,7 +92,9 @@
- + +
+
{% endblock %} @@ -250,6 +252,7 @@ area:['530px','300px'], }); }); + // 插入历史版本 insertHistory = function(doc_id,history_id){ layer.load(1); var url = "{% url 'diff_doc' 0 1 %}"; @@ -262,6 +265,37 @@ layer.msg(r.data) } }); + }; + delDoc = function(doc_id){ + layer.open({ + type:1, + title:'删除文档', + area:'300px;', + id:'delPro',//配置ID + content:'
警告：此操作将删除此文档！
', + btn:['确定','取消'], //添加按钮 + btnAlign:'c', //按钮居中 + yes:function (index,layero) { + layer.load(1); + data = { + 'doc_id':{{ doc.id }}, + } + $.post("{% url 'del_doc' %}",data,function(r){ + layer.closeAll('loading') + if(r.status){ + //修改成功 + layer.msg("文档已删除，即将跳转至文集") + // window.location.reload(); + window.location.href = "{% url 'pro_index' doc.top_doc %}" + //layer.close(index) + }else{ + //修改失败，提示 + // console.log(r) + layer.msg(r.data) + } + }) + }, + }); } {% endblock %} diff --git a/template/app_doc/pro_list.html b/template/app_doc/pro_list.html index 9716788..05b19c8 100644 --- a/template/app_doc/pro_list.html +++ b/template/app_doc/pro_list.html @@ -146,7 +146,7 @@

作者：{{p.create_user}}

-

最新：{{p.id | get_new_doc}}

+

最新：{{p.id | get_new_doc}}

简介： {% if p.intro == "" %} 此文集没有填写简介