Merge branch 'master' into with-dvcs

diff --cc apps/wiki/templates/wiki/tabs/summary_view.html
index 73eece2,f0b57f6..53e6cdf
--- 1/apps/wiki/templates/wiki/tabs/summary_view.html
--- 2/apps/wiki/templates/wiki/tabs/summary_view.html
+++ b/apps/wiki/templates/wiki/tabs/summary_view.html
@@@ -24,8 -25,12 +24,12 @@@
                <p>
                        <label for="gallery">{% trans "Link to gallery" %}:</label>
                        <span data-ui-editable="true" data-edit-target="meta.galleryLink"
 -                      >{{ document_meta.gallery}}</span>
 +                      >{{ chunk.book.gallery }}</span>
                </p>
+               <p>
+                   <label>{% trans "Characters in document" %}:</label>
+                   <span id="charcount"></span> (<span id="charcount_pages"></span> {% trans "pages" %}<span id="charcount_untagged">, {% trans "untagged" %}</span>)
+               </p>
  
                <p><button type="button" id="publish_button">{% trans "Publish" %}</button></p>
        </div>

diff --cc redakcja/settings/compress.py
Simple merge

diff --cc redakcja/static/js/wiki/wikiapi.js
Simple merge

diff --cc redakcja/static/js/wiki/xslt.js
Simple merge