From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 19 Aug 2011 11:20:03 +0000 (+0200)
Subject: Merge branch 'master' into with-dvcs
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/4c48c47d0b84e516114c16ee191359166e93a51c

Merge branch 'master' into with-dvcs
---

4c48c47d0b84e516114c16ee191359166e93a51c
diff --cc apps/wiki/templates/wiki/tabs/summary_view.html
index 73eece2e,f0b57f6d..53e6cdf8
--- a/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>