menu is a more appropriate way to call the folder rather than items

django-cms · Jan 18, 2013 · 7a31036 · 7a31036
1 parent 1bc0d2a
commit 7a31036
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/cms/templates/cms/toolbar/items/break.html → cms/templates/cms/toolbar/menu/break.html b/cms/templates/cms/toolbar/items/break.html → cms/templates/cms/toolbar/menu/break.html
diff --git a/cms/templates/cms/toolbar/items/item.html → cms/templates/cms/toolbar/menu/item.html b/cms/templates/cms/toolbar/items/item.html → cms/templates/cms/toolbar/menu/item.html
diff --git a/cms/templates/cms/toolbar/items/list.html → cms/templates/cms/toolbar/menu/list.html b/cms/templates/cms/toolbar/items/list.html → cms/templates/cms/toolbar/menu/list.html
diff --git a/cms/tests/toolbar.py b/cms/tests/toolbar.py
@@ -62,7 +62,7 @@ def test_toolbar_no_page_anon(self):
         # check the login form is there
         login = items[1]
         self.assertTrue(isinstance(login, TemplateHTML))
-        self.assertEqual(login.template, 'cms/toolbar/items/login.html')
+        self.assertEqual(login.template, 'cms/toolbar/menu/login.html')
 
     def test_toolbar_no_page_staff(self):
         request = self.request_factory.get('/')
@@ -141,7 +141,7 @@ def test_toolbar_anon(self):
         # check the login form is there
         login = items[1]
         self.assertTrue(isinstance(login, TemplateHTML))
-        self.assertEqual(login.template, 'cms/toolbar/items/login.html')
+        self.assertEqual(login.template, 'cms/toolbar/menu/login.html')
 
     def test_toolbar_staff(self):
         page = create_page('test', 'nav_playground.html', 'en', published=True)

diff --git a/cms/toolbar/items.py b/cms/toolbar/items.py
@@ -9,7 +9,7 @@ def get_context(self):
         return {}
 
 class List(BaseItem):
-    template = "cms/toolbar/items/list.html"
+    template = "cms/toolbar/menu/list.html"
     def __init__(self, url, name):
         self.items = []
         self.url = url
@@ -19,7 +19,7 @@ def get_context(self):
         return {'items':self.items, 'url':self.url, 'title':self.name}
 
 class Item(BaseItem):
-    template = "cms/toolbar/items/item.html"
+    template = "cms/toolbar/menu/item.html"
 
     def __init__(self, url, title, load_side_frame=False, ajax=False, active=False, question=""):
         if load_side_frame and ajax:
@@ -44,10 +44,10 @@ def get_context(self):
 
 
 class Break(BaseItem):
-    template = "cms/toolbar/items/break.html"
+    template = "cms/toolbar/menu/break.html"
 
 class Dialog(BaseItem):
-    template = "cms/toolbar/items/dialog.html"
+    template = "cms/toolbar/menu/dialog.html"
 
     def __init__(self, url, title, question):
         self.url = url