Author: mtredinnick
Date: 2010-09-10 22:25:39 -0500 (Fri, 10 Sep 2010)
New Revision: 13747

Modified:
   
django/branches/releases/1.2.X/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
   
django/branches/releases/1.2.X/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
Log:
[1.2.X] Fixed id attribute generation in the admin docs page. Patch from simeon.

Fixed #3695. Thanks.

Backport of r13728 from trunk.

Modified: 
django/branches/releases/1.2.X/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
===================================================================
--- 
django/branches/releases/1.2.X/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
      2010-09-11 03:13:23 UTC (rev 13746)
+++ 
django/branches/releases/1.2.X/django/contrib/admindocs/templates/admin_doc/template_filter_index.html
      2010-09-11 03:25:39 UTC (rev 13747)
@@ -15,7 +15,7 @@
     <h2>{% firstof library.grouper "Built-in filters" %}</h2>
     {% if library.grouper %}<p class="small quiet">To use these filters, put 
<code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag 
closeblock %}</code> in your template before using the filter.</p><hr />{% 
endif %}
     {% for filter in library.list|dictsort:"name" %}
-    <h3 id="{{ filter.name }}">{{ filter.name }}</h3>
+    <h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ filter.name 
}}">{{ filter.name }}</h3>
     <p>{{ filter.title }}</p>
     <p>{{ filter.body }}</p>
     {% if not forloop.last %}<hr />{% endif %}
@@ -36,7 +36,7 @@
     <h2>{% firstof library.grouper "Built-in filters" %}</h2>
     <ul>
     {% for filter in library.list|dictsort:"name" %}
-        <li><a href="#{{ filter.name }}">{{ filter.name }}</a></li>
+        <li><a href="#{{ library.grouper|default_if_none:"built_in" }}-{{ 
filter.name }}">{{ filter.name }}</a></li>
     {% endfor %}
     </ul>
 </div>

Modified: 
django/branches/releases/1.2.X/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
===================================================================
--- 
django/branches/releases/1.2.X/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
 2010-09-11 03:13:23 UTC (rev 13746)
+++ 
django/branches/releases/1.2.X/django/contrib/admindocs/templates/admin_doc/template_tag_index.html
 2010-09-11 03:25:39 UTC (rev 13747)
@@ -15,7 +15,7 @@
     <h2>{% firstof library.grouper "Built-in tags" %}</h2>
     {% if library.grouper %}<p class="small quiet">To use these tags, put 
<code>{% templatetag openblock %} load {{ library.grouper }} {% templatetag 
closeblock %}</code> in your template before using the tag.</p><hr />{% endif %}
     {% for tag in library.list|dictsort:"name" %}
-    <h3 id="{{ tag.name }}">{{ tag.name }}</h3>
+    <h3 id="{{ library.grouper|default_if_none:"built_in" }}-{{ tag.name 
}}">{{ tag.name }}</h3>
     <h4>{{ tag.title }}</h4>
     <p>{{ tag.body }}</p>
     {% if not forloop.last %}<hr />{% endif %}
@@ -36,7 +36,7 @@
     <h2>{% firstof library.grouper "Built-in tags" %}</h2>
     <ul>
     {% for tag in library.list|dictsort:"name" %}
-        <li><a href="#{{ tag.name }}">{{ tag.name }}</a></li>
+        <li><a href="#{{ library.grouper|default_if_none:"built_in" }}-{{ 
tag.name }}">{{ tag.name }}</a></li>
     {% endfor %}
     </ul>
 </div>

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to