Author: leidel
Date: Wed Dec 17 09:48:37 2008
New Revision: 285

Modified:
    trunk/example/templates/index.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:48:37 2008
@@ -89,7 +89,7 @@

  {% if current_page %}
  <ul>
-    {% show_sub_menu current_page %}
+    {% pages_sub_menu current_page %}
  </ul>
  {% endif %}


Modified: trunk/pages/templatetags/pages_tags.py
==============================================================================
--- trunk/pages/templatetags/pages_tags.py      (original)
+++ trunk/pages/templatetags/pages_tags.py      Wed Dec 17 09:48:37 2008
@@ -26,7 +26,8 @@
      if 'current_page' in context:
          current_page = context['current_page']
      return locals()
-pages_menu = register.inclusion_tag('pages/menu.html',  
takes_context=True)(pages_menu)
+pages_menu = register.inclusion_tag('pages/menu.html',
+                                    takes_context=True)(pages_menu)

  def pages_sub_menu(context, page, url='/'):
      """Get the root page of the current page and
@@ -38,8 +39,8 @@
      if 'current_page' in context:
          current_page = context['current_page']
      return locals()
-show_sub_menu = register.inclusion_tag('pages/sub_menu.html',
-                                       takes_context=True)(show_sub_menu)
+pages_sub_menu = register.inclusion_tag('pages/sub_menu.html',
+                                        takes_context=True)(pages_sub_menu)

  def pages_admin_menu(context, page, url='/admin/pages/page/', level=None):
      """Render the admin table of pages"""
@@ -55,7 +56,7 @@
              level = level+3
      return locals()
  pages_admin_menu = register.inclusion_tag('admin/pages/page/menu.html',
-                                          
takes_context=True)(pages_admin_menu)
+                                           
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to