From 88793cab3f43f1bee01cd0b505f3e95ebee58d23 Mon Sep 17 00:00:00 2001
From: Andrew Croce <andrew+dds@promptworks.com>
Date: Mon, 24 Sep 2018 16:11:12 -0400
Subject: [PATCH] refactor topbar a bit so the shield icon and "JEDI Cloud"
 label are one link

---
 templates/navigation/topbar.html | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/templates/navigation/topbar.html b/templates/navigation/topbar.html
index 35b87473..21a381db 100644
--- a/templates/navigation/topbar.html
+++ b/templates/navigation/topbar.html
@@ -2,15 +2,23 @@
 
 <header class="topbar">
   <nav class="topbar__navigation">
-    <a href="{{ url_for('atst.home') }}" class="topbar__link topbar__link--shield" title="JEDI Cloud Home">
-      {{ Icon('shield', classes='topbar__link-icon') }}
-    </a>
+    {% if not workspace %}
+      <a href="{{ url_for('atst.home') }}" class="topbar__link topbar__link--home">
+        {{ Icon('shield', classes='topbar__link-icon') }}
+        <span class="topbar__link-label">JEDI Cloud</span>
+      </a>
+    {% else %}
+      <a href="{{ url_for('atst.home') }}" class="topbar__link topbar__link--shield" title="JEDI Cloud Home">
+        {{ Icon('shield', classes='topbar__link-icon') }}
+      </a>
+    {% endif %}
 
     <div class="topbar__context {% if workspace %}topbar__context--workspace{% endif %}">
-      {% set topbar_link = url_for("workspaces.show_workspace", workspace_id=workspace.id) if workspace else url_for("atst.home") %}
-      <a href="{{ topbar_link }}" class="topbar__link">
-        <span class="topbar__link-label">{{ ("Workspace " + workspace.name) if workspace else "JEDI Cloud" }}</span>
-      </a>
+      {% if workspace %}
+        <a href="{{ url_for("workspaces.show_workspace", workspace_id=workspace.id) }}" class="topbar__link topbar__link--workspace">
+          <span class="topbar__link-label">{{ ("Workspace " + workspace.name) }}</span>
+        </a>
+      {% endif %}
 
       <a href="/" class="topbar__link">
         <span class="topbar__link-label">{{ g.current_user.first_name + " " + g.current_user.last_name }}</span>