Author: leidel
Date: Wed Dec 17 09:39:59 2008
New Revision: 283
Modified:
trunk/example/templates/index.html
trunk/pages/templates/admin/pages/page/change_list_table.html
trunk/pages/templates/admin/pages/page/menu.html
trunk/pages/templates/pages/menu.html
trunk/pages/templates/pages/sub_menu.html
trunk/pages/templatetags/pages_tags.py
Log:
Backwards incompatible: Renamed some template tags to don't overlap with
other 3rd party apps
Modified: trunk/example/templates/index.html
==============================================================================
--- trunk/example/templates/index.html (original)
+++ trunk/example/templates/index.html Wed Dec 17 09:39:59 2008
@@ -81,7 +81,7 @@
<ul>
{% for page in pages %}
- {% show_menu page %}
+ {% pages_menu page %}
{% endfor %}
</ul>
Modified: trunk/pages/templates/admin/pages/page/change_list_table.html
==============================================================================
--- trunk/pages/templates/admin/pages/page/change_list_table.html
(original)
+++ trunk/pages/templates/admin/pages/page/change_list_table.html Wed Dec
17 09:39:59 2008
@@ -13,7 +13,7 @@
<tbody>
{% for page in pages %}
- {% show_admin_menu page %}
+ {% pages_admin_menu page %}
{% endfor %}
</tbody>
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 Wed Dec 17 09:39:59
2008
@@ -50,6 +50,6 @@
{% if children.count %}
{% for child in children %}
- {% show_admin_menu child url level %}
+ {% pages_admin_menu child url level %}
{% endfor %}
{% endif %}
Modified: trunk/pages/templates/pages/menu.html
==============================================================================
--- trunk/pages/templates/pages/menu.html (original)
+++ trunk/pages/templates/pages/menu.html Wed Dec 17 09:39:59 2008
@@ -6,7 +6,7 @@
{% if children %}
<ul>
{% for child in children %}
- {% show_menu child url %}
+ {% pages_menu child url %}
{% endfor %}
</ul>
{% endif %}
Modified: trunk/pages/templates/pages/sub_menu.html
==============================================================================
--- trunk/pages/templates/pages/sub_menu.html (original)
+++ trunk/pages/templates/pages/sub_menu.html Wed Dec 17 09:39:59 2008
@@ -1,5 +1,5 @@
{% load pages_tags %}
{% for child in children %}
- {% show_menu child url %}
+ {% pages_menu child url %}
{% endfor %}
Modified: trunk/pages/templatetags/pages_tags.py
==============================================================================
--- trunk/pages/templatetags/pages_tags.py (original)
+++ trunk/pages/templatetags/pages_tags.py Wed Dec 17 09:39:59 2008
@@ -16,7 +16,7 @@
def get_page_children_for_site(page, site):
return page.get_children().filter(sites__domain=site.domain)
-def show_menu(context, page, url='/'):
+def pages_menu(context, page, url='/'):
"""render a nested list of all children of the pages"""
request = context['request']
site = request.site
@@ -26,9 +26,9 @@
if 'current_page' in context:
current_page = context['current_page']
return locals()
-show_menu = register.inclusion_tag('pages/menu.html',
takes_context=True)(show_menu)
+pages_menu = register.inclusion_tag('pages/menu.html',
takes_context=True)(pages_menu)
-def show_sub_menu(context, page, url='/'):
+def pages_sub_menu(context, page, url='/'):
"""Get the root page of the current page and
render a nested list of all root's children pages"""
root = page.get_root()
@@ -41,7 +41,7 @@
show_sub_menu = register.inclusion_tag('pages/sub_menu.html',
takes_context=True)(show_sub_menu)
-def show_admin_menu(context, page, url='/admin/pages/page/', level=None):
+def pages_admin_menu(context, page, url='/admin/pages/page/', level=None):
"""Render the admin table of pages"""
request = context['request']
site = request.site
@@ -54,8 +54,8 @@
else:
level = level+3
return locals()
-show_admin_menu = register.inclusion_tag('admin/pages/page/menu.html',
-
takes_context=True)(show_admin_menu)
+pages_admin_menu = register.inclusion_tag('admin/pages/page/menu.html',
+
takes_context=True)(pages_admin_menu)
def has_permission(page, request):
return page.has_page_permission(request)
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
