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

Remove workspace ID from templates, since its not really working anyway. Replace with a static dummy ID.

Browse Source
This commit is contained in:
Andrew Croce 2018-07-30 11:17:54 -04:00
parent 9369a137ca
commit fbbd766f1f
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
<div class="topbar__context topbar__context--{{context}}"> <div class="topbar__context topbar__context--{{context}}">
<a href="/" class="topbar__link"> <a href="/" class="topbar__link">
<span class="topbar__link-label">{{ "Workspace "+workspace_id if context == 'workspace' else "JEDI" }}</span> <span class="topbar__link-label">{{ "Workspace 123456" if context == 'workspace' else "JEDI" }}</span>
{% module Icon('caret_down', classes='topbar__link-icon icon--tiny') %} {% module Icon('caret_down', classes='topbar__link-icon icon--tiny') %}
</a> </a>

26
templates/navigation/workspace_navigation.html.to
View File

@ -2,20 +2,28 @@
<ul> <ul>
{% module SidenavItem( {% module SidenavItem(
"Projects", "Projects",
href=reverse_url('workspace_projects', workspace_id), href=reverse_url('workspace_projects', '123456'),
active=matchesPath('\/workspaces\/[A-Za-z0-9]*\/projects')) active=matchesPath('\/workspaces\/[A-Za-z0-9]*\/projects'),
%} subnav=[
{
"label": "Add New Project",
"href":"/",
"active": matchesPath('workspaces/projects/new'),
"icon": "plus"
}
]
)%}
{% module SidenavItem( {% module SidenavItem(
"Members", "Members",
href=reverse_url('workspace_members', workspace_id), href=reverse_url('workspace_members', '123456'),
active=matchesPath('\/workspaces\/[A-Za-z0-9]*\/members')) active=matchesPath('\/workspaces\/[A-Za-z0-9]*\/members')
%} )%}
{% module SidenavItem( {% module SidenavItem(
"Funding & Reports", "Funding & Reports",
href=reverse_url('workspace_projects', workspace_id), href=reverse_url('workspace_projects', '123456'),
active=matchesPath('\/workspaces\/[A-Za-z0-9]*\/reports')) active=matchesPath('\/workspaces\/[A-Za-z0-9]*\/reports')
%} )%}
</ul> </ul>
</nav> </nav>