Merge remote-tracking branch 'caliblur/master'

cps/static/js/caliBlur.js

@@ -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' ));

cps/templates/layout.html

@@ -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 %}