Added auto resizing text field, richtext field, and snippet chooser to styleguide

Fix button on styleguide linking to the add an image page
pull/2515/merge
Liam Brenner 2016-04-26 09:20:30 +10:00 zatwierdzone przez Mikalai Radchuk
rodzic facd66cf82
commit 75295209bb
4 zmienionych plików z 13 dodań i 6 usunięć

Wyświetl plik

@ -27,6 +27,7 @@ Changelog
* Improved L10N and I18N for revisions list (Roel Bruggink)
* The multiple image uploader now displays details of server errors (Nigel Fletton)
* Added `WAGTAIL_APPEND_SLASH` setting to determine whether page URLs end in a trailing slash (Andrew Tork Baker)
* Added auto resizing text field, richtext field, and snippet chooser to styleguide (Liam Brenner)
* Fix: The currently selected day is now highlighted only in the correct month in date pickers (Jonas Lergell)
* Fix: Fixed crash when an image without a source file was resized with the "dynamic serve view"
* Fix: Registered settings admin menu items now show active correctly (Matthew Downey)

Wyświetl plik

@ -52,6 +52,7 @@ Minor features
* Improved L10N and I18N for revisions list (Roel Bruggink)
* The multiple image uploader now displays details of server errors (Nigel Fletton)
* Added ``WAGTAIL_APPEND_SLASH`` setting to determine whether page URLs end in a trailing slash - see :ref:`append_slash` (Andrew Tork Baker)
* Added auto resizing text field, richtext field, and snippet chooser to styleguide (Liam Brenner)
Bug fixes
~~~~~~~~~

Wyświetl plik

@ -499,7 +499,7 @@
{% include "wagtailadmin/shared/header.html" with title=title_trans %}
{% include "wagtailadmin/shared/header.html" with title=title_trans add_link="wagtailimages:add" icon="image" add_text="button" search_url="wagtailimages:index" %}
{% include "wagtailadmin/shared/header.html" with title=title_trans add_link="wagtailstyleguide" icon="image" add_text="button" search_url="wagtailimages:index" %}
</section>
<section id="forms">
@ -517,9 +517,6 @@
<li><input type="submit" value="{% trans 'Save' %}" class="button" /><a href="#" class="button button-secondary no">{% trans "Delete image" %}</a></li>
</ul>
</form>
<h3>TODO: Rich text input</h3>
<h3>TODO: Snippet chooser</h3>
</section>
<section id="editor">

Wyświetl plik

@ -4,13 +4,15 @@ from django import forms
from django.core.paginator import Paginator
from django.shortcuts import render
from django.utils.translation import ugettext as _
from wagtail.wagtailadmin import messages
from wagtail.wagtailadmin.forms import SearchForm
from wagtail.wagtailadmin.widgets import (
AdminDateInput, AdminDateTimeInput, AdminPageChooser, AdminTimeInput)
AdminAutoHeightTextInput, AdminDateInput, AdminDateTimeInput, AdminPageChooser, AdminTimeInput)
from wagtail.wagtailcore.fields import RichTextArea
from wagtail.wagtailcore.models import Page
from wagtail.wagtaildocs.widgets import AdminDocumentChooser
from wagtail.wagtailimages.widgets import AdminImageChooser
from wagtail.wagtailsnippets.widgets import AdminSnippetChooser
class ExampleForm(forms.Form):
@ -19,9 +21,12 @@ class ExampleForm(forms.Form):
self.fields['page_chooser'].widget = AdminPageChooser()
self.fields['image_chooser'].widget = AdminImageChooser()
self.fields['document_chooser'].widget = AdminDocumentChooser()
self.fields['snippet_chooser'].widget = AdminSnippetChooser(Page)
self.fields['date'].widget = AdminDateInput()
self.fields['time'].widget = AdminTimeInput()
self.fields['datetime'].widget = AdminDateTimeInput()
self.fields['auto_height_text'].widget = AdminAutoHeightTextInput()
self.fields['rich_text'].widget = RichTextArea()
CHOICES = (
('choice1', 'choice 1'),
@ -29,6 +34,8 @@ class ExampleForm(forms.Form):
)
text = forms.CharField(required=True, help_text="help text")
auto_height_text = forms.CharField(required=True)
rich_text = forms.CharField(required=True)
url = forms.URLField(required=True)
email = forms.EmailField(max_length=254)
date = forms.DateField()
@ -40,6 +47,7 @@ class ExampleForm(forms.Form):
page_chooser = forms.BooleanField(required=True)
image_chooser = forms.BooleanField(required=True)
document_chooser = forms.BooleanField(required=True)
snippet_chooser = forms.BooleanField(required=True)
def index(request):