Skip to content

Commit

Permalink
Corrected some syntax issues in the docs.
Browse files Browse the repository at this point in the history
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
alex committed Nov 17, 2010
1 parent 8a7a8f4 commit c0248f6
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
64 changes: 32 additions & 32 deletions docs/topics/forms/media.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ parent defines its media requirements. For example, if we were to extend our
basic Calendar widget from the example above::

>>> class FancyCalendarWidget(CalendarWidget):
class Media:
css = {
'all': ('fancy.css',)
}
js = ('whizbang.js',)
... class Media:
... css = {
... 'all': ('fancy.css',)
... }
... js = ('whizbang.js',)

>>> w = FancyCalendarWidget()
>>> print w.media
Expand All @@ -151,12 +151,12 @@ you don't want media to be inherited in this way, add an ``extend=False``
declaration to the media declaration::

>>> class FancyCalendarWidget(CalendarWidget):
class Media:
extend = False
css = {
'all': ('fancy.css',)
}
js = ('whizbang.js',)
... class Media:
... extend = False
... css = {
... 'all': ('fancy.css',)
... }
... js = ('whizbang.js',)

>>> w = FancyCalendarWidget()
>>> print w.media
Expand Down Expand Up @@ -214,11 +214,11 @@ your site was ``'http://uploads.example.com/'`` and :setting:`STATIC_URL`
was ``None``::

>>> class CalendarWidget(forms.TextInput):
class Media:
css = {
'all': ('/css/pretty.css',),
}
js = ('animations.js', 'http://othersite.com/actions.js')
... class Media:
... css = {
... 'all': ('/css/pretty.css',),
... }
... js = ('animations.js', 'http://othersite.com/actions.js')

>>> w = CalendarWidget()
>>> print w.media
Expand Down Expand Up @@ -270,15 +270,15 @@ Media objects can also be added together. When two media objects are added,
the resulting Media object contains the union of the media from both files::

>>> class CalendarWidget(forms.TextInput):
class Media:
css = {
'all': ('pretty.css',)
}
js = ('animations.js', 'actions.js')
... class Media:
... css = {
... 'all': ('pretty.css',)
... }
... js = ('animations.js', 'actions.js')

>>> class OtherWidget(forms.TextInput):
class Media:
js = ('whizbang.js',)
... class Media:
... js = ('whizbang.js',)

>>> w1 = CalendarWidget()
>>> w2 = OtherWidget()
Expand All @@ -301,8 +301,8 @@ have a media property. The default value for this property is the result
of adding the media definitions for all widgets that are part of the form::

>>> class ContactForm(forms.Form):
date = DateField(widget=CalendarWidget)
name = CharField(max_length=40, widget=OtherWidget)
... date = DateField(widget=CalendarWidget)
... name = CharField(max_length=40, widget=OtherWidget)

>>> f = ContactForm()
>>> f.media
Expand All @@ -315,13 +315,13 @@ If you want to associate additional media with a form -- for example, CSS for fo
layout -- simply add a media declaration to the form::

>>> class ContactForm(forms.Form):
date = DateField(widget=CalendarWidget)
name = CharField(max_length=40, widget=OtherWidget)

class Media:
css = {
'all': ('layout.css',)
}
... date = DateField(widget=CalendarWidget)
... name = CharField(max_length=40, widget=OtherWidget)
...
... class Media:
... css = {
... 'all': ('layout.css',)
... }

>>> f = ContactForm()
>>> f.media
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/i18n/internationalization.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ preceding the string, e.g.::

This also works in templates with the :ttag:`comment` tag:

.. code-block:: django+html
.. code-block:: html+django

{% comment %}Translators: This is a text of the base template {% endcomment %}

Expand Down

0 comments on commit c0248f6

Please sign in to comment.