rename display_modes to preview_modes for consistency

Conflicts:
	wagtail/wagtailadmin/views/pages.py
This commit is contained in:
Matt Westcott 2014-06-12 16:57:09 +01:00
parent 78481dc846
commit 0a38e0b8d3
3 changed files with 8 additions and 8 deletions

View file

@ -39,12 +39,12 @@
<li class="actions preview">
{% trans 'Preview' as preview_label %}
{% if display_modes|length > 1 %}
{% if preview_modes|length > 1 %}
<div class="dropdown dropup dropdown-button match-width">
{% include "wagtailadmin/pages/_preview_button_on_create.html" with label=preview_label icon=1 %}
<div class="dropdown-toggle icon icon-arrow-up"></div>
<ul role="menu">
{% for mode_name, mode_display_name in display_modes %}
{% for mode_name, mode_display_name in preview_modes %}
<li>
{% include "wagtailadmin/pages/_preview_button_on_create.html" with mode=mode_name label=mode_display_name %}
</li>

View file

@ -47,12 +47,12 @@
<li class="actions preview">
{% trans 'Preview' as preview_label %}
{% if display_modes|length > 1 %}
{% if preview_modes|length > 1 %}
<div class="dropdown dropup dropdown-button match-width">
{% include "wagtailadmin/pages/_preview_button_on_edit.html" with label=preview_label icon=1 %}
<div class="dropdown-toggle icon icon-arrow-up"></div>
<ul role="menu">
{% for mode_name, mode_display_name in display_modes %}
{% for mode_name, mode_display_name in preview_modes %}
<li>
{% include "wagtailadmin/pages/_preview_button_on_edit.html" with mode=mode_name label=mode_display_name %}
</li>

View file

@ -230,7 +230,7 @@ def create(request, content_type_app_name, content_type_model_name, parent_page_
'page_class': page_class,
'parent_page': parent_page,
'edit_handler': edit_handler,
'display_modes': page.preview_modes,
'preview_modes': page.preview_modes,
'form': form, # Used in unit tests
})
@ -361,7 +361,7 @@ def edit(request, page_id):
'page': page,
'edit_handler': edit_handler,
'errors_debug': errors_debug,
'display_modes': page.preview_modes,
'preview_modes': page.preview_modes,
'form': form, # Used in unit tests
})
@ -421,7 +421,7 @@ def preview_on_edit(request, page_id):
response = render(request, 'wagtailadmin/pages/edit.html', {
'page': page,
'edit_handler': edit_handler,
'display_modes': page.preview_modes,
'preview_modes': page.preview_modes,
})
response['X-Wagtail-Preview'] = 'error'
return response
@ -469,7 +469,7 @@ def preview_on_create(request, content_type_app_name, content_type_model_name, p
'page_class': page_class,
'parent_page': parent_page,
'edit_handler': edit_handler,
'display_modes': page.preview_modes,
'preview_modes': page.preview_modes,
})
response['X-Wagtail-Preview'] = 'error'
return response