Merge branch '1.0.2'

This commit is contained in:
Corey Oordt 2012-03-06 15:07:08 -05:00
commit e95420a9dd
20 changed files with 77 additions and 76 deletions

View file

@ -1,7 +1,7 @@
__version_info__ = {
'major': 1,
'minor': 0,
'micro': 0,
'micro': 1,
'releaselevel': 'final',
'serial': 1
}

View file

@ -77,7 +77,6 @@ for model, modeladmin in admin.site._registry.items():
fields.remove(cat)
# if there are any fields left, add them under the categories fieldset
if len(fields) > 0:
print fields
admin.site.unregister(model)
admin.site.register(model, type('newadmin', (modeladmin.__class__,), {
'fieldsets': fieldsets + (('Categories', {

View file

@ -129,8 +129,7 @@ class CategoryBaseAdmin(TreeEditor, admin.ModelAdmin):
"""
Set active to False for selected items
"""
opts = self._meta
selected_cats = opts.model.objects.filter(
selected_cats = self.model.objects.filter(
pk__in=[int(x) for x in request.POST.getlist('_selected_action')])
for item in selected_cats:
@ -144,9 +143,7 @@ class CategoryBaseAdmin(TreeEditor, admin.ModelAdmin):
"""
Set active to True for selected items
"""
opts = self._meta
selected_cats = opts.model.objects.filter(
selected_cats = self.model.objects.filter(
pk__in=[int(x) for x in request.POST.getlist('_selected_action')])
for item in selected_cats:

View file

@ -136,11 +136,18 @@ class TreeEditor(admin.ModelAdmin):
pass
try:
cl = TreeChangeList(request, self.model, list_display,
self.list_display_links, self.list_filter, self.date_hierarchy,
self.search_fields, self.list_select_related,
self.list_per_page, self.list_max_show_all,
self.list_editable, self)
if django.VERSION[1] < 4:
params = (request, self.model, list_display,
self.list_display_links, self.list_filter, self.date_hierarchy,
self.search_fields, self.list_select_related,
self.list_per_page,self.list_editable, self)
else:
params = (request, self.model, list_display,
self.list_display_links, self.list_filter, self.date_hierarchy,
self.search_fields, self.list_select_related,
self.list_per_page, self.list_max_show_all,
self.list_editable, self)
cl = TreeChangeList(*params)
except IncorrectLookupParameters:
# Wacky lookup parameters were given, so redirect to the main
# changelist page, without parameters, and pass an 'invalid=1'

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Adding the fields to the database &mdash; Django Categories v1.0b2 documentation</title>
<title>Adding the fields to the database &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="_static/default.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,13 +21,13 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="index.html" />
<link rel="next" title="Creating Custom Categories" href="custom_categories.html" />
<link rel="prev" title="Registering Models" href="registering_models.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Adding the fields to the database</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Creating Custom Categories &mdash; Django Categories v1.0b2 documentation</title>
<title>Creating Custom Categories &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="_static/default.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,13 +21,13 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="index.html" />
<link rel="next" title="Reference" href="reference/index.html" />
<link rel="prev" title="Adding the fields to the database" href="adding_the_fields.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Creating Custom Categories</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Index &mdash; Django Categories v1.0b2 documentation</title>
<title>Index &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="_static/default.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,11 +21,11 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="index.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Index</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Getting Started &mdash; Django Categories v1.0b2 documentation</title>
<title>Getting Started &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="_static/default.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,13 +21,13 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="index.html" />
<link rel="next" title="Using categories in templates" href="usage.html" />
<link rel="prev" title="Installation" href="installation.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Getting Started</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Django Categories v 1.0 &mdash; Django Categories v1.0b2 documentation</title>
<title>Django Categories v 1.0 &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="_static/default.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,12 +21,12 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="#" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="#" />
<link rel="next" title="Installation" href="installation.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Django Categories v 1.0</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Installation &mdash; Django Categories v1.0b2 documentation</title>
<title>Installation &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="_static/default.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,13 +21,13 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="index.html" />
<link rel="next" title="Getting Started" href="getting_started.html" />
<link rel="prev" title="Django Categories v 1.0" href="index.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Installation</h1></div>

View file

@ -2,10 +2,8 @@
# Project: Django Categories
# Version: 1.0
# The remainder of this file is compressed using zlib.
xÚ¥VKsÚ0¾ûWx¦¹ŠNsÌÍ!hÍcx4Ó“f±ÛAY„Ð_ß•ß@˜±ÉŃvõ}ÚǧàûÜ<03>A¢N|¡ðS;Õþ“€
›ý°nQ¡ôð{ ŒQjî%1­ü´êX|ßg%+8˜¥0ˆR<CB86>*<01>Åñ¥?gkØY<C398>[Ô&{’™,â<>„HðT'ŠâºuŠZ® ¯`¬„­FëÉóÔ»|¹š-œáÀ¢C#éãÇ9ãþÄJGNe"9´ÇÆDÙ
ÐQ"o¤úy4%¨Êsà:«ñlÊ'³—<C2B3>»´¶;žWC<57>Únw¬üü̓áx¹ZüµÞàROE{ÍJ´ãª1Ì`~9œe1ž¯øzáZµX)†Îºy°'•Ëî.+‡€k2õ¨Oí6@v\ºë!_-œéÒ¯ ‡Zl\<5C>ætˆŸ
þÊ]‰Ü(Ì¥Ä<C2A5>Ìb“Å.,:ÉV>hØ@ŠVŠnõÖ|¥DÏ4ûü´ O<>T J£ŸŸep,ñnDV*Yé[Z­ø1î(BÔ*™<Nj™xàQÖï¹@è°acÆ
Xßé<EFBFBD>üÏxðÊÝÁt¸YÊO.Ui-nT~•¢xŸ(]N¥» +g` fy
´w «ߤ¿r9pûÜýÂe÷3—ݯ\y¦h/ÙvJe0é¹€9®;{噚û#gJSÊWÉþbrw®“ḘÜT©Ay­ÏmEù†9Zþ<>º‰Û š²viÝt=Ù{€Ï÷ÐVˆõtÏ¡,ƒÖ~=wgÎ Ÿ;$Èæó<~L$òr§a´ïþXËXØKóéjb:a´Ínn³ªŒx™QÛ¤°³
·,~X…Oôt=yÒÔ>E#êz¹û™W/Ù¼Q7Rƒ­U´9hl…îÕÝ;F>¿;CŒ8~Ð ¿ìcþdaµF—M$ĵ=È\š·û~U1 Ä;Þ1¢—´â:Òïˆz»»7è=(óôv:Q>ªî8sh756Êcþ„Ü©¦žŽrz_Ä= 1~é*„¡¾ót­ðK§ßy¬y}ÚCÿÝ=z
xÚ¥VKoÛ0 ¾ûWX¯ê°{sÓ,Éæ<<3C>ÇŠ<C387>Æfl7²ÈJÓì×<C3AC>ò»IØî%ˆH}ŸHñið}î<>Æ Qg¾Pø©<C3B8>jÿQÀ…Í~Ø
w¨Pzø= Æ(5÷˜V~zêX|ßg%+8˜¥0ˆR<CB86>*<01>Åñ¥?gkØY<C398>[Ö&{š™,ã­„HðT'ŠâºuŠZ® ¯`¬„­Ç›éÓÌ™¸|µž/<2F>ÑТC#éãûGÆÃ™•ŽœÊDrhOŒ‰² £DÞHõóhJP•çÐuÖ“ùŒOçÏCwe(?‰¤´aäç¿Â¤žŠš•hw|<7C>aóËùã¬ËÉbÍ7KתËÍÊrwVÆ<56>=­ pY©8\+<2B>©ˆ¨ª@•h°² àÊÝŒøzéÌVîd=\:TDiT¥CüTÒWîJÆFsd.Eìd,vaÑI¶òAÃR´BPô~¨zæWJôL9/Ë•¥@:¥ÑÏÏ28áX7&+]Yé·´ZñCÌóG¡ÎíBL¦|9MVëå_Ë<03>²~‹ðÄÊ@‡í330VÀÎ`<ä&Ãîg£õØÚí;F¹Û×Aþü]ÇŇDé²+EØ]v9k00+EPÞEº¹­xG«|Â(-"9ñL§^²mwÉ`,Sis\wþÂ3<C382>ÆÎŒº¯ÃEÇ휟á¸è¸”¡§2¥yGjnñÍ ¼r5.à,÷7ooP¸ìA沕ËðïÜMúѽKë¦ÜëÎ~<ˆ|~€¶2­»{e´îð›…;wžùÂ!¹6Çðø!‘ÈË~œ†Ñ¡û°–±°,ÍÑ6ÕðÌtÂhÝÜfUñ2£¶¤°³
·*þXE•Î4º=ijW#;RO¹û‰ÚÚ}²}¥j¤ Z«h{ÔØ
}_WïùtùÝbÔÀñ<C380>Ú|°<>ù@3ÂúBðݱٵ)ø { $"iÅu¤E†R|·7 ÝQæ<51>ê¶b¯>€2Ó¹{ЉòQõ»©nl\<5C>ùNé)©=žOrÚ³¶büÒ{1
BÝót­°<EFBFBD>*èC ¯,Ìkâ{»z

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Reference &mdash; Django Categories v1.0b2 documentation</title>
<title>Reference &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="../_static/default.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '../',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,13 +21,13 @@
<script type="text/javascript" src="../_static/jquery.js"></script>
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="../index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="../index.html" />
<link rel="next" title="Management Commands" href="management_commands.html" />
<link rel="prev" title="Creating Custom Categories" href="../custom_categories.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Reference</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Management Commands &mdash; Django Categories v1.0b2 documentation</title>
<title>Management Commands &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="../_static/default.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '../',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,14 +21,14 @@
<script type="text/javascript" src="../_static/jquery.js"></script>
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="../index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="../index.html" />
<link rel="up" title="Reference" href="index.html" />
<link rel="next" title="Models" href="models.html" />
<link rel="prev" title="Reference" href="index.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Management Commands</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Models &mdash; Django Categories v1.0b2 documentation</title>
<title>Models &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="../_static/default.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '../',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,14 +21,14 @@
<script type="text/javascript" src="../_static/jquery.js"></script>
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="../index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="../index.html" />
<link rel="up" title="Reference" href="index.html" />
<link rel="next" title="Settings" href="settings.html" />
<link rel="prev" title="Management Commands" href="management_commands.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Models</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Settings &mdash; Django Categories v1.0b2 documentation</title>
<title>Settings &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="../_static/default.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '../',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,14 +21,14 @@
<script type="text/javascript" src="../_static/jquery.js"></script>
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="../index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="../index.html" />
<link rel="up" title="Reference" href="index.html" />
<link rel="next" title="Template Tags" href="templatetags.html" />
<link rel="prev" title="Models" href="models.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Settings</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Template Tags &mdash; Django Categories v1.0b2 documentation</title>
<title>Template Tags &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="../_static/default.css" type="text/css" />
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '../',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,13 +21,13 @@
<script type="text/javascript" src="../_static/jquery.js"></script>
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="../index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="../index.html" />
<link rel="up" title="Reference" href="index.html" />
<link rel="prev" title="Settings" href="settings.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Template Tags</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Registering Models &mdash; Django Categories v1.0b2 documentation</title>
<title>Registering Models &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="_static/default.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,13 +21,13 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="index.html" />
<link rel="next" title="Adding the fields to the database" href="adding_the_fields.html" />
<link rel="prev" title="Using categories in templates" href="usage.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Registering Models</h1></div>

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Search &mdash; Django Categories v1.0b2 documentation</title>
<title>Search &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="_static/default.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -22,7 +22,7 @@
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="_static/searchtools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="index.html" />
<script type="text/javascript">
jQuery(function() { Search.loadIndex("searchindex.js"); });
</script>
@ -31,7 +31,7 @@
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Search</h1></div>

File diff suppressed because one or more lines are too long

View file

@ -6,13 +6,13 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Using categories in templates &mdash; Django Categories v1.0b2 documentation</title>
<title>Using categories in templates &mdash; Django Categories v1.0.1 documentation</title>
<link rel="stylesheet" href="_static/default.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '1.0b2',
VERSION: '1.0.1',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
@ -21,13 +21,13 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Django Categories v1.0b2 documentation" href="index.html" />
<link rel="top" title="Django Categories v1.0.1 documentation" href="index.html" />
<link rel="next" title="Registering Models" href="registering_models.html" />
<link rel="prev" title="Getting Started" href="getting_started.html" />
</head>
<body>
<div id="docstitle">
<p>Django Categories v1.0b2 documentation</p>
<p>Django Categories v1.0.1 documentation</p>
</div>
<div id="header">
<div id="title"><h1>Using categories in templates</h1></div>