Skip to content
Snippets Groups Projects
Commit 6e87a915 authored by Christian Dresen's avatar Christian Dresen
Browse files

[WarpMain] Adding Link Markdown for news. Closed #36

parent 426f7aaf
No related branches found
No related tags found
No related merge requests found
{% extends "base.html" %}
{% load humanize %}
{% load bootstrap %}
{% load i18n %}
{% block content %}
<h2>{% block title %}{% trans "news" %}{% endblock %}</h2>
{% if user.is_superuser %}
<br/>
<button class="btn btn-success" data-toggle="collapse" data-target="#add_news"><span class="glyphicon glyphicon-plus"></span>&nbsp;{% trans "add_news" %}</button>
<br/><br/>
<div class="panel panel-default">
<div class="panel-body collapse {{ collapse }}" id="add_news">
<form class="form-horizontal" method="POST" role="form">
{{ create_news_form | bootstrap_horizontal }}
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
{% csrf_token %}
<button style="float: left" type="submit" formmethod="post" class="btn btn-primary">{% trans "create" %}</button>
</div>
</div>
</form>
<div class="panel-body">
<H4>{%trans "markdown_support" %}</H4>
<pre>
# h1
## h2
### h3
#### h4
1. Ordered item 1
2. Ordered item 2
* Unordered item 1
* Unordered item 2
[EXTERNAL_LINK_NAME] (http://www.example.com)
[[INTERNAL_LINK]]
</pre>
<br>
</div>
</div>
</div>
{% endif %}
{% for news in news_list %}
<div class="panel panel-primary">
<div class="panel-heading">
<span class="lead">{{ news.title }}</span><div class="pull-right">{% if user.is_superuser %}<a href="/news/delete/{{ news.id }}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a>{% endif %}</div>
</div>
<div class="panel-body">
{{ news.message|safe }}
</div>
<div class="panel-footer">
{% trans "created_by" %} {{ news.user }} {{ news.created | naturaltime }}
</div>
</div>
{% endfor %}
{% endblock %}
\ No newline at end of file
......@@ -31,7 +31,7 @@ def index(request, news_id=0):
page_context['news_list'] = []
news_list = News.objects.order_by("-created")
for news in news_list:
news.message = markdown.markdown(escape(news.message), extensions=['markdown.extensions.nl2br','markdown.extensions.sane_lists'])
news.message = markdown.markdown(escape(news.message), extensions=['markdown.extensions.nl2br','markdown.extensions.sane_lists','markdown.extensions.wikilinks'])
page_context['news_list'].append(news)
return HttpResponse(render(request, 'warpmain/main.html', page_context))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment