d0s3t3ch/wownero-funding-system
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero-funding-system.git synced 2024-08-15 00:53:45 +00:00
Code Issues Projects Releases Wiki Activity

Support line breaks in comments + CSS changes

Browse source
This commit is contained in:
Sander Ferdinand 2018-10-25 23:48:49 +02:00
parent e3252d0071
commit a6ce535b4e
No known key found for this signature in database
GPG key ID: 7BBC83D7A8810AAB
7 changed files with 44 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
funding/templates/devfund.html → funding/templates/donate.html
View file

@ -6,7 +6,7 @@
<div class="col-lg-8">
<h2>Development Fund</h2>
<p>
Ongoing development is supported by donations and sponsorships *cough*.
Ongoing development is supported by donations.
</p>
</div>
</div>

29
funding/templates/proposal/macros/comment.html
View file

@ -17,11 +17,21 @@
<a href="/proposal/{{proposal.id}}#comment-{{c.id}}">
{{c.date_added.strftime('%Y-%m-%d %H:%M')}}
</a>
</span><br>
<span data-id="{{c.id}}" class="body" style="{% if c.automated %}color:blue;{% endif %};word-break: break-all;">{{c.message}}</span>
<br>
</span>
<span data-id="{{c.id}}" class="body" style="{% if c.automated %}color:blue;{% endif %};">
{% for line in c.message_html %}
{{line}}
{% if loop.index != c.message_html|length %}
<br>
{% endif %}
{% endfor %}
</span>
{% if not c.automated %}
<a class="reply" href="{{url_for('propsal_comment_reply', cid=c.id, pid=proposal.id)}}">reply</a>
<a class="reply" href="{{url_for('propsal_comment_reply', cid=c.id, pid=proposal.id)}}">
<img style="margin-right:4px;" width="20px" height="20px" src="/static/reply.png"/>reply
</a>
{% endif %}
{% for _c in c.comments %}
@ -45,9 +55,14 @@
{{_c.date_added.strftime('%Y-%m-%d %H:%M')}}
</a>
</span>
<br>
<span data-id="{{_c.id}}" class="body" style="word-break: break-all;">
{{_c.message}}
<span data-id="{{_c.id}}" class="body">
{% for line in _c.message_html %}
{{line}}
{% if loop.index != _c.message_html|length %}
<br>
{% endif %}
{% endfor %}
</span>
</div>
</div>

5
funding/templates/proposal/proposal.html
View file

@ -243,9 +243,6 @@
// convert images to <img>
let html = obj.html();
let uid = obj.attr('data-id');
if(uid == 30){
debugger;
}
var matches = html.match(regexp_imgur) || [];
matches = matches.concat(html.match(regexp_imgflip));
@ -253,7 +250,7 @@
matches.filter(function (value, index, self) {
return self.indexOf(value) === index && typeof value === 'string';
}).forEach(function (obj) {
html = html.replace(new RegExp(obj, 'g'), `<br><img src="${obj}"/></a><br>`)
html = html.replace(new RegExp(obj, 'g'), `<img src="${obj}"/></a>`)
});
}
obj.html(html);