Merge branch 'dev' into sxw-dev

2015-08-10 17:03:00 +08:00
parent 70a77cccc8 e55997065f
commit 91add6e1e0
11 changed files with 372 additions and 10 deletions
--- a/template/oj/announcement/announcement.html
+++ b/template/oj/announcement/announcement.html
@@ -0,0 +1,23 @@
+{% extends "oj_base.html" %}
+
+{% block body %}
+<div class="container main">
+    <h1 class="text-center">{{ announcement.title }}</h1>
+
+    <p class="text-muted text-center">
+        作者：{{ announcement.created_by }}
+        &nbsp;&nbsp;&nbsp;
+        创建时间：{{ announcement.create_time }}
+        {% ifequal announcement.create_time announcement.last_update_time %}
+        {% else %}
+        &nbsp;&nbsp;&nbsp;
+        最后更新：{{ announcement.last_update_time }}
+        {% endifequal %}
+    </p>
+
+
+    <div>
+        <p>{{ announcement.content|safe }}</p>
+    </div>
+</div>
+{% endblock %}