Skip to content

Commit 48c7262

Browse files
authored
Merge pull request #88 from DMOJ/enabled-markdown-guide
Hide emoji and mentions from Markdown guide if they're disabled
2 parents 60db830 + 30557b5 commit 48c7262

File tree

2 files changed

+24
-16
lines changed

2 files changed

+24
-16
lines changed

martor/templates/martor/guide.html

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,27 @@
1515
</tr>
1616
</thead>
1717
<tbody>
18-
<tr>
19-
<td>:emoji_name:</td>
20-
<td>&mdash;</td>
21-
<td>&mdash;</td>
22-
<td>&mdash;</td>
23-
<td><img class="marked-emoji" src="{% static 'plugins/images/heart.png' %}"></td>
24-
</tr>
25-
<tr>
26-
<td>@[username]</td>
27-
<td>&mdash;</td>
28-
<td>Ctrl+M</td>
29-
<td>Command+M</td>
30-
<td><a href="#">@username</a></td>
31-
</tr>
32-
<tr><td colspan="5"></td></tr>
18+
{% if emoji_enabled %}
19+
<tr>
20+
<td>:emoji_name:</td>
21+
<td>&mdash;</td>
22+
<td>&mdash;</td>
23+
<td>&mdash;</td>
24+
<td><img class="marked-emoji" src="{% static 'plugins/images/heart.png' %}"></td>
25+
</tr>
26+
{% endif %}
27+
{% if mentions_enabled %}
28+
<tr>
29+
<td>@[username]</td>
30+
<td>&mdash;</td>
31+
<td>Ctrl+M</td>
32+
<td>Command+M</td>
33+
<td><a href="#">@username</a></td>
34+
</tr>
35+
{% endif %}
36+
{% if emoji_enabled or mentions_enabled %}
37+
<tr><td colspan="5"></td></tr>
38+
{% endif %}
3339
<tr>
3440
<td>*Italic*</td>
3541
<td>_Italic_</td>

martor/widgets.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ def render(self, name, value, attrs=None, renderer=None, **kwargs):
4545

4646
return template.render({
4747
'martor': widget,
48-
'field_name': name
48+
'field_name': name,
49+
'emoji_enabled': MARTOR_ENABLE_CONFIGS.get('emoji', None) == 'true',
50+
'mentions_enabled': MARTOR_ENABLE_CONFIGS.get('mention', None) == 'true',
4951
})
5052

5153
class Media:

0 commit comments

Comments
 (0)