Skip to content

Commit 1675ed4

Browse files
committed
jinja2 template: added SimpleMDE editor for markdown editing
1 parent 604d750 commit 1675ed4

File tree

7 files changed

+104
-13
lines changed

7 files changed

+104
-13
lines changed

CHANGES.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ Features:
5858
property 'messages.author' is not allowed (because 'messages' is a
5959
multilink). A multilink at the end (e.g. messages in the example) is
6060
fine.
61-
- Added markdown rendering using either markdown or markdown2.
62-
(Christof Meerwald)
61+
- Added markdown rendering using markdown, markdown2 or mistune; use
62+
SimpleMDE markdown editor in jinja2 template (Christof Meerwald)
6363
- Allow filtering by multiple date ranges or empty date. Date ranges are
6464
separated by comma, an empty date is represented by '-'
6565

share/roundup/templates/jinja2/html/issue.item.html

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,38 @@
1818
{% endif %}
1919
{% endblock %}
2020

21-
{% block content %}
21+
{% block extracss %}
22+
{% if context.is_edit_ok() %}
23+
<link rel="stylesheet" type="text/css" href="@@file/simplemde.min.css">
24+
{% endif %}
25+
{% endblock %}
26+
27+
{% block extrajs %}
28+
{% if context.is_edit_ok() %}
29+
<script src='@@file/simplemde.min.js'></script>
30+
<script type="text/javascript">
31+
(function () {
32+
var node = $('#change_note')[0];
33+
var initSimpleMde = function () {
34+
node.parentNode.appendChild($('<input/>', { type: 'hidden', name: 'msg-1@type', value: 'text/markdown'})[0]);
35+
var simplemde = new SimpleMDE({ element: node, status: false, styleSelectedText: false });
36+
simplemde.render();
37+
};
38+
{% if context.id %}
39+
if (node.value) {
40+
initSimpleMde();
41+
} else {
42+
node.addEventListener('focus', initSimpleMde);
43+
}
44+
{% else %}
45+
initSimpleMde();
46+
{% endif %}
47+
}) ();
48+
</script>
49+
{% endif %}
50+
{% endblock %}
2251

52+
{% block content %}
2353
{% include 'layout/permission.html' %}
2454

2555
{% if context.is_view_ok() %}
@@ -69,13 +99,18 @@ <h4>Messages</h4>
6999
</div>
70100
</div>
71101
<div>
72-
<pre>{{ msg.content.hyperlinked()|u|safe }}</pre>
102+
{% if msg.type == 'text/markdown' %}
103+
<div class="msg">{{ msg.content.markdown()|u|safe }}</div>
104+
{% elif msg.type == 'text/x-rst' %}
105+
<div class="msg">{{ msg.content.rst()|u|safe }}</div>
106+
{% else %}
107+
<pre class="msg">{{ msg.content.hyperlinked()|u|safe }}</pre>
108+
{% endif %}
73109
</div>
74110
{% endfor %}
75111
{% endif %}
76112

77113
<div class='vspace-five'></div>
78114

79115
{{ context.history()|u|safe }}
80-
81116
{% endblock %}

share/roundup/templates/jinja2/html/msg.index.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@
2727
</div>
2828
</dl>
2929
<div>
30-
<pre>{{ msg.content.hyperlinked()|u|safe }}</pre>
30+
{% if msg.type == 'text/markdown' %}
31+
<div class="msg">{{ msg.content.markdown()|u|safe }}</div>
32+
{% elif msg.type == 'text/x-rst' %}
33+
<div class="msg">{{ msg.content.rst()|u|safe }}</div>
34+
{% else %}
35+
<pre class="msg">{{ msg.content.hyperlinked()|u|safe }}</pre>
36+
{% endif %}
3137
</div>
3238
</div>
3339
<hr>

share/roundup/templates/jinja2/html/msg.item.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@
4141
</dl>
4242
<div>
4343
<h4>Content</h4>
44-
<pre>{{ context.content.hyperlinked()|u|safe }}</pre>
44+
{% if context.type == 'text/markdown' %}
45+
<div class="msg">{{ context.content.markdown()|u|safe }}</div>
46+
{% elif context.type == 'text/x-rst' %}
47+
<div class="msg">{{ context.content.rst()|u|safe }}</div>
48+
{% else %}
49+
<pre class="msg">{{ context.content.hyperlinked()|u|safe }}</pre>
50+
{% endif %}
4551
</div>
4652
{% endif %}
4753

share/roundup/templates/jinja2/static/simplemde.min.css

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

share/roundup/templates/jinja2/static/simplemde.min.js

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

share/roundup/templates/jinja2/static/style.css

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,6 @@ tr.info {
3737
background-color: #d9edf7;
3838
}
3939

40-
pre {
41-
background-color: #f0f0f0;
42-
border: 1pt solid gray;
43-
padding: 6pt;
44-
}
45-
4640
footer {
4741
font-size: 1.2em;
4842
}
@@ -61,6 +55,34 @@ footer {
6155
padding:.3rem;
6256
}
6357

58+
.msg {
59+
background-color: #f0f0f0;
60+
border-radius: 4px;
61+
border: 1px solid #d4d4d4;
62+
padding: 6px;
63+
}
64+
65+
blockquote {
66+
display: block;
67+
background: #e8e8e8;
68+
white-space: pre-line;
69+
border-radius: 4px;
70+
border: 1px solid #d4d4d4;
71+
margin: 0 1rem;
72+
padding: 0 .2rem;
73+
}
74+
75+
code {
76+
background: #e8e8e8;
77+
white-space: pre;
78+
border-radius: 4px;
79+
border: 1px solid #d4d4d4;
80+
}
81+
82+
pre > code {
83+
display: block;
84+
}
85+
6486
input:required {
6587
border-width: 1.5px;
6688
border-color: #6e747a;

0 commit comments

Comments
 (0)