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

Remove navigationContext variable

Browse Source
This commit is contained in:
Patrick Smith 2018-08-21 14:54:31 -04:00
parent 34d652f33a
commit 0631b69503
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
atst/app.py
View File

@ -62,11 +62,6 @@ def make_app(config):
def make_flask_callbacks(app): def make_flask_callbacks(app):
@app.before_request @app.before_request
def _set_globals(): def _set_globals():
g.navigationContext = (
"workspace"
if re.match("\/workspaces\/[A-Za-z0-9]*", request.path)
else "global"
)
g.dev = os.getenv("FLASK_ENV", "dev") == "dev" g.dev = os.getenv("FLASK_ENV", "dev") == "dev"
g.matchesPath = lambda href: re.match("^" + href, request.path) g.matchesPath = lambda href: re.match("^" + href, request.path)
g.modal = request.args.get("modal", None) g.modal = request.args.get("modal", None)

4
templates/base.html
View File

@ -1,7 +1,3 @@
{# TODO: set this context elsewhere #}
{# set context='workspace' #}
{% set context=g.navigationContext %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>

4
templates/error_base.html
View File

@ -1,7 +1,3 @@
{# TODO: set this context elsewhere #}
{# set context='workspace' #}
{% set context=g.navigationContext %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>

2
templates/navigation/global_navigation.html
View File

@ -1,6 +1,6 @@
{% from "components/sidenav_item.html" import SidenavItem %} {% from "components/sidenav_item.html" import SidenavItem %}
<div class="global-navigation sidenav global-navigation__context--{{context}}"> <div class="global-navigation sidenav">
<ul> <ul>
{% if g.dev %} {% if g.dev %}
{{ SidenavItem("Styleguide", {{ SidenavItem("Styleguide",