Permalink
Browse files

Merge branch 'master' of github.com:mozilla/kuma

  • Loading branch information...
lmorchard committed May 24, 2012
2 parents fd8d083 + 56bccba commit 957d3f8e142b02e8ce60480a4eb9b483b5cc808b
View
@@ -228,7 +228,7 @@ class RevisionForm(forms.ModelForm):
class Meta(object):
model = Revision
fields = ('title', 'slug', 'tags', 'keywords', 'summary', 'content',
- 'comment', 'based_on')
+ 'comment', 'based_on', 'show_toc')
def __init__(self, *args, **kwargs):
@@ -105,7 +105,9 @@ <h1>{{ _('Editing <em>{title}</em>')|fe(title=revision.title) }}</h1>
<ul class="metadata">
<li><label>{{_('Title:')}}</label> {{ revision_form.title | safe }}</li>
<li><label>{{_('Slug:')}}</label> {{ revision_form.slug | safe }}</li>
- <li><label>{{_('Generate table of contents:')}}</label> {{ revision_form.show_toc | safe }}</li>
+ <li><label><abbr title="{{_('Generate table of contents')}}">{{_('TOC:')}}</abbr></label>
+ {{ revision_form.show_toc | safe }}
+ </li>
</ul>
{% endif %}
@@ -26,6 +26,9 @@
<li><label>{{_('Slug:')}}</label> {{ document_form.slug | safe }}</li>
<li><label>{{_('Parent:')}}</label> {{ document_form.parent_topic | safe }}</li>
<li><label>{{_('Tags:')}}</label> {{ revision_form.tags | safe }}</li>
+ <li><label><abbr title="{{_('Generate table of contents')}}">{{_('TOC:')}}</abbr></label>
+ {{ revision_form.show_toc | safe }}
+ </li>
</ul>
{% include 'wiki/includes/page_buttons.html' %}
View
@@ -637,7 +637,8 @@ def new_document(request):
rev_form = RevisionForm(initial={
'slug': initial_slug,
'title': initial_slug,
- 'review_tags': review_tags
+ 'review_tags': review_tags,
+ 'show_toc': True
})
return jingo.render(request, 'wiki/new_document.html',

0 comments on commit 957d3f8

Please sign in to comment.