Merge branch 'master' into ui-progress-bar

This commit is contained in:
luisgov
2018-07-20 14:49:34 -04:00
committed by GitHub
37 changed files with 625 additions and 285 deletions

View File

@@ -1,3 +1,7 @@
{# TODO: set this context elsewhere #}
{# set context='workspace' #}
{% set context='global' %}
<!DOCTYPE html>
<html>
<head>
@@ -10,19 +14,20 @@
<link rel="icon" type="image/x-icon" href="/static/img/favicon.ico">
</head>
<body>
{% include 'navigation/topbar.html.to' %}
{% include 'header.html.to' %}
<div class='global-layout'>
{% include 'navigation/global_navigation.html.to' %}
<div class='panel-container'>
{% block sidenav %}{% end %}
<div class='global-panel-container'>
{% block sidenav %}{% end %}
{% block content %}
these are not the droids you are looking for
{% end %}
{% block content %}
these are not the droids you are looking for
{% end %}
</div>
</div>
{% include 'footer.html.to' %}
</body>
</html>

View File

@@ -5,7 +5,7 @@
</a>
<a href="/" class="topbar__link topbar__link--secondary">
<span>Tech Lead</span>
<span>{{ current_user.get("atat_role") }}</span>
</a>
</nav>
</header>

View File

@@ -1,9 +1,5 @@
{% extends "base.html.to" %}
{% block sidenav %}
{% include 'nav-side.html.to' %}
{% end %}
{% block content %}
<main class="usa-section usa-content">

View File

@@ -0,0 +1,9 @@
<li>
<a class="sidenav__link {% if active %}sidenav__link--active{% end %}" href="{{href}}" title="{{label}}">
{% if icon %}
{% module Icon(icon, classes="sidenav__link-icon") %}
{% end %}
<span class="sidenav__link-label">{{label}}</span>
</a>
</li>

View File

@@ -0,0 +1,6 @@
<div class="global-navigation sidenav global-navigation__context--{{context}}">
<ul>
{% module SidenavItem("Requests", href="/requests", icon="document", active=matchesPath('/requests')) %}
{% module SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=matchesPath('/workspaces')) %}
</ul>
</div>

View File

@@ -0,0 +1,19 @@
<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') %}
</a>
<div class="topbar__context topbar__context--{{context}}">
<a href="/" class="topbar__link">
<span class="topbar__link-label">JEDI</span>
{% module Icon('caret_down', classes='topbar__link-icon icon--tiny') %}
</a>
<a href="/" class="topbar__link">
<span class="topbar__link-label">Sam Seeceepio</span>
{% module Icon('avatar', classes='topbar__link-icon') %}
</a>
</div>
</nav>
</header>

View File

@@ -1,9 +1,5 @@
{% extends "base.html.to" %}
{% block sidenav %}
{% include 'nav-side.html.to' %}
{% end %}
{% block content %}

View File

@@ -1,12 +1,8 @@
{% extends "base.html.to" %}
{% block content %}
<main class="usa-section usa-content usa-width-one-whole">
<h1>Workspaces</h1>
<table class="usa-table-borderless" width="100%">
<div class='col'>
<table>
<thead>
<tr>
<th scope="col" width="50%">Workspace Name</th>
@@ -29,8 +25,6 @@
{% end %}
</tbody>
</table>
</main>
</div>
{% end %}