Skip to content

Commit a16cafe

Browse files
rouiljrouilj
committed
merge dual heads
2 parents c4f5776 + 1675ed4 commit a16cafe

File tree

11 files changed

+123
-42
lines changed

11 files changed

+123
-42
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
- issue2551083 - Replace BaseException and Exception as base classes

‎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/layout/banner.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<div class="navbar navbar-light bg-light">
2-
<a href="/" class='navbar-brand'>
2+
<a href="{{ request.base }}" class='navbar-brand'>
33
<i class='icon-home'></i> {{ config.TRACKER_NAME|u }}
44
</a>
55
<form name="searchform" method="get" action="issue" class='form-inline my-2 my-lg-0 navbar-search'>
6-
<input type="hidden" name="@columns" value="{{ bug_columns_showall }}"/>
6+
<input type="hidden" name="@columns" value="{{ columns_showall }}"/>
77
<input type="hidden" name="@sort" value="-activity">
88
<input type="hidden" name="@group" value="priority">
99
<input type="hidden" name="@filter" value="status">
10-
<input type="hidden" name="status" value="{{ bug_status_notclosed }}"/>
10+
<input type="hidden" name="status" value="{{ status_notresolved }}"/>
1111
<input class="form-control form-control-sm mr-sm-2 search-query" id="search-text" type="search" name="@search_text">
1212
<input class="btn btn-sm btn-outline-success my-2 my-sm-0" type="submit" value="{% trans %}Search{% endtrans %}" name="submit">
1313
</form>

‎share/roundup/templates/jinja2/html/layout/navigation.html‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
{% set columns = 'id,activity,title,creator,status' %}
2-
{% set columns_showall = 'id,activity,title,creator,assignedto,status' %}
3-
41
{% if request.user.hasPermission('View', 'query') %}
52
<p>
63
<b>{% trans %}Your Queries{% endtrans %}</b> (<a href="query?@template=edit">{% trans %}edit{% endtrans %}</a>)
@@ -35,15 +32,7 @@
3532
})|u }}">{% trans %}Show Unassigned{% endtrans %}</a>
3633
</li>
3734
<li class="nav-item">
38-
<a href="{{ request.indexargs_url('issue', {
39-
'@sort': '-activity',
40-
'@group': 'priority',
41-
'@filter': 'status',
42-
'@columns': columns_showall,
43-
'@search_text': '',
44-
'status': status_notresolved,
45-
'@dispname': i18n.gettext('Show All'),
46-
})|u }}">{% trans %}Show All{% endtrans %}</a>
35+
<a href="{{ request.base }}?@dispname={{ i18n.gettext('Show All')|u|urlencode }}">{% trans %}Show All{% endtrans %}</a>
4736
</li>
4837
<li>
4938
<a href="issue?@template=search">{% trans %}Search{% endtrans %}</a>

‎share/roundup/templates/jinja2/html/layout/page.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
{% set status_notresolved = '-1,1,2,3,4,5,6,7' -%}
2+
{% set columns = 'id,activity,title,creator,status' -%}
3+
{% set columns_showall = 'id,activity,title,creator,assignedto,status' -%}
24
<!doctype html>
35
<html>
46
<head>
@@ -29,7 +31,7 @@
2931
<div class='pb-2 mb-2 border-bottom'>
3032
<h3>{% block page_header %} {% endblock %}</h3>
3133
{% if options.error_message %}
32-
<div class='alert alert-danger alert-dismissible fade show'>
34+
<div class="alert alert-danger alert-dismissible fade show" role="alert">
3335
<ul class="mb-0">
3436
{% for message in options.error_message %}
3537
<li>{{ message|safe }}</li>
@@ -41,7 +43,7 @@ <h3>{% block page_header %} {% endblock %}</h3>
4143
</div>
4244
{% endif %}
4345
{% if options.ok_message %}
44-
<div class='alert alert-success alert-dismissible fade show'>
46+
<div class="alert alert-success alert-dismissible fade show" role="alert">
4547
<ul class="mb-0">
4648
{% for message in options.ok_message %}
4749
<li>{{ message|safe }}</li>

‎share/roundup/templates/jinja2/html/layout/permission.html‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
{% if not (context.is_view_ok() or request.user.hasRole('Anonymous')) %}
2-
<p class='alert alert-block alert-error fade in'>
3-
{% trans %}You are not allowed to view this page.{% endtrans %}
4-
<button type='button' class='close' data-dismiss='alert'>X</button>
5-
</p>
6-
{% endif %}
7-
8-
{% if not context.is_view_ok() and request.user.hasRole('Anonymous') %}
9-
<p class='alert alert-block alert-error fade in'>
10-
{% trans %}Please login with your username and password.{% endtrans %}
11-
<button type='button' class='close' data-dismiss='alert'>X</button>
12-
</p>
1+
{% if not context.is_view_ok() %}
2+
<div class="alert alert-warning alert-dismissible fade show" role="alert">
3+
{% if request.user.hasRole('Anonymous') %}
4+
{% trans %}Please login with your username and password.{% endtrans %}
5+
{% else %}
6+
{% trans %}You are not allowed to view this page.{% endtrans %}
7+
{% endif %}
8+
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
9+
<span aria-hidden="true">&times;</span>
10+
</button>
11+
</div>
1312
{% endif %}

‎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.

0 commit comments

Comments
 (0)