pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

home.html is rendering

Browse Source 
- Converted Icon and SidenavItem into macros
- Setting a mock user on g.current_user
This commit is contained in:
richard-dds
2018-08-01 11:40:07 -04:00
parent 29c68151de
commit 0976aed778
4 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
templates/navigation/global_navigation.html.to
View File

@@ -1,24 +1,25 @@
{% from "components.html" import SidenavItem %}
<div class="global-navigation sidenav global-navigation__context--{{context}}">
<ul>
{% if dev() %}
{% module SidenavItem("Styleguide",
{% if g.dev %}
{{ SidenavItem("Styleguide",
href="/styleguide",
icon="visible",
active=matchesPath('/styleguide'),
active=g.matchesPath('/styleguide'),
subnav=[
{"label":"Subnav 1", "href":"/styleguide?subnav1", "icon": "plus", "active": matchesPath('/styleguide?subnav1')},
{"label":"Subnav 2", "href":"/styleguide?subnav2", "active": matchesPath('/styleguide?subnav2')},
]) %}
{% end %}
{"label":"Subnav 1", "href":"/styleguide?subnav1", "icon": "plus", "active": g.matchesPath('/styleguide?subnav1')},
{"label":"Subnav 2", "href":"/styleguide?subnav2", "active": g.matchesPath('/styleguide?subnav2')},
]) }}
{% endif %}
{% module SidenavItem("Requests",
{{ SidenavItem("Requests",
href="/requests",
icon="document",
active=matchesPath('/requests'),
active=g.matchesPath('/requests'),
subnav=[
{"label":"New Request", "href":"/requests/new", "icon": "plus", "active": matchesPath('/requests/new')},
{"label":"New Request", "href":"/requests/new", "icon": "plus", "active": g.matchesPath('/requests/new')},
]
) %}
{% module SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=matchesPath('/workspaces')) %}
) }}
{{ SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=g.matchesPath('/workspaces')) }}
</ul>
</div>

9
templates/navigation/topbar.html.to
View File

@@ -1,18 +1,19 @@
{% from "components.html" import Icon %}
<header class="topbar">
<nav class="topbar__navigation">
<a href="/home" class="topbar__link topbar__link--shield" title="JEDI Home">
{% module Icon('shield', classes='topbar__link-icon') %}
{{ Icon('shield', classes='topbar__link-icon') }}
</a>
<div class="topbar__context topbar__context--{{context}}">
<a href="/" class="topbar__link">
<span class="topbar__link-label">{{ "Workspace 123456" if context == 'workspace' else "JEDI" }}</span>
{% module Icon('caret_down', classes='topbar__link-icon icon--tiny') %}
{{ Icon('caret_down', classes='topbar__link-icon icon--tiny') }}
</a>
<a href="/" class="topbar__link">
<span class="topbar__link-label">{{ current_user["first_name"] + " " + current_user["last_name"] }}</span>
{% module Icon('avatar', classes='topbar__link-icon') %}
<span class="topbar__link-label">{{ g.current_user.first_name + " " + g.current_user.last_name }}</span>
{{ Icon('avatar', classes='topbar__link-icon') }}
</a>
</div>
</nav>