diff --git a/atst/app.py b/atst/app.py index 37140abb..5025ffc3 100644 --- a/atst/app.py +++ b/atst/app.py @@ -121,7 +121,7 @@ def make_app(config, deps, **kwargs): url(r"/reports", Main, {"page": "reports"}, name="reports"), url(r"/calculator", Main, {"page": "calculator"}, name="calculator"), url(r"/workspaces/(\S+)/members", WorkspaceMembers, {}, name="workspace_members"), - url(r"/workspaces/(\S+)", Workspace, {}, name="workspace"), + url(r"/workspaces/(\S+)/projects", Workspace, {}, name="workspace_projects"), ] if not ENV == "production": diff --git a/atst/handlers/workspace.py b/atst/handlers/workspace.py index 5a1f80ec..a14458a6 100644 --- a/atst/handlers/workspace.py +++ b/atst/handlers/workspace.py @@ -12,4 +12,4 @@ class Workspace(BaseHandler): @tornado.gen.coroutine def get(self, workspace_id): projects = self.projects_repo.get_many(workspace_id) - self.render("workspace.html.to", projects=projects) + self.render("workspace_projects.html.to", workspace_id=workspace_id, projects=projects) diff --git a/atst/handlers/workspace_members.py b/atst/handlers/workspace_members.py index c9b12fdf..9ffa7958 100644 --- a/atst/handlers/workspace_members.py +++ b/atst/handlers/workspace_members.py @@ -12,4 +12,4 @@ class WorkspaceMembers(BaseHandler): @tornado.gen.coroutine def get(self, workspace_id): members = self.members_repo.get_many(workspace_id) - self.render("workspace_members.html.to", members=members) + self.render("workspace_members.html.to", workspace_id=workspace_id, members=members) diff --git a/atst/ui_methods.py b/atst/ui_methods.py index 7347a412..cc93a14e 100644 --- a/atst/ui_methods.py +++ b/atst/ui_methods.py @@ -8,7 +8,7 @@ def dev(self): return os.getenv("TORNADO_ENV", "dev") == "dev" def matchesPath(self, href): - return self.request.uri.startswith(href) + return re.match('^'+href, self.request.uri) def modal(self, body): return self.render_string( diff --git a/scss/atat.scss b/scss/atat.scss index e282ef53..a2f91592 100644 --- a/scss/atat.scss +++ b/scss/atat.scss @@ -16,9 +16,10 @@ @import 'elements/labels'; @import 'elements/diff'; -@import 'components/layout'; @import 'components/topbar'; +@import 'components/global_layout'; @import 'components/global_navigation'; +@import 'components/workspace_layout'; @import 'components/site_action'; @import 'components/empty_state'; @import 'components/alerts'; diff --git a/scss/components/_layout.scss b/scss/components/_global_layout.scss similarity index 100% rename from scss/components/_layout.scss rename to scss/components/_global_layout.scss diff --git a/scss/components/_workspace_layout.scss b/scss/components/_workspace_layout.scss new file mode 100644 index 00000000..e2cf4c24 --- /dev/null +++ b/scss/components/_workspace_layout.scss @@ -0,0 +1,26 @@ +.workspace-panel-container { + @include media($large-screen) { + @include grid-row; + } +} + +.workspace-navigation { + @include panel-margin; + + ul { + display: flex; + flex-wrap: wrap; + li { + flex-grow: 1; + } + } + + @include media($large-screen) { + width: 20rem; + margin-right: $gap * 2; + + ul { + display: block; + } + } +} diff --git a/templates/base_workspace.html.to b/templates/base_workspace.html.to index 9622032f..7803ace8 100644 --- a/templates/base_workspace.html.to +++ b/templates/base_workspace.html.to @@ -2,8 +2,14 @@ {% block content %} - {% include 'navigation/workspace_navigation.html.to' %} +
+
+ {% include 'navigation/workspace_navigation.html.to' %} +
- {% block workspace_content %}{% end %} +
+ {% block workspace_content %}{% end %} +
+
{% end %} diff --git a/templates/navigation/topbar.html.to b/templates/navigation/topbar.html.to index eb7a6499..207f5ecd 100644 --- a/templates/navigation/topbar.html.to +++ b/templates/navigation/topbar.html.to @@ -6,7 +6,7 @@
- {{ "Workspace Name" if context == 'workspace' else "JEDI" }} + {{ "Workspace "+workspace_id if context == 'workspace' else "JEDI" }} {% module Icon('caret_down', classes='topbar__link-icon icon--tiny') %} diff --git a/templates/navigation/workspace_navigation.html.to b/templates/navigation/workspace_navigation.html.to index cd325bcf..93ab38b1 100644 --- a/templates/navigation/workspace_navigation.html.to +++ b/templates/navigation/workspace_navigation.html.to @@ -1 +1,21 @@ -nav + diff --git a/templates/workspace_members.html.to b/templates/workspace_members.html.to index 9d66ee83..a38f653e 100644 --- a/templates/workspace_members.html.to +++ b/templates/workspace_members.html.to @@ -1,6 +1,6 @@ -{% extends "base.html.to" %} +{% extends "base_workspace.html.to" %} -{% block content %} +{% block workspace_content %}
diff --git a/templates/workspace.html.to b/templates/workspace_projects.html.to similarity index 100% rename from templates/workspace.html.to rename to templates/workspace_projects.html.to diff --git a/templates/workspaces.html.to b/templates/workspaces.html.to index efd63fa7..6e7e7931 100644 --- a/templates/workspaces.html.to +++ b/templates/workspaces.html.to @@ -14,7 +14,7 @@ {% for w in workspaces %} - {{ w['name'] }}
+ {{ w['name'] }}
Task Order: #{{ w['task_order']['number'] }}