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

Merge pull request #98 from dod-ccpo/ui/ws-context

Browse Source 
workspace context setup
This commit is contained in:
andrewdds 2018-07-27 08:13:26 -04:00 committed by GitHub
commit e26109178d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/ui_methods.py
View File

@ -1,4 +1,8 @@
import os import os
import re
def navigationContext(self):
return 'workspace' if re.match('\/workspaces\/[A-Za-z0-9]*', self.request.uri) else 'global'
def dev(self): def dev(self):
return os.getenv("TORNADO_ENV", "dev") == "dev" return os.getenv("TORNADO_ENV", "dev") == "dev"

2
templates/base.html.to
View File

@ -1,6 +1,6 @@
{# TODO: set this context elsewhere #} {# TODO: set this context elsewhere #}
{# set context='workspace' #} {# set context='workspace' #}
{% set context='global' %} {% set context=navigationContext() %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>

9
templates/base_workspace.html.to Normal file
View File

@ -0,0 +1,9 @@
{% extends "base.html.to" %}
{% block content %}
{% include 'navigation/workspace_navigation.html.to' %}
{% block workspace_content %}{% end %}
{% end %}

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">JEDI</span> <span class="topbar__link-label">{{ "Workspace Name" 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>

1
templates/navigation/workspace_navigation.html.to Normal file
View File

@ -0,0 +1 @@
nav

4
templates/workspace.html.to
View File

@ -1,6 +1,6 @@
{% extends "base.html.to" %} {% extends "base_workspace.html.to" %}
{% block content %} {% block workspace_content %}
<div class="panel"> <div class="panel">
<div class='responsive-table-wrapper'> <div class='responsive-table-wrapper'>

6
templates/workspaces.html.to
View File

@ -13,10 +13,10 @@
<tbody> <tbody>
{% for w in workspaces %} {% for w in workspaces %}
<tr> <tr>
<th scope="row"> <td scope="row">
<a href="">{{ w['name'] }}</a><br> <a href="/workspaces/{{w['task_order']['number']}}">{{ w['name'] }}</a><br>
Task Order: #{{ w['task_order']['number'] }} Task Order: #{{ w['task_order']['number'] }}
</th> </td>
<td> <td>
<span class="usa-label">{{ w['user_count'] }}</span><br>Users <span class="usa-label">{{ w['user_count'] }}</span><br>Users
</td> </td>