Author: batiste.bieler
Date: Sat Feb 14 17:23:35 2009
New Revision: 341
Modified:
trunk/pages/admin/utils.py
trunk/pages/templates/admin/pages/page/menu.html
Log:
Some little optimizations
Modified: trunk/pages/admin/utils.py
==============================================================================
--- trunk/pages/admin/utils.py (original)
+++ trunk/pages/admin/utils.py Sat Feb 14 17:23:35 2009
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
from django.template import loader, Context, RequestContext,
TemplateDoesNotExist
from django.template.loader_tags import ExtendsNode
from django.http import Http404
@@ -21,27 +22,27 @@
except Http404:
context = {}
temp.render(RequestContext(request, context))
- list = []
- placeholders_recursif(temp.nodelist, list)
- return list
+ plist = []
+ placeholders_recursif(temp.nodelist, plist)
+ return plist
-def placeholders_recursif(nodelist, list):
+def placeholders_recursif(nodelist, plist):
"""
Recursively search into a template node list for PlaceholderNode node
"""
for node in nodelist:
if isinstance(node, PlaceholderNode):
- list.append(node)
+ plist.append(node)
node.render(Context())
for key in ('nodelist', 'nodelist_true', 'nodelist_false'):
if hasattr(node, key):
try:
- placeholders_recursif(getattr(node, key), list)
+ placeholders_recursif(getattr(node, key), plist)
except:
pass
for node in nodelist:
if isinstance(node, ExtendsNode):
- placeholders_recursif(node.get_parent(Context()).nodelist,
list)
+ placeholders_recursif(node.get_parent(Context()).nodelist,
plist)
def get_connected_models():
Modified: trunk/pages/templates/admin/pages/page/menu.html
==============================================================================
--- trunk/pages/templates/admin/pages/page/menu.html (original)
+++ trunk/pages/templates/admin/pages/page/menu.html Sat Feb 14 17:23:35
2009
@@ -8,7 +8,7 @@
<a href="#" class="move-target right" title="{% trans "as right
sibling"%}"><img alt="" src="{%
admin_media_prefix %}img/admin/arrow-down.gif"/></a></a> |
<a href="#" class="move-target first-child" title="{% trans "as
child"%}">↘</a>
</span>
- <a href="#" {% ifequal 0 page.children.all.count %}style="display:
none"{% endifequal %} id="c{{ page.id }}" class="collapse">
+ <a href="#" {% ifequal 0 children.count %}style="display: none"{%
endifequal %} id="c{{ page.id }}" class="collapse">
<span class="collapsed">+</span>
<span>-</span>
</a>
@@ -40,20 +40,18 @@
{% endifequal %}
</td>
<td>
-{% cache 600 page_template page.id %}
+{% cache 300 page_template page.id %}
{{ page.get_template }}
{% endcache %}
</td>
<td>
-{% cache 3600 page_author page.author.id %}
+{% cache 10000 page_author page.author_id %}
{% firstof page.author.get_full_name page.author.first_name
page.author.username %}
{% endcache %}
</td>
</tr>
{% endif %}
-{% if children.count %}
{% for child in children %}
{% pages_admin_menu child url level %}
{% endfor %}
-{% endif %}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"pinax-updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/pinax-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
