diff --git a/templates/navigation/workspace_navigation.html b/templates/navigation/workspace_navigation.html index 3ed02ea9..6dfa4f09 100644 --- a/templates/navigation/workspace_navigation.html +++ b/templates/navigation/workspace_navigation.html @@ -9,8 +9,8 @@ subnav=[ { "label": "Add New Project", - "href":"/", - "active": g.matchesPath('workspaces/projects/new'), + "href": url_for('workspaces.new_project', workspace_id=workspace.id), + "active": g.matchesPath('\/workspaces\/[A-Za-z0-9-]*\/projects'), "icon": "plus" } ] diff --git a/templates/workspace_project_new.html b/templates/workspace_project_new.html new file mode 100644 index 00000000..0996946d --- /dev/null +++ b/templates/workspace_project_new.html @@ -0,0 +1,8 @@ +{% from "components/icon.html" import Icon %} + +{% extends "base_workspace.html" %} + +{% block workspace_content %} +

Add a new project

+ +{% endblock %} diff --git a/templates/workspace_projects.html b/templates/workspace_projects.html index d299897a..18f24396 100644 --- a/templates/workspace_projects.html +++ b/templates/workspace_projects.html @@ -1,9 +1,20 @@ {% from "components/icon.html" import Icon %} +{% from "components/alert.html" import Alert %} {% extends "base_workspace.html" %} {% block workspace_content %} +{% if True %} + {{ Alert('Workspace created!', + message="\ +

You are now ready to create projects and environments within the JEDI Cloud.

+ ", + actions='', + level='success' + ) }} +{% endif %} + {% for project in workspace.projects %}
diff --git a/templates/workspaces_blank.html.to b/templates/workspaces_blank.html.to deleted file mode 100644 index 0e5f4a0a..00000000 --- a/templates/workspaces_blank.html.to +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "base.html.to" %} - -{% block content %} - -
-

There are currently no JEDI workspaces

- New Workspace -
- - -{% end %} -