Merge pull request #99 from dod-ccpo/ui/workspace-navigation

Ui/workspace navigation

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":

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)

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)

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(