innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Corrected some syntax issues in the docs. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14598 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2010-11-17 16:08:28 +00:00
parent 8a7a8f465b
commit c0248f6f07
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
docs/topics/forms/media.txt
View File

@ -132,11 +132,11 @@ parent defines its media requirements. For example, if we were to extend our
basic Calendar widget from the example above:: basic Calendar widget from the example above::
>>> class FancyCalendarWidget(CalendarWidget): >>> class FancyCalendarWidget(CalendarWidget):
class Media: ... class Media:
css = { ... css = {
'all': ('fancy.css',) ... 'all': ('fancy.css',)
} ... }
js = ('whizbang.js',) ... js = ('whizbang.js',)
>>> w = FancyCalendarWidget() >>> w = FancyCalendarWidget()
>>> print w.media >>> print w.media
@ -151,12 +151,12 @@ you don't want media to be inherited in this way, add an ``extend=False``
declaration to the media declaration:: declaration to the media declaration::
>>> class FancyCalendarWidget(CalendarWidget): >>> class FancyCalendarWidget(CalendarWidget):
class Media: ... class Media:
extend = False ... extend = False
css = { ... css = {
'all': ('fancy.css',) ... 'all': ('fancy.css',)
} ... }
js = ('whizbang.js',) ... js = ('whizbang.js',)
>>> w = FancyCalendarWidget() >>> w = FancyCalendarWidget()
>>> print w.media >>> print w.media
@ -214,11 +214,11 @@ your site was ``'http://uploads.example.com/'`` and :setting:`STATIC_URL`
was ``None``:: was ``None``::
>>> class CalendarWidget(forms.TextInput): >>> class CalendarWidget(forms.TextInput):
class Media: ... class Media:
css = { ... css = {
'all': ('/css/pretty.css',), ... 'all': ('/css/pretty.css',),
} ... }
js = ('animations.js', 'http://othersite.com/actions.js') ... js = ('animations.js', 'http://othersite.com/actions.js')
>>> w = CalendarWidget() >>> w = CalendarWidget()
>>> print w.media >>> print w.media
@ -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:: the resulting Media object contains the union of the media from both files::
>>> class CalendarWidget(forms.TextInput): >>> class CalendarWidget(forms.TextInput):
class Media: ... class Media:
css = { ... css = {
'all': ('pretty.css',) ... 'all': ('pretty.css',)
} ... }
js = ('animations.js', 'actions.js') ... js = ('animations.js', 'actions.js')
>>> class OtherWidget(forms.TextInput): >>> class OtherWidget(forms.TextInput):
class Media: ... class Media:
js = ('whizbang.js',) ... js = ('whizbang.js',)
>>> w1 = CalendarWidget() >>> w1 = CalendarWidget()
>>> w2 = OtherWidget() >>> w2 = OtherWidget()
@ -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:: of adding the media definitions for all widgets that are part of the form::
>>> class ContactForm(forms.Form): >>> class ContactForm(forms.Form):
date = DateField(widget=CalendarWidget) ... date = DateField(widget=CalendarWidget)
name = CharField(max_length=40, widget=OtherWidget) ... name = CharField(max_length=40, widget=OtherWidget)
>>> f = ContactForm() >>> f = ContactForm()
>>> f.media >>> f.media
@ -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:: layout -- simply add a media declaration to the form::
>>> class ContactForm(forms.Form): >>> class ContactForm(forms.Form):
date = DateField(widget=CalendarWidget) ... date = DateField(widget=CalendarWidget)
name = CharField(max_length=40, widget=OtherWidget) ... name = CharField(max_length=40, widget=OtherWidget)
...
class Media: ... class Media:
css = { ... css = {
'all': ('layout.css',) ... 'all': ('layout.css',)
} ... }
>>> f = ContactForm() >>> f = ContactForm()
>>> f.media >>> f.media

2
docs/topics/i18n/internationalization.txt
View File

@ -117,7 +117,7 @@ preceding the string, e.g.::
This also works in templates with the :ttag:`comment` tag: 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 %} {% comment %}Translators: This is a text of the base template {% endcomment %}