Merge remote-tracking branch 'caliblur/master'

This commit is contained in:
Ozzieisaacs 2019-02-20 20:00:08 +01:00
commit 17b7333992
4 changed files with 13 additions and 6 deletions

File diff suppressed because one or more lines are too long

View File

@ -108,7 +108,7 @@ if ( $( 'body.book' ).length > 0 ) {
.replace(/^(?=\n)$|^\s*|\s*$|\n\n+/gm,"").split(/\n/);
}
else {
newdesc = description.toString();
newdesc = description.text();
}
doc = nlp ( newdesc.toString() );
sentences = doc.map((m)=> m.out( 'text' ));

File diff suppressed because one or more lines are too long

View File

@ -104,6 +104,14 @@
</div>
{%endif%}
{% endfor %}
{% if g.current_theme == 1 %}
<div id="loader" hidden="true">
<center>
<h3>{{_('Uploading...')}}</h3>
<span>{{_("please don't refresh the page")}}</span>.
</center>
</div>
{%endif%}
<div class="container-fluid">
<div class="row-fluid">
{% if g.user.is_authenticated or g.user.is_anonymous %}