mirror of
https://git.wownero.com/wownero/wownero-funding-system.git
synced 2024-08-15 00:53:45 +00:00
Support line breaks in comments + CSS changes
This commit is contained in:
parent
e3252d0071
commit
a6ce535b4e
7 changed files with 44 additions and 16 deletions
|
@ -379,6 +379,10 @@ class Comment(base):
|
|||
ix_comment_replied_to = sa.Index("ix_comment_replied_to", replied_to)
|
||||
ix_comment_proposal_id = sa.Index("ix_comment_proposal_id", proposal_id)
|
||||
|
||||
@property
|
||||
def message_html(self):
|
||||
return [line for line in self.message.strip().split('\r\n') if line]
|
||||
|
||||
@property
|
||||
def ago(self):
|
||||
from funding.bin.utils_time import TimeMagic
|
||||
|
|
|
@ -249,8 +249,7 @@ def donate():
|
|||
if not data:
|
||||
daemon = Daemon(url=settings.RPC_LOCATION_DEVFUND,
|
||||
username=settings.RPC_USERNAME_DEVFUND,
|
||||
password=settings.RPC_PASSWORD_DEVFUND
|
||||
)
|
||||
password=settings.RPC_PASSWORD_DEVFUND)
|
||||
|
||||
txs_in = daemon.get_transfers_in_simple()
|
||||
if not txs_in['txs']:
|
||||
|
@ -263,7 +262,7 @@ def donate():
|
|||
tx['datetime'] = dateutil_parse(tx['datetime'])
|
||||
txs_in = data
|
||||
|
||||
return make_response(render_template('devfund.html', txs_in=txs_in))
|
||||
return make_response(render_template('donate.html', txs_in=txs_in))
|
||||
|
||||
|
||||
@app.route('/register', methods=['GET', 'POST'])
|
||||
|
|
|
@ -432,7 +432,7 @@ span.username a{
|
|||
|
||||
.comment-container a.reply{
|
||||
margin-bottom:2px;
|
||||
font-family: Verdana, Geneva, sans-serif;
|
||||
font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;
|
||||
font-size: 11pt;
|
||||
text-decoration: underline;
|
||||
color: black;
|
||||
|
@ -652,4 +652,17 @@ ul.b {
|
|||
.container>.content h3,
|
||||
.container>.content h4{
|
||||
margin-bottom:20px;
|
||||
}
|
||||
|
||||
|
||||
.comment-container .media-body span.body {
|
||||
word-wrap: break-word;
|
||||
display: block;
|
||||
margin-top: 4px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.comment-container .media-body span.body img {
|
||||
margin-top:10px;
|
||||
margin-bottom:10px;
|
||||
}
|
BIN
funding/static/reply.png
Normal file
BIN
funding/static/reply.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.3 KiB |
|
@ -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>
|
|
@ -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>
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue