# HG changeset patch
# User Sverre Rabbelier <srabbelier@gmail.com>
# Date 1228663777 0
# Node ID c4f3997becd90ba2cac31fdee33324a2e543dfcf
# Parent  e3b91b6955ff6c08db68ad535dffb1ac56cd4b4c
Rename getSidebarLinks to getSidebarMenus

Patch by: Sverre Rabbelier

diff -r e3b91b6955ff -r c4f3997becd9 app/soc/views/models/base.py
--- a/app/soc/views/models/base.py	Sun Dec 07 15:29:10 2008 +0000
+++ b/app/soc/views/models/base.py	Sun Dec 07 15:29:37 2008 +0000
@@ -598,7 +598,7 @@
 
     return self._params
 
-  def getSidebarLinks(self, request, params=None):
+  def getSidebarMenus(self, request, params=None):
     """Returns an dictionary with one sidebar entry.
 
     Args:
@@ -612,7 +612,7 @@
     """
 
     params = dicts.merge(params, self._params)
-    return sitemap.sidebar.getSidebarLinks(request, params)
+    return sitemap.sidebar.getSidebarMenus(request, params)
 
   def getDjangoURLPatterns(self, params=None):
     """Retrieves a list of sidebar entries for this view
diff -r e3b91b6955ff -r c4f3997becd9 app/soc/views/sitemap/build.py
--- a/app/soc/views/sitemap/build.py	Sun Dec 07 15:29:10 2008 +0000
+++ b/app/soc/views/sitemap/build.py	Sun Dec 07 15:29:37 2008 +0000
@@ -39,17 +39,17 @@
 from soc.views.sitemap import sitemap
 
 
-sidebar.addMenu(user_self.view.getSidebarLinks)
-sidebar.addMenu(presence.view.getSidebarLinks)
-sidebar.addMenu(site.view.getSidebarLinks)
-sidebar.addMenu(user.view.getSidebarLinks)
-sidebar.addMenu(document.view.getSidebarLinks)
-sidebar.addMenu(sponsor.view.getSidebarLinks)
-sidebar.addMenu(host.view.getSidebarLinks)
-sidebar.addMenu(request.view.getSidebarLinks)
-sidebar.addMenu(program.view.getSidebarLinks)
+sidebar.addMenu(user_self.view.getSidebarMenus)
+sidebar.addMenu(presence.view.getSidebarMenus)
+sidebar.addMenu(site.view.getSidebarMenus)
+sidebar.addMenu(user.view.getSidebarMenus)
+sidebar.addMenu(document.view.getSidebarMenus)
+sidebar.addMenu(sponsor.view.getSidebarMenus)
+sidebar.addMenu(host.view.getSidebarMenus)
+sidebar.addMenu(request.view.getSidebarMenus)
+sidebar.addMenu(program.view.getSidebarMenus)
 sidebar.addMenu(program.view.getExtraMenus)
-sidebar.addMenu(organization.view.getSidebarLinks)
+sidebar.addMenu(organization.view.getSidebarMenus)
 
 sitemap.addPages(presence.view.getDjangoURLPatterns())
 sitemap.addPages(site.view.getDjangoURLPatterns())
diff -r e3b91b6955ff -r c4f3997becd9 app/soc/views/sitemap/sidebar.py
--- a/app/soc/views/sitemap/sidebar.py	Sun Dec 07 15:29:10 2008 +0000
+++ b/app/soc/views/sitemap/sidebar.py	Sun Dec 07 15:29:37 2008 +0000
@@ -63,10 +63,10 @@
     sidebar_defaults: The sidebar_defaults are used to construct the
       sidebar items for this View. It is expected to be a tuple of
       three items, the item's url, it's menu_text, and it's
-      access_type, see getSidebarLinks on how access_type is used.
+      access_type, see getSidebarMenus on how access_type is used.
     sidebar_additional: The sidebar_additional values are appended
       to the list of items verbatim, and should be in the format
-      expected by getSidebarLinks.
+      expected by getSidebarMenus.
 
   Args:
     params: a dict with params for this View.
@@ -92,7 +92,7 @@
   return result
 
 
-def getSidebarLinks(request, params=None):
+def getSidebarMenus(request, params=None):
   """Returns an dictionary with one sidebar entry.
 
   Calls getSidebarItems to retrieve the items that should be in the