Signed-off-by: zry <admin@z-touhou.org>

templates/home/post.edit.html

@@ -20,6 +20,9 @@
 {% endblock %}
 
 {% block content %}
+<div class="alert alert-info">
+	内容支持使用{{zumdownver}}书写，渲染引擎为{{rnginver}}
+</div>
 <form class="form-horizontal" role="form" action="" method="POST">
 	{% csrf_token %}
     {% for item in form %}
@@ -32,7 +35,8 @@
 	{% endfor %}
 	<div class="form-group">
 		<div class="col-md-offset-1 col-md-10">
-			<button type="submit" class="btn btn-primary btn-lg">提交更改</button>
+			<button class="btn btn-primary btn-lg" onclick="esubmit();">提交更改</button>
+			<button class="btn btn-info btn-lg" onclick="zumdown_preview();">先行预览</button>
 		</div>
 	</div>
 </form>
@@ -43,5 +47,17 @@
           preserveSelectionOnMove: 'moved',
           moveOnSelect: false,
     });
+
+    function zumdown_preview(){
+		$("#mainform").attr('action','{% siteurl "inabar" %}');
+		$("#mainform").attr('target','_blank');
+		$("#mainform").submit();
+    }
+
+    function esubmit(){
+    	$("#mainform").attr('action','');
+		$("#mainform").attr('target','_self');
+		$("#mainform").submit();
+    }
 </script>
 {% endblock %}

views/posts.py

@@ -11,8 +11,9 @@ from django.contrib import messages
 from siteutil.DataConvert import str2int,CheckPOST,str2long,BigIntUniqueID,MakeSummary,TIIHASH
 from siteutil.CommonPaginator import SelfPaginator
 from siteutil.CommonFilter import CommonFilter,FilterCondition
-from siteutil.htmlutil import renderPichuMarkDown as renderMarkdownSafety
+#from siteutil.htmlutil import renderPichuMarkDown as renderMarkdownSafety
 from siteutil.redisconf import RedisConfigHandler
+from siteutil.InabaR.renderer import BlogRender,getver
 from zlogin.common.JsonResponse import JsonResponse
 from zlogin.decorators import login_detect,login_required,PermNeed
 from zlogin import zlauth
@@ -268,7 +269,8 @@ def PostEdit(request,ID):
 		form = EditPostForm(request.POST,instance=bpo)
 		if form.is_valid():
 			nbp = form.save(commit=False)
-			nbp.html = renderMarkdownSafety(nbp.markdown)
+			#nbp.html = renderMarkdownSafety(nbp.markdown)
+			nbp.html = BlogRender(nbp.markdown,html=False,traceback=False)
 			nbp.rendered = True
 			nbp.save()
 			form.save_m2m()
@@ -278,9 +280,12 @@ def PostEdit(request,ID):
 				return HttpResponseRedirect(reverse('pichublog_postabklist'))
 	else:
 		form = EditPostForm(instance=bpo)
+	ver = getver()
 	kwvars = {
 		"request":request,
 		'form':form,
+		'rnginver':ver[0],
+		'zumdownver':ver[1],
 		'rfm':request.REQUEST.get("rfm"),
 	}
 	return render_to_response('home/post.edit.html',kwvars,RequestContext(request))