Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 7a310366cf08bd01f35a5f731d763312ff15fc78 1 parent 1bc0d2a
@FinalAngel FinalAngel authored
View
0  cms/templates/cms/toolbar/items/break.html → cms/templates/cms/toolbar/menu/break.html
File renamed without changes
View
0  cms/templates/cms/toolbar/items/item.html → cms/templates/cms/toolbar/menu/item.html
File renamed without changes
View
0  cms/templates/cms/toolbar/items/list.html → cms/templates/cms/toolbar/menu/list.html
File renamed without changes
View
4 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)
View
8 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
Please sign in to comment.
Something went wrong with that request. Please try again.