From 0c2efa7c5c04c1cf3da745ab55ae6100881afe31 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Sat, 19 Sep 2020 13:38:05 -0700
Subject: [PATCH 1/9] Load realm for system admin pages

---
 cmd/server/main.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/server/main.go b/cmd/server/main.go
index 61149f98d..1c7323edf 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -365,6 +365,7 @@ func realMain(ctx context.Context) error {
 	{
 		adminSub := r.PathPrefix("/admin").Subrouter()
 		adminSub.Use(requireAuth)
+		adminSub.Use(loadCurrentRealm)
 		adminSub.Use(requireVerified)
 		adminSub.Use(requireSystemAdmin)
 		adminSub.Use(rateLimit)

From db1f38d9108cbf68dab7e50f128f5aeeed9bfb6e Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Sat, 19 Sep 2020 13:41:41 -0700
Subject: [PATCH 2/9] select realm

---
 cmd/server/assets/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/server/assets/header.html b/cmd/server/assets/header.html
index 968cd08ce..dde2594b4 100644
--- a/cmd/server/assets/header.html
+++ b/cmd/server/assets/header.html
@@ -236,7 +236,7 @@ <h6 class="dropdown-header">System admin</h6>
 
               <h6 class="dropdown-header">Actions</h6>
               {{if gt (len .currentUser.Realms) 1}}
-              <a class="dropdown-item" href="/login/select-realm">Change realm</a>
+              <a class="dropdown-item" href="/login/select-realm">{{if .currentRealm}}Change realm{{else}}Select realm{{end}}</a>
               {{end}}
               <a class="dropdown-item" href="/signout">Sign out</a>
             </div>

From 88d814b1bd1c505f6c828e15a8b1cba75f10476d Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Sat, 19 Sep 2020 16:42:43 -0700
Subject: [PATCH 3/9] Differentiate admin

---
 cmd/server/assets/admin/_nav.html         | 46 +++++++++++++
 cmd/server/assets/admin/info.html         |  1 -
 cmd/server/assets/admin/realms/index.html |  1 -
 cmd/server/assets/admin/realms/new.html   |  1 -
 cmd/server/assets/admin/users/index.html  |  1 -
 cmd/server/assets/admin/users/new.html    |  1 -
 cmd/server/assets/header.html             | 80 +++++++++++++++++++++++
 7 files changed, 126 insertions(+), 5 deletions(-)

diff --git a/cmd/server/assets/admin/_nav.html b/cmd/server/assets/admin/_nav.html
index 8786276ac..076d199ff 100644
--- a/cmd/server/assets/admin/_nav.html
+++ b/cmd/server/assets/admin/_nav.html
@@ -1,4 +1,50 @@
 {{define "admin/navbar"}}
+<header class="mb-3">
+  <div href="/" class="d-block px-3 py-2 text-center text-bold text-white admin-header">
+    System Admin
+  </div>
+
+  <nav class="navbar navbar-expand-md navbar-dark bg-primary">
+    <div class="container">
+      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
+        aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+
+      <div class="collapse navbar-collapse" id="navbar">
+        <ul class="navbar-nav mr-auto">
+          {{if .currentRealm}}
+          <li class="nav-item">
+            <a class="nav-link" href="/home">&larr; Back to {{.currentRealm.Name}} </a>
+          </li>
+          {{end}}
+        </ul>
+
+        <ul class="navbar-nav ml-auto">
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="profile-menu" data-toggle="dropdown" aria-haspopup="true"
+              aria-expanded="false">
+              {{.currentUser.Name}}
+            </a>
+
+            <div class="dropdown-menu" aria-labelledby="profile-menu">
+              <h6 class="dropdown-header">System admin</h6>
+              <a class="dropdown-item" href="/admin/realms">Realms</a>
+              <a class="dropdown-item" href="/admin/users">Admins</a>
+              <div class="dropdown-divider"></div>
+
+              <h6 class="dropdown-header">Actions</h6>
+              <a class="dropdown-item" href="/login/select-realm">{{if .currentRealm}}Change realm{{else}}Select realm{{end}}</a>
+              <a class="dropdown-item" href="/signout">Sign out</a>
+            </div>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </nav>
+</header>
+
+
 <ul class="nav nav-pills justify-content-center mb-3">
   <li class="nav-item">
     <a class="nav-link{{if stringContains .currentPath "/admin/realms"}} active{{end}}" href="/admin/realms">Realms</a>
diff --git a/cmd/server/assets/admin/info.html b/cmd/server/assets/admin/info.html
index 6eeb109ec..1b7827c5f 100644
--- a/cmd/server/assets/admin/info.html
+++ b/cmd/server/assets/admin/info.html
@@ -7,7 +7,6 @@
 </head>
 
 <body class="bg-light">
-  {{template "navbar" .}}
   {{template "admin/navbar" .}}
 
   <main role="main" class="container">
diff --git a/cmd/server/assets/admin/realms/index.html b/cmd/server/assets/admin/realms/index.html
index d5f97c1aa..060f158f5 100644
--- a/cmd/server/assets/admin/realms/index.html
+++ b/cmd/server/assets/admin/realms/index.html
@@ -9,7 +9,6 @@
 </head>
 
 <body class="bg-light">
-  {{template "navbar" .}}
   {{template "admin/navbar" .}}
 
   <main role="main" class="container">
diff --git a/cmd/server/assets/admin/realms/new.html b/cmd/server/assets/admin/realms/new.html
index 7fa329c95..6f84d3ef1 100644
--- a/cmd/server/assets/admin/realms/new.html
+++ b/cmd/server/assets/admin/realms/new.html
@@ -10,7 +10,6 @@
 </head>
 
 <body class="bg-light">
-  {{template "navbar" .}}
   {{template "admin/navbar" .}}
 
   <main role="main" class="container">
diff --git a/cmd/server/assets/admin/users/index.html b/cmd/server/assets/admin/users/index.html
index 33de32cfa..d080c7123 100644
--- a/cmd/server/assets/admin/users/index.html
+++ b/cmd/server/assets/admin/users/index.html
@@ -10,7 +10,6 @@
 </head>
 
 <body class="bg-light">
-  {{template "navbar" .}}
   {{template "admin/navbar" .}}
 
   <main role="main" class="container">
diff --git a/cmd/server/assets/admin/users/new.html b/cmd/server/assets/admin/users/new.html
index 530d89e02..e278cbe72 100644
--- a/cmd/server/assets/admin/users/new.html
+++ b/cmd/server/assets/admin/users/new.html
@@ -11,7 +11,6 @@
 </head>
 
 <body class="bg-light">
-  {{template "navbar" .}}
   {{template "admin/navbar" .}}
 
   <main role="main" class="container">
diff --git a/cmd/server/assets/header.html b/cmd/server/assets/header.html
index dde2594b4..09bddfd64 100644
--- a/cmd/server/assets/header.html
+++ b/cmd/server/assets/header.html
@@ -33,6 +33,10 @@
     background-color: #0055b1;
   }
 
+  div.admin-header {
+    background-color:#D66402
+  }
+
   a.input-group-text:hover {
     cursor: pointer;
     text-decoration: none;
@@ -255,6 +259,82 @@ <h6 class="dropdown-header">Actions</h6>
 </header>
 {{end}}
 
+{{define "admin-navbar"}}
+<header class="mb-3">
+  {{if .currentRealm}}
+  <div href="/" class="d-block px-3 py-2 text-center text-bold text-white realm-header">
+    {{.currentRealm.Name}}{{if .currentRealm.RegionCode}} - {{.currentRealm.RegionCode}}{{end}}
+  </div>
+  {{end}}
+
+  <nav class="navbar navbar-expand-md navbar-dark bg-primary">
+    <div class="container">
+      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
+        aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+
+      <div class="collapse navbar-collapse" id="navbar">
+        {{if .currentUser}}
+        <ul class="navbar-nav mr-auto">
+          {{if .currentRealm}}
+          <li class="nav-item">
+            <a class="nav-link" href="/home">Issue code</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" href="/code/status">Check code status</a>
+          </li>
+          {{end}}
+        </ul>
+
+        <ul class="navbar-nav ml-auto">
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="profile-menu" data-toggle="dropdown" aria-haspopup="true"
+              aria-expanded="false">
+              {{.currentUser.Name}}
+            </a>
+
+            <div class="dropdown-menu" aria-labelledby="profile-menu">
+              {{if .currentRealm }}
+              {{if .currentUser.CanAdminRealm .currentRealm.ID}}
+              <h6 class="dropdown-header">Manage realm</h6>
+              <a class="dropdown-item" href="/apikeys">API keys</a>
+              <a class="dropdown-item" href="/realm/keys">Signing keys</a>
+              <a class="dropdown-item" href="/realm/stats">Statistics</a>
+              <a class="dropdown-item" href="/users">Users</a>
+              <a class="dropdown-item" href="/realm/settings#general">Settings</a>
+              <div class="dropdown-divider"></div>
+              {{end}}
+              {{end}}
+
+              {{if .currentUser.Admin}}
+              <h6 class="dropdown-header">System admin</h6>
+              <a class="dropdown-item" href="/admin/realms">Realms</a>
+              <a class="dropdown-item" href="/admin/users">Admins</a>
+              <div class="dropdown-divider"></div>
+              {{end}}
+
+              <h6 class="dropdown-header">Actions</h6>
+              {{if gt (len .currentUser.Realms) 1}}
+              <a class="dropdown-item" href="/login/select-realm">{{if .currentRealm}}Change realm{{else}}Select realm{{end}}</a>
+              {{end}}
+              <a class="dropdown-item" href="/signout">Sign out</a>
+            </div>
+          </li>
+        </ul>
+        {{else}}
+        <ul class="navbar-nav ml-auto">
+          <li class="nav-item">
+            <a class="nav-link" href="/">Sign in</a>
+          </li>
+        </ul>
+        {{end}}
+      </div>
+    </div>
+  </nav>
+</header>
+{{end}}
+
 {{define "scripts"}}
 <script type="text/javascript">
   $(function() {

From 3517a899270a9dbcae6008f64f6587f4494101e8 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Sat, 19 Sep 2020 18:22:23 -0700
Subject: [PATCH 4/9] remove duplication

---
 cmd/server/assets/admin/_nav.html |  27 +----
 cmd/server/assets/header.html     | 174 ++++++++++--------------------
 2 files changed, 56 insertions(+), 145 deletions(-)

diff --git a/cmd/server/assets/admin/_nav.html b/cmd/server/assets/admin/_nav.html
index 076d199ff..9f0d6e7db 100644
--- a/cmd/server/assets/admin/_nav.html
+++ b/cmd/server/assets/admin/_nav.html
@@ -6,11 +6,7 @@
 
   <nav class="navbar navbar-expand-md navbar-dark bg-primary">
     <div class="container">
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
-        aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
+      {{template "navtoggle" .}}
       <div class="collapse navbar-collapse" id="navbar">
         <ul class="navbar-nav mr-auto">
           {{if .currentRealm}}
@@ -19,26 +15,7 @@
           </li>
           {{end}}
         </ul>
-
-        <ul class="navbar-nav ml-auto">
-          <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="profile-menu" data-toggle="dropdown" aria-haspopup="true"
-              aria-expanded="false">
-              {{.currentUser.Name}}
-            </a>
-
-            <div class="dropdown-menu" aria-labelledby="profile-menu">
-              <h6 class="dropdown-header">System admin</h6>
-              <a class="dropdown-item" href="/admin/realms">Realms</a>
-              <a class="dropdown-item" href="/admin/users">Admins</a>
-              <div class="dropdown-divider"></div>
-
-              <h6 class="dropdown-header">Actions</h6>
-              <a class="dropdown-item" href="/login/select-realm">{{if .currentRealm}}Change realm{{else}}Select realm{{end}}</a>
-              <a class="dropdown-item" href="/signout">Sign out</a>
-            </div>
-          </li>
-        </ul>
+        {{template "navdropdown" .}}
       </div>
     </div>
   </nav>
diff --git a/cmd/server/assets/header.html b/cmd/server/assets/header.html
index 09bddfd64..4a215f581 100644
--- a/cmd/server/assets/header.html
+++ b/cmd/server/assets/header.html
@@ -183,6 +183,7 @@
 </style>
 {{end}}
 
+{{/* defines the top navigation bar */}}
 {{define "navbar"}}
 <header class="mb-3">
   {{if .currentRealm}}
@@ -193,146 +194,79 @@
 
   <nav class="navbar navbar-expand-md navbar-dark bg-primary">
     <div class="container">
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
-        aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
+      {{template "navtoggle" .}}
 
       <div class="collapse navbar-collapse" id="navbar">
         {{if .currentUser}}
+        {{if .currentRealm}}
         <ul class="navbar-nav mr-auto">
-          {{if .currentRealm}}
           <li class="nav-item">
             <a class="nav-link" href="/home">Issue code</a>
           </li>
           <li class="nav-item">
             <a class="nav-link" href="/code/status">Check code status</a>
           </li>
-          {{end}}
-        </ul>
-
-        <ul class="navbar-nav ml-auto">
-          <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="profile-menu" data-toggle="dropdown" aria-haspopup="true"
-              aria-expanded="false">
-              {{.currentUser.Name}}
-            </a>
-
-            <div class="dropdown-menu" aria-labelledby="profile-menu">
-              {{if .currentRealm }}
-              {{if .currentUser.CanAdminRealm .currentRealm.ID}}
-              <h6 class="dropdown-header">Manage realm</h6>
-              <a class="dropdown-item" href="/apikeys">API keys</a>
-              <a class="dropdown-item" href="/realm/keys">Signing keys</a>
-              <a class="dropdown-item" href="/realm/stats">Statistics</a>
-              <a class="dropdown-item" href="/users">Users</a>
-              <a class="dropdown-item" href="/realm/settings#general">Settings</a>
-              <div class="dropdown-divider"></div>
-              {{end}}
-              {{end}}
-
-              {{if .currentUser.Admin}}
-              <h6 class="dropdown-header">System admin</h6>
-              <a class="dropdown-item" href="/admin/realms">Realms</a>
-              <a class="dropdown-item" href="/admin/users">Admins</a>
-              <div class="dropdown-divider"></div>
-              {{end}}
-
-              <h6 class="dropdown-header">Actions</h6>
-              {{if gt (len .currentUser.Realms) 1}}
-              <a class="dropdown-item" href="/login/select-realm">{{if .currentRealm}}Change realm{{else}}Select realm{{end}}</a>
-              {{end}}
-              <a class="dropdown-item" href="/signout">Sign out</a>
-            </div>
-          </li>
-        </ul>
-        {{else}}
-        <ul class="navbar-nav ml-auto">
-          <li class="nav-item">
-            <a class="nav-link" href="/">Sign in</a>
-          </li>
         </ul>
         {{end}}
+        {{end}}
+        {{template "navdropdown" .}}
       </div>
     </div>
   </nav>
 </header>
 {{end}}
 
-{{define "admin-navbar"}}
-<header class="mb-3">
-  {{if .currentRealm}}
-  <div href="/" class="d-block px-3 py-2 text-center text-bold text-white realm-header">
-    {{.currentRealm.Name}}{{if .currentRealm.RegionCode}} - {{.currentRealm.RegionCode}}{{end}}
-  </div>
-  {{end}}
-
-  <nav class="navbar navbar-expand-md navbar-dark bg-primary">
-    <div class="container">
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
-        aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
-      </button>
-
-      <div class="collapse navbar-collapse" id="navbar">
-        {{if .currentUser}}
-        <ul class="navbar-nav mr-auto">
-          {{if .currentRealm}}
-          <li class="nav-item">
-            <a class="nav-link" href="/home">Issue code</a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" href="/code/status">Check code status</a>
-          </li>
-          {{end}}
-        </ul>
+{{/* defines the hamburger menu toggle for mobile */}}
+{{define "navtoggle"}}
+<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar"
+aria-expanded="false" aria-label="Toggle navigation">
+  <span class="navbar-toggler-icon"></span>
+</button>
+{{end}}
 
-        <ul class="navbar-nav ml-auto">
-          <li class="nav-item dropdown">
-            <a class="nav-link dropdown-toggle" href="#" id="profile-menu" data-toggle="dropdown" aria-haspopup="true"
-              aria-expanded="false">
-              {{.currentUser.Name}}
-            </a>
-
-            <div class="dropdown-menu" aria-labelledby="profile-menu">
-              {{if .currentRealm }}
-              {{if .currentUser.CanAdminRealm .currentRealm.ID}}
-              <h6 class="dropdown-header">Manage realm</h6>
-              <a class="dropdown-item" href="/apikeys">API keys</a>
-              <a class="dropdown-item" href="/realm/keys">Signing keys</a>
-              <a class="dropdown-item" href="/realm/stats">Statistics</a>
-              <a class="dropdown-item" href="/users">Users</a>
-              <a class="dropdown-item" href="/realm/settings#general">Settings</a>
-              <div class="dropdown-divider"></div>
-              {{end}}
-              {{end}}
-
-              {{if .currentUser.Admin}}
-              <h6 class="dropdown-header">System admin</h6>
-              <a class="dropdown-item" href="/admin/realms">Realms</a>
-              <a class="dropdown-item" href="/admin/users">Admins</a>
-              <div class="dropdown-divider"></div>
-              {{end}}
-
-              <h6 class="dropdown-header">Actions</h6>
-              {{if gt (len .currentUser.Realms) 1}}
-              <a class="dropdown-item" href="/login/select-realm">{{if .currentRealm}}Change realm{{else}}Select realm{{end}}</a>
-              {{end}}
-              <a class="dropdown-item" href="/signout">Sign out</a>
-            </div>
-          </li>
-        </ul>
-        {{else}}
-        <ul class="navbar-nav ml-auto">
-          <li class="nav-item">
-            <a class="nav-link" href="/">Sign in</a>
-          </li>
-        </ul>
-        {{end}}
-      </div>
+{{/* defines the dropdown menu */}}
+{{define "navdropdown"}}
+<ul class="navbar-nav ml-auto">
+  {{if .currentUser}}
+  <li class="nav-item dropdown">
+    <a class="nav-link dropdown-toggle" href="#" id="profile-menu" data-toggle="dropdown" aria-haspopup="true"
+      aria-expanded="false">
+      {{.currentUser.Name}}
+    </a>
+
+    <div class="dropdown-menu" aria-labelledby="profile-menu">
+      {{if .currentRealm }}
+      {{if .currentUser.CanAdminRealm .currentRealm.ID}}
+      <h6 class="dropdown-header">Manage realm</h6>
+      <a class="dropdown-item" href="/apikeys">API keys</a>
+      <a class="dropdown-item" href="/realm/keys">Signing keys</a>
+      <a class="dropdown-item" href="/realm/stats">Statistics</a>
+      <a class="dropdown-item" href="/users">Users</a>
+      <a class="dropdown-item" href="/realm/settings#general">Settings</a>
+      <div class="dropdown-divider"></div>
+      {{end}}
+      {{end}}
+
+      {{if .currentUser.Admin}}
+      <h6 class="dropdown-header">System admin</h6>
+      <a class="dropdown-item" href="/admin/realms">Realms</a>
+      <a class="dropdown-item" href="/admin/users">Admins</a>
+      <div class="dropdown-divider"></div>
+      {{end}}
+
+      <h6 class="dropdown-header">Actions</h6>
+      {{if gt (len .currentUser.Realms) 1}}
+      <a class="dropdown-item" href="/login/select-realm">{{if .currentRealm}}Change realm{{else}}Select realm{{end}}</a>
+      {{end}}
+      <a class="dropdown-item" href="/signout">Sign out</a>
     </div>
-  </nav>
-</header>
+  </li>
+  {{else}}
+  <li class="nav-item">
+    <a class="nav-link" href="/">Sign in</a>
+  </li>
+  {{end}}
+</ul>
 {{end}}
 
 {{define "scripts"}}

From e8f6c571af376e3467a571b304e931ce927e0385 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Sat, 19 Sep 2020 18:23:06 -0700
Subject: [PATCH 5/9] comment

---
 cmd/server/assets/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/server/assets/header.html b/cmd/server/assets/header.html
index 4a215f581..10eb606e4 100644
--- a/cmd/server/assets/header.html
+++ b/cmd/server/assets/header.html
@@ -224,7 +224,7 @@
 </button>
 {{end}}
 
-{{/* defines the dropdown menu */}}
+{{/* defines the user dropdown menu */}}
 {{define "navdropdown"}}
 <ul class="navbar-nav ml-auto">
   {{if .currentUser}}

From 459a2f68581c037cc7334376a6e38ce47bfb6d77 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Sat, 19 Sep 2020 18:24:40 -0700
Subject: [PATCH 6/9] and

---
 cmd/server/assets/header.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/cmd/server/assets/header.html b/cmd/server/assets/header.html
index 10eb606e4..5e37fd7da 100644
--- a/cmd/server/assets/header.html
+++ b/cmd/server/assets/header.html
@@ -197,8 +197,7 @@
       {{template "navtoggle" .}}
 
       <div class="collapse navbar-collapse" id="navbar">
-        {{if .currentUser}}
-        {{if .currentRealm}}
+        {{if and .currentUser .currentRealm}}
         <ul class="navbar-nav mr-auto">
           <li class="nav-item">
             <a class="nav-link" href="/home">Issue code</a>
@@ -208,7 +207,6 @@
           </li>
         </ul>
         {{end}}
-        {{end}}
         {{template "navdropdown" .}}
       </div>
     </div>

From edb8d33718e1e3b169ed16c650654011f7c3cbb3 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Sat, 19 Sep 2020 18:27:11 -0700
Subject: [PATCH 7/9] better if

---
 cmd/server/assets/admin/_nav.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/server/assets/admin/_nav.html b/cmd/server/assets/admin/_nav.html
index 9f0d6e7db..925b890db 100644
--- a/cmd/server/assets/admin/_nav.html
+++ b/cmd/server/assets/admin/_nav.html
@@ -8,13 +8,13 @@
     <div class="container">
       {{template "navtoggle" .}}
       <div class="collapse navbar-collapse" id="navbar">
+        {{if .currentRealm}}
         <ul class="navbar-nav mr-auto">
-          {{if .currentRealm}}
           <li class="nav-item">
             <a class="nav-link" href="/home">&larr; Back to {{.currentRealm.Name}} </a>
           </li>
-          {{end}}
         </ul>
+        {{end}}
         {{template "navdropdown" .}}
       </div>
     </div>

From 2912f9034815f7dedc34952293e26b9b129cdda6 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Sat, 19 Sep 2020 18:27:41 -0700
Subject: [PATCH 8/9] remove the and

---
 cmd/server/assets/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/server/assets/header.html b/cmd/server/assets/header.html
index 5e37fd7da..6d77ec55f 100644
--- a/cmd/server/assets/header.html
+++ b/cmd/server/assets/header.html
@@ -197,7 +197,7 @@
       {{template "navtoggle" .}}
 
       <div class="collapse navbar-collapse" id="navbar">
-        {{if and .currentUser .currentRealm}}
+        {{if .currentRealm}}
         <ul class="navbar-nav mr-auto">
           <li class="nav-item">
             <a class="nav-link" href="/home">Issue code</a>

From fea7d9c0a9afbc5171b1eb14670aa6535658aa15 Mon Sep 17 00:00:00 2001
From: Weston Haught <whaught@google.com>
Date: Sun, 20 Sep 2020 07:33:39 -0700
Subject: [PATCH 9/9] Update cmd/server/assets/admin/_nav.html

Co-authored-by: Seth Vargo <seth@sethvargo.com>
---
 cmd/server/assets/admin/_nav.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/server/assets/admin/_nav.html b/cmd/server/assets/admin/_nav.html
index 925b890db..5d960d491 100644
--- a/cmd/server/assets/admin/_nav.html
+++ b/cmd/server/assets/admin/_nav.html
@@ -1,7 +1,7 @@
 {{define "admin/navbar"}}
 <header class="mb-3">
   <div href="/" class="d-block px-3 py-2 text-center text-bold text-white admin-header">
-    System Admin
+    System admin
   </div>
 
   <nav class="navbar navbar-expand-md navbar-dark bg-primary">