Merge branch 'master' into ui/styleguide
This commit is contained in:
@@ -6,7 +6,7 @@ _DEV_USERS = {
|
||||
"sam": {
|
||||
"id": "164497f6-c1ea-4f42-a5ef-101da278c012",
|
||||
"first_name": "Sam",
|
||||
"last_name": "CCPO",
|
||||
"last_name": "Seeceepio",
|
||||
"atat_role": "ccpo"
|
||||
},
|
||||
|
||||
|
||||
@@ -5,3 +5,12 @@ def dev(self):
|
||||
|
||||
def matchesPath(self, href):
|
||||
return self.request.uri.startswith(href)
|
||||
|
||||
def modal(self, body):
|
||||
return self.render_string(
|
||||
"components/modal.html.to",
|
||||
body=body)
|
||||
|
||||
def modalOpen(self):
|
||||
# For now, just check a dummy URL param
|
||||
return self.get_argument("modal", False)
|
||||
|
||||
@@ -16,10 +16,11 @@ class Icon(UIModule):
|
||||
"components/icon.html.to", svg=svg.read(), name=name, classes=classes)
|
||||
|
||||
class SidenavItem(UIModule):
|
||||
def render(self, label, href, active=False, icon=None):
|
||||
def render(self, label, href, active=False, icon=None, subnav=None):
|
||||
return self.render_string(
|
||||
"navigation/_sidenav_item.html.to",
|
||||
label=label,
|
||||
href=href,
|
||||
active=active,
|
||||
icon=icon)
|
||||
icon=icon,
|
||||
subnav=subnav)
|
||||
|
||||
Reference in New Issue
Block a user