From ab083d35ca558e6afee010b56bb33f86ae24e477 Mon Sep 17 00:00:00 2001
From: Seth Vargo <seth@sethvargo.com>
Date: Wed, 21 Oct 2020 18:27:05 -0400
Subject: [PATCH] Move JS and CSS external

This isn't all JS and CSS, just the big bits
---
 cmd/adminapi/main.go                          |   5 +-
 cmd/server/assets/admin/caches/index.html     |   2 -
 cmd/server/assets/admin/email/show.html       |   3 -
 cmd/server/assets/admin/info.html             |   2 -
 cmd/server/assets/admin/realms/edit.html      |   3 -
 cmd/server/assets/admin/realms/index.html     |   2 -
 cmd/server/assets/admin/realms/new.html       |   3 -
 cmd/server/assets/admin/sms/show.html         |   3 -
 cmd/server/assets/admin/users/index.html      |   2 -
 cmd/server/assets/admin/users/new.html        |   3 -
 cmd/server/assets/apikeys/edit.html           |   3 -
 cmd/server/assets/apikeys/index.html          |   2 -
 cmd/server/assets/apikeys/new.html            |   3 -
 cmd/server/assets/apikeys/show.html           |   2 -
 cmd/server/assets/codestatus/index.html       |   2 -
 cmd/server/assets/codestatus/show.html        |   1 -
 cmd/server/assets/header.html                 | 412 +-----------------
 cmd/server/assets/home.html                   |   2 -
 cmd/server/assets/login/account.html          |   1 -
 cmd/server/assets/login/change-password.html  |   2 -
 cmd/server/assets/login/login.html            |   4 +-
 cmd/server/assets/login/register-phone.html   |   2 -
 cmd/server/assets/login/reset-password.html   |   3 -
 cmd/server/assets/login/select-password.html  |   2 -
 cmd/server/assets/login/select-realm.html     |   2 -
 cmd/server/assets/login/signout.html          |   2 -
 .../assets/login/verify-email-check.html      |   1 -
 cmd/server/assets/login/verify-email.html     |   2 -
 cmd/server/assets/mobileapps/edit.html        |   3 -
 cmd/server/assets/mobileapps/index.html       |   2 -
 cmd/server/assets/mobileapps/new.html         |   3 -
 cmd/server/assets/mobileapps/show.html        |   3 -
 cmd/server/assets/realm.html                  |   3 -
 cmd/server/assets/realmadmin/edit.html        |   3 -
 cmd/server/assets/realmadmin/events.html      |   3 -
 cmd/server/assets/realmadmin/show.html        |   2 -
 cmd/server/assets/realmkeys.html              |   2 -
 cmd/server/assets/static/css/application.css  | 142 ++++++
 cmd/server/assets/static/js/application.js    | 250 +++++++++++
 cmd/server/assets/users/edit.html             |   3 -
 cmd/server/assets/users/import.html           |   1 -
 cmd/server/assets/users/index.html            |   3 -
 cmd/server/assets/users/new.html              |   3 -
 cmd/server/assets/users/show.html             |   2 -
 cmd/server/main.go                            |   5 +-
 pkg/controller/issueapi/issueapi.go           |   4 +-
 pkg/database/user.go                          |   2 +-
 pkg/testsuite/integration.go                  |   5 +-
 48 files changed, 402 insertions(+), 518 deletions(-)
 create mode 100644 cmd/server/assets/static/css/application.css
 create mode 100644 cmd/server/assets/static/js/application.js

diff --git a/cmd/adminapi/main.go b/cmd/adminapi/main.go
index 8c529578e..3be52258b 100644
--- a/cmd/adminapi/main.go
+++ b/cmd/adminapi/main.go
@@ -148,10 +148,7 @@ func realMain(ctx context.Context) error {
 		sub.Use(requireAPIKey)
 		sub.Use(processFirewall)
 
-		issueapiController, err := issueapi.New(ctx, cfg, db, limiterStore, h)
-		if err != nil {
-			return fmt.Errorf("issueapi.New: %w", err)
-		}
+		issueapiController := issueapi.New(ctx, cfg, db, limiterStore, h)
 		sub.Handle("/issue", issueapiController.HandleIssue()).Methods("POST")
 
 		codeStatusController := codestatus.NewAPI(ctx, cfg, db, h)
diff --git a/cmd/server/assets/admin/caches/index.html b/cmd/server/assets/admin/caches/index.html
index 69abebc9f..b075d45db 100644
--- a/cmd/server/assets/admin/caches/index.html
+++ b/cmd/server/assets/admin/caches/index.html
@@ -34,8 +34,6 @@ <h5 class="mb-1">{{$cache.Name}}</h5>
       </ul>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/email/show.html b/cmd/server/assets/admin/email/show.html
index afa4d7436..12bd25070 100644
--- a/cmd/server/assets/admin/email/show.html
+++ b/cmd/server/assets/admin/email/show.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -82,8 +81,6 @@ <h1>System email config</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/info.html b/cmd/server/assets/admin/info.html
index 7e5a77078..b5a775caa 100644
--- a/cmd/server/assets/admin/info.html
+++ b/cmd/server/assets/admin/info.html
@@ -25,8 +25,6 @@
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/realms/edit.html b/cmd/server/assets/admin/realms/edit.html
index 2b1921d6a..42f670f63 100644
--- a/cmd/server/assets/admin/realms/edit.html
+++ b/cmd/server/assets/admin/realms/edit.html
@@ -8,7 +8,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -121,8 +120,6 @@ <h1>Edit realm</h1>
       </div>
     {{end}}
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/realms/index.html b/cmd/server/assets/admin/realms/index.html
index 7fb374ec1..0d48c97ac 100644
--- a/cmd/server/assets/admin/realms/index.html
+++ b/cmd/server/assets/admin/realms/index.html
@@ -59,8 +59,6 @@
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/realms/new.html b/cmd/server/assets/admin/realms/new.html
index 4689d0b84..984747caf 100644
--- a/cmd/server/assets/admin/realms/new.html
+++ b/cmd/server/assets/admin/realms/new.html
@@ -7,7 +7,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -105,8 +104,6 @@ <h1>New realm</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/sms/show.html b/cmd/server/assets/admin/sms/show.html
index 12a689082..3c2b986e2 100644
--- a/cmd/server/assets/admin/sms/show.html
+++ b/cmd/server/assets/admin/sms/show.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -74,8 +73,6 @@ <h1>System SMS config</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/users/index.html b/cmd/server/assets/admin/users/index.html
index 620577257..1721f17d7 100644
--- a/cmd/server/assets/admin/users/index.html
+++ b/cmd/server/assets/admin/users/index.html
@@ -60,8 +60,6 @@
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/admin/users/new.html b/cmd/server/assets/admin/users/new.html
index 1cdc88d90..829532535 100644
--- a/cmd/server/assets/admin/users/new.html
+++ b/cmd/server/assets/admin/users/new.html
@@ -7,7 +7,6 @@
 
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -56,8 +55,6 @@ <h1>New system admin</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 
 </html>
diff --git a/cmd/server/assets/apikeys/edit.html b/cmd/server/assets/apikeys/edit.html
index 68c2e9b42..bb5ac3a81 100644
--- a/cmd/server/assets/apikeys/edit.html
+++ b/cmd/server/assets/apikeys/edit.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -62,8 +61,6 @@ <h1>Edit API key</h1>
       </p>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/apikeys/index.html b/cmd/server/assets/apikeys/index.html
index 69d129062..e2503350f 100644
--- a/cmd/server/assets/apikeys/index.html
+++ b/cmd/server/assets/apikeys/index.html
@@ -84,8 +84,6 @@ <h1>API keys</h1>
     </p>
     {{end}}
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/apikeys/new.html b/cmd/server/assets/apikeys/new.html
index b18438fa1..ccb42304b 100644
--- a/cmd/server/assets/apikeys/new.html
+++ b/cmd/server/assets/apikeys/new.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -54,8 +53,6 @@ <h1>New API key</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/apikeys/show.html b/cmd/server/assets/apikeys/show.html
index bea6fd1bc..41fd7c9d7 100644
--- a/cmd/server/assets/apikeys/show.html
+++ b/cmd/server/assets/apikeys/show.html
@@ -99,8 +99,6 @@ <h1>{{$authApp.Name}} API key</h1>
     </div>
   </main>
 
-  {{template "scripts" .}}
-
   {{if $stats}}
   <script src="https://www.gstatic.com/charts/loader.js"></script>
   <script>
diff --git a/cmd/server/assets/codestatus/index.html b/cmd/server/assets/codestatus/index.html
index 1763c1fd8..f307c2773 100644
--- a/cmd/server/assets/codestatus/index.html
+++ b/cmd/server/assets/codestatus/index.html
@@ -6,7 +6,6 @@
 <html lang="en">
 
 <head>
-  {{template "floatingform" .}}
   {{template "head" .}}
 </head>
 
@@ -66,7 +65,6 @@ <h1>Verification code status</h1>
     </div>
   </main>
 
-  {{template "scripts" .}}
   <script type="text/javascript">
     $(function() {
       let $check= $('#check');
diff --git a/cmd/server/assets/codestatus/show.html b/cmd/server/assets/codestatus/show.html
index c9cf9c106..c67cd3300 100644
--- a/cmd/server/assets/codestatus/show.html
+++ b/cmd/server/assets/codestatus/show.html
@@ -64,7 +64,6 @@ <h5 class="mb-1">SMS link expiry</h5>
     <a href="/code/status" class="card-link">&larr; Enter another code</a>
   </main>
 
-  {{template "scripts" .}}
   {{template "codescripts" .}}
 
   {{if not .code.Claimed}}
diff --git a/cmd/server/assets/header.html b/cmd/server/assets/header.html
index 9f38a204d..f283e9da0 100644
--- a/cmd/server/assets/header.html
+++ b/cmd/server/assets/header.html
@@ -21,6 +21,8 @@
 <link rel="stylesheet"
   href="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/17.0.0/css/intlTelInput.css"
   integrity="sha384-TXDx4BvGGuJDYIKlcgXfDntJ100A809RRLB4W72MhjXJzakfj3ptxy4zER5qsxZH" crossorigin="anonymous">
+<link rel="stylesheet"
+  href="/static/css/application.css" crossorigin="anonymous" />
 
 <script src="https://code.jquery.com/jquery-3.5.1.min.js"
   integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
@@ -30,162 +32,9 @@
   integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/intl-tel-input/17.0.0/js/intlTelInput.js"
   integrity="sha384-PlunRcEpe5pvbKHPtkn6b/Ed9D5+mVGYwhlkrmyPEhWAUDZJZZu42bS2fMdceJft" crossorigin="anonymous"></script>
+<script src="/static/js/application.js" crossorigin="anonymous"></script>
 
 <title>{{if .title}}{{.title}}{{else}}Diagnosis Verification Server{{end}}</title>
-
-<style type="text/css">
-  div.admin-header {
-    background-color:#D66402
-  }
-
-  a.input-group-text:hover {
-    cursor: pointer;
-    text-decoration: none;
-  }
-
-  a.disabled {
-    color: lightgray;
-    pointer-events: none;
-  }
-
-  main.container[role=main] {
-    position: relative;
-  }
-</style>
-{{end}}
-
-{{define "floatingform"}}
-<style type="text/css">
-  .floating-form {
-    width: 100%;
-    height: 100%;
-    margin: auto;
-  }
-
-  .form-label-group {
-    position: relative;
-    margin-bottom: 1rem;
-  }
-
-  .form-label-group input,
-  .form-label-group label {
-    height: 3.125rem;
-    padding: .75rem;
-  }
-
-  .form-label-group label {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: block;
-    width: 100%;
-    margin-bottom: 0;
-    /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    pointer-events: none;
-    cursor: text;
-    /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: 1000;
-  }
-
-  .form-label-group input::-webkit-input-placeholder,
-  .form-label-group textarea::-webkit-input-placeholder {
-    color: transparent;
-  }
-
-  .form-label-group input::-moz-placeholder,
-  .form-label-group textarea::-moz-placeholder {
-    color: transparent;
-  }
-
-  .form-label-group input:-ms-input-placeholder,
-  .form-label-group textarea:-ms-input-placeholder {
-    color: transparent;
-  }
-
-  .form-label-group input::-ms-input-placeholder,
-  .form-label-group textarea::-ms-input-placeholder {
-    color: transparent;
-  }
-
-  .form-label-group input::placeholder,
-  .form-label-group textarea::placeholder {
-    color: transparent;
-  }
-
-  .form-label-group input:not(:-moz-placeholder-shown),
-  .form-label-group textarea:not(:-moz-placeholder-shown) {
-    padding-top: 1.25rem;
-    padding-bottom: .25rem;
-  }
-
-  .form-label-group input:not(:-ms-input-placeholder),
-  .form-label-group textarea:not(:-ms-input-placeholder) {
-    padding-top: 1.25rem;
-    padding-bottom: .25rem;
-  }
-
-  .form-label-group input:not(:placeholder-shown),
-  .form-label-group textarea:not(:placeholder-shown) {
-    padding-top: 1.25rem;
-    padding-bottom: .25rem;
-  }
-
-  .form-label-group input:not(:-moz-placeholder-shown)~label,
-  .form-label-group textarea:not(:-moz-placeholder-shown)~label {
-    padding-top: .25rem;
-    padding-bottom: .25rem;
-    font-size: 12px;
-    color: #777;
-  }
-
-  .form-label-group input:not(:-ms-input-placeholder)~label,
-  .form-label-group textarea:not(:-ms-input-placeholder)~label {
-    padding-top: .25rem;
-    padding-bottom: .25rem;
-    font-size: 12px;
-    color: #777;
-  }
-
-  .form-label-group input:-webkit-autofill~label,
-  .form-label-group textarea:-webkit-autofill~label,
-  .form-label-group input:not(:placeholder-shown)~label,
-  .form-label-group textarea:not(:placeholder-shown)~label {
-    padding-top: .25rem;
-    padding-bottom: .25rem;
-    font-size: 12px;
-    color: #777;
-  }
-
-  /* Fallback for Edge
-  -------------------------------------------------- */
-  @supports (-ms-ime-align: auto) {
-    .form-label-group {
-      display: -ms-flexbox;
-      display: flex;
-      -ms-flex-direction: column-reverse;
-      flex-direction: column-reverse;
-    }
-
-    .form-label-group label {
-      position: static;
-    }
-
-    .form-label-group input::-ms-input-placeholder,
-    .form-label-group textarea::-ms-input-placeholder {
-      color: #777;
-    }
-  }
-
-  .iti {
-    width: 100%;
-  }
-
-</style>
 {{end}}
 
 {{/* defines the top navigation bar */}}
@@ -274,261 +123,6 @@ <h6 class="dropdown-header">Actions</h6>
 </ul>
 {{end}}
 
-{{define "scripts"}}
-<script type="text/javascript">
-  $(function() {
-    // Add data-toogle="tooltop" to toggle tooltips!
-    $('[data-toggle="tooltip"]').tooltip();
-
-    // Add data-submit-form properties to a link to have it act as a submit
-    // button. You can also add a data-confirm attribute with a confirmation
-    // prompt.
-    $('a[data-submit-form]').click(function(e) {
-      e.preventDefault();
-
-      let $this = $(e.currentTarget);
-      let confirm = $this.data('confirm');
-      if (typeof (confirm) !== 'undefined') {
-        if (window.confirm(confirm) !== true) {
-          return;
-        }
-      }
-
-      $this.closest('form').submit();
-    });
-
-    // Add data-method to a link and make the resulting href submit as that
-    // method. You can also add a data-confirm attribute with a confirmation
-    // prompt.
-    $('a[data-method]').click(function(e) {
-      e.preventDefault();
-
-      let $this = $(e.currentTarget);
-      let confirm = $this.data('confirm');
-
-      if (typeof (confirm) !== 'undefined') {
-        if (window.confirm(confirm) !== true) {
-          return;
-        }
-      }
-
-      let $csrfField = $('{{.csrfField}}');
-
-      let $inputField = $('<input>')
-        .attr('type', 'hidden')
-        .attr('name', '_method')
-        .attr('value', $this.data('method'));
-
-      let $form = $('<form>')
-        .attr('method', 'POST')
-        .attr('action', $this.attr('href'));
-
-      $form.append($csrfField);
-      $form.append($inputField);
-
-      $form.appendTo('body').submit();
-    });
-
-    // Add data-toggle-password to an element with the value pointing to the id
-    // of an input[type="password"]. It will toggle/untoggle the value.
-    $('a[data-toggle-password]').click(function(e) {
-      e.preventDefault();
-
-      let $this = $(e.currentTarget);
-      let selector = $this.data('togglePassword');
-      let $input = $('#' + selector);
-      let $icon = $this.find('span.oi');
-
-      if ($input.attr('type') == 'password') {
-        $input.attr('type', 'text');
-        $icon.addClass('oi-lock-unlocked');
-        $icon.removeClass('oi-lock-locked');
-      } else if ($input.attr('type') == 'text') {
-        $input.attr('type', 'password');
-        $icon.addClass('oi-lock-locked');
-        $icon.removeClass('oi-lock-unlocked');
-      }
-    });
-
-    $('a[data-fill-target]').click(function(e) {
-      e.preventDefault();
-
-      let $this = $(e.currentTarget);
-      let selector = $this.data('fillTarget');
-
-      let value = $this.data('fillValue');
-      let $target = $('#' + selector);
-      $target.val(value);
-    });
-
-    $('a[data-copy]').click(function(e) {
-      e.preventDefault();
-
-      let $this = $(e.currentTarget);
-      let selector = $this.data('copyTarget');
-      let $target = $('#' + selector);
-
-      $target[0].focus();
-      $target[0].setSelectionRange(0, 99999);
-
-      document.execCommand('copy');
-      $this.tooltip('hide');
-      document.getSelection().removeAllRanges();
-    });
-
-    $('[data-timestamp]').each(function(i, e) {
-      let $this = $(e);
-      let date = new Date($this.data('timestamp'));
-
-      let year = date.getFullYear();
-      let month = date.getMonth() + 1;
-      if (month < 10) {
-        month = `0${month}`;
-      }
-      let day = date.getDate();
-      if (day < 10) {
-        day = `0${day}`;
-      }
-      let ampm = 'AM';
-      let hours = date.getHours();
-      if (hours > 12) {
-        ampm = 'PM';
-        hours = hours - 12;
-      }
-      if (hours < 10) {
-        hours = `0${hours}`;
-      }
-      let minutes = date.getMinutes();
-      if (minutes < 10) {
-        minutes = `0${minutes}`;
-      }
-
-      $this.html(`${year}-${month}-${day} ${hours}:${minutes} ${ampm}`);
-    });
-
-    // Toast shows alerts/flash messages.
-    $('.toast').toast('show');
-
-    // Flash is the flash handler
-    let flash = function() {
-      let $alerts = $('#alerts-container');
-
-      let f = {};
-
-      // clear clears any existing flashes.
-      f.clear = function() {
-        $alerts.empty();
-      };
-
-      // error creates a flash error message.
-      f.error = function(message) {
-        f.flash('error', message);
-      };
-
-      // warning creates a flash warning message.
-      f.warning = function(message) {
-        f.flash('warning', message);
-      };
-
-      // alert creates a flash notice message.
-      f.alert = function(message) {
-        f.flash('alert', message);
-      };
-
-      // flash is a lower-level function for generating a flash message. Usually
-      // you want to call flash.alert() or flash.error() instead.
-      f.flash = function(level, message) {
-        let headerClass;
-        let headerIconClass;
-        let headerText;
-
-        switch (level) {
-          case 'error':
-            headerClass = 'text-danger';
-            headerIconClass = 'oi-circle-x';
-            headerText = 'Error';
-            break;
-          case 'warning':
-            headerClass = 'text-warning';
-            headerIconClass = 'oi-warning';
-            headerText = 'Warning';
-            break;
-          case 'alert':
-            headerClass = 'text-info';
-            headerIconClass = 'oi-info';
-            headerText = 'Notice';
-            break;
-          default:
-            throw `invalid level ${level}`;
-        }
-
-        let $toast = $('<div>');
-        $toast.addClass('toast bg-white');
-        $toast.attr('role', 'alert');
-        $toast.attr('aria-live', 'assertive');
-        $toast.attr('aria-atomic', 'true');
-
-        // Auto-dismiss notices, but everything else is sticky.
-        if (level === 'alert') {
-          $toast.attr('data-delay', 10000);
-          $toast.attr('data-autohide', true);
-        } else {
-          $toast.attr('data-autohide', false);
-        }
-
-        // Create the header.
-        let $header = $('<div>');
-        $header.addClass('toast-header');
-        $header.addClass(headerClass);
-
-        // Create the icon.
-        let $icon = $('<span>');
-        $icon.addClass('oi mr-2');
-        $icon.addClass(headerIconClass);
-        $icon.attr('aria-hidden', true)
-        $header.append($icon);
-
-        // Create the text next to the icon.
-        let $headerText = $('<strong>')
-        $headerText.addClass('mr-auto');
-        $headerText.html(headerText);
-        $header.append($headerText);
-
-        // Create the close button.
-        let $button = $('<button>');
-        $button.addClass('ml-2 mb-1 close');
-        $button.attr('type', 'button');
-        $button.attr('data-dismiss', 'toast');
-        $button.attr('aria-label', 'Close');
-        $button.html('<span aria-hidden="true">&times;</span>');
-        $header.append($button);
-
-        // Add the header to the toast.
-        $toast.append($header);
-
-        // Create the body.
-        let $body = $('<div>');
-        $body.addClass('toast-body');
-        $body.html(message);
-
-        // Add the body to the toast.
-        $toast.append($body);
-
-        // Add the toast to the page.
-        $alerts.append($toast);
-
-        // Show the toast.
-        $toast.toast('show');
-      };
-
-      return f;
-    }();
-
-    window.flash = flash;
-  });
-</script>
-{{end}}
-
 {{define "clippy"}}
 <div class="input-group-append">
   <a class="input-group-text" data-toggle="tooltip" title="Copy to clipboard" data-copy data-copy-target="{{.}}">
diff --git a/cmd/server/assets/home.html b/cmd/server/assets/home.html
index e90354f6c..0633dde6c 100644
--- a/cmd/server/assets/home.html
+++ b/cmd/server/assets/home.html
@@ -216,7 +216,6 @@ <h1>Create verification code</h1>
     </div>
   </main>
 
-  {{template "scripts" .}}
   {{template "codescripts" .}}
 
   <script type="text/javascript">
@@ -342,7 +341,6 @@ <h1>Create verification code</h1>
     });
 
     function getCode(data) {
-      console.log('data: ',data);
       $.ajax({
         url: '/home/issue',
         type: 'POST',
diff --git a/cmd/server/assets/login/account.html b/cmd/server/assets/login/account.html
index 390b17f8d..171d18543 100644
--- a/cmd/server/assets/login/account.html
+++ b/cmd/server/assets/login/account.html
@@ -86,7 +86,6 @@ <h6 class="card-title  mt-3">System admin</h6>
     </div>
   </main>
 
-  {{template "scripts" .}}
   <script type="text/javascript">
     $(function() {
       let $emailVer = $('#email-verified');
diff --git a/cmd/server/assets/login/change-password.html b/cmd/server/assets/login/change-password.html
index 61b0a030b..c72e8ec4a 100644
--- a/cmd/server/assets/login/change-password.html
+++ b/cmd/server/assets/login/change-password.html
@@ -3,7 +3,6 @@
 <html lang="en">
 
 <head>
-  {{template "floatingform" .}}
   {{template "head" .}}
   {{template "firebase" .}}
 </head>
@@ -51,7 +50,6 @@
     </div>
   </main>
 
-  {{template "scripts" .}}
   <script type="text/javascript">
     $(function() {
       let $form = $('#passwordForm');
diff --git a/cmd/server/assets/login/login.html b/cmd/server/assets/login/login.html
index 989967ab7..ddcdd0157 100644
--- a/cmd/server/assets/login/login.html
+++ b/cmd/server/assets/login/login.html
@@ -4,7 +4,6 @@
 
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
   {{template "firebase" .}}
 </head>
 
@@ -40,7 +39,7 @@
                 </div>
 
                 <button type="submit" id="submit" class="btn btn-primary btn-block">Login</button>
-                <a class="card-link btn-block" href="login/reset-password">Forgot password</a>
+                <a class="card-link btn-block" href="/login/reset-password">Forgot password</a>
               </form>
             </div>
           </div>
@@ -61,7 +60,6 @@
     <div id="recaptcha-container" class="center-block"></div>
   </main>
 
-  {{template "scripts" .}}
   {{template "loginscripts" .}}
 
   <script type="text/javascript">
diff --git a/cmd/server/assets/login/register-phone.html b/cmd/server/assets/login/register-phone.html
index b1a07dc01..91e83f8bb 100644
--- a/cmd/server/assets/login/register-phone.html
+++ b/cmd/server/assets/login/register-phone.html
@@ -7,7 +7,6 @@
 
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
   {{template "firebase" .}}
 </head>
 
@@ -74,7 +73,6 @@
     <div id="recaptcha-container" class="center-block"></div>
   </main>
 
-  {{template "scripts" .}}
   <script type="text/javascript">
     window.recaptchaVerifier = new firebase.auth.RecaptchaVerifier(
       'recaptcha-container',
diff --git a/cmd/server/assets/login/reset-password.html b/cmd/server/assets/login/reset-password.html
index e86c86b8e..12de2f2ba 100644
--- a/cmd/server/assets/login/reset-password.html
+++ b/cmd/server/assets/login/reset-password.html
@@ -3,7 +3,6 @@
 <html lang="en">
 
 <head>
-  {{template "floatingform" .}}
   {{template "head" .}}
   {{template "firebase" .}}
 </head>
@@ -46,8 +45,6 @@
     </div>
   </main>
 
-  {{template "scripts" .}}
-
   <script type="text/javascript">
     $(function() {
       $('#submit').on('submit', function(event) {
diff --git a/cmd/server/assets/login/select-password.html b/cmd/server/assets/login/select-password.html
index ab5bf34d1..aa713ed87 100644
--- a/cmd/server/assets/login/select-password.html
+++ b/cmd/server/assets/login/select-password.html
@@ -3,7 +3,6 @@
 <html lang="en">
 
 <head>
-  {{template "floatingform" .}}
   {{template "head" .}}
 </head>
 
@@ -58,7 +57,6 @@
     </div>
   </main>
 
-  {{template "scripts" .}}
   <script type="text/javascript">
     $(function() {
       let $form = $('#loginForm');
diff --git a/cmd/server/assets/login/select-realm.html b/cmd/server/assets/login/select-realm.html
index 7f3c4b949..10400d775 100644
--- a/cmd/server/assets/login/select-realm.html
+++ b/cmd/server/assets/login/select-realm.html
@@ -68,8 +68,6 @@ <h5 class="mb-1">
       {{end}}
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/login/signout.html b/cmd/server/assets/login/signout.html
index 59e007729..6d22a63c1 100644
--- a/cmd/server/assets/login/signout.html
+++ b/cmd/server/assets/login/signout.html
@@ -19,8 +19,6 @@
     </div>
   </main>
 
-  {{template "scripts" .}}
-
   <script type="text/javascript">
     window.addEventListener('load', function() {
       firebase.auth().signOut().then(function() {
diff --git a/cmd/server/assets/login/verify-email-check.html b/cmd/server/assets/login/verify-email-check.html
index b36f05fa7..5c1e5b1ff 100644
--- a/cmd/server/assets/login/verify-email-check.html
+++ b/cmd/server/assets/login/verify-email-check.html
@@ -29,7 +29,6 @@
     </div>
   </main>
 
-  {{template "scripts" .}}
   <script type="text/javascript">
   $(function() {
     let urlVars = getUrlVars();
diff --git a/cmd/server/assets/login/verify-email.html b/cmd/server/assets/login/verify-email.html
index 84e165943..3780cdf45 100644
--- a/cmd/server/assets/login/verify-email.html
+++ b/cmd/server/assets/login/verify-email.html
@@ -48,8 +48,6 @@
     </div>
   </main>
 
-  {{template "scripts" .}}
-
   <script>
     let $verify = $('#verify');
     let $skip = $('#skip');
diff --git a/cmd/server/assets/mobileapps/edit.html b/cmd/server/assets/mobileapps/edit.html
index 79932c2fc..091925573 100644
--- a/cmd/server/assets/mobileapps/edit.html
+++ b/cmd/server/assets/mobileapps/edit.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -36,8 +35,6 @@ <h1>Edit mobile app</h1>
 
     <a href="/mobile-apps">&larr; Back to all mobile apps</a>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/mobileapps/index.html b/cmd/server/assets/mobileapps/index.html
index f36e59744..63f8619f6 100644
--- a/cmd/server/assets/mobileapps/index.html
+++ b/cmd/server/assets/mobileapps/index.html
@@ -77,8 +77,6 @@ <h1>Mobile apps</h1>
     </p>
     {{end}}
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/mobileapps/new.html b/cmd/server/assets/mobileapps/new.html
index 25b3d92d4..dcaa3ea17 100644
--- a/cmd/server/assets/mobileapps/new.html
+++ b/cmd/server/assets/mobileapps/new.html
@@ -6,7 +6,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -33,8 +32,6 @@ <h1>New mobile app</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/mobileapps/show.html b/cmd/server/assets/mobileapps/show.html
index 42d823f6d..676d86f91 100644
--- a/cmd/server/assets/mobileapps/show.html
+++ b/cmd/server/assets/mobileapps/show.html
@@ -60,9 +60,6 @@ <h1>{{$app.Name}}</h1>
 
     <a href="/mobile-apps">&larr; Back to all mobile apps</a>
   </main>
-
-  {{template "scripts" .}}
-
 </body>
 
 </html>
diff --git a/cmd/server/assets/realm.html b/cmd/server/assets/realm.html
index c328ec27c..4e8e65e0e 100644
--- a/cmd/server/assets/realm.html
+++ b/cmd/server/assets/realm.html
@@ -8,7 +8,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -590,8 +589,6 @@ <h1>Realm settings</h1>
   {{end}}
   </main>
 
-  {{template "scripts" .}}
-
   <script type="text/javascript">
     $(function() {
       let $abusePreventionEnabled = $('#abuse_prevention_enabled');
diff --git a/cmd/server/assets/realmadmin/edit.html b/cmd/server/assets/realmadmin/edit.html
index 4e1ad8034..df9fd8b42 100644
--- a/cmd/server/assets/realmadmin/edit.html
+++ b/cmd/server/assets/realmadmin/edit.html
@@ -8,7 +8,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -98,8 +97,6 @@ <h1>Realm settings</h1>
     {{end}}
   </main>
 
-  {{template "scripts" .}}
-
   <script type="text/javascript">
     $(function(){
       changeTab(window.location.hash);
diff --git a/cmd/server/assets/realmadmin/events.html b/cmd/server/assets/realmadmin/events.html
index 5ddf54b1b..57ce0544e 100644
--- a/cmd/server/assets/realmadmin/events.html
+++ b/cmd/server/assets/realmadmin/events.html
@@ -56,9 +56,6 @@ <h5 class="mb-1">{{$event.Action}}</h5>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
-
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/realmadmin/show.html b/cmd/server/assets/realmadmin/show.html
index 3a01303bc..75550e26c 100644
--- a/cmd/server/assets/realmadmin/show.html
+++ b/cmd/server/assets/realmadmin/show.html
@@ -67,8 +67,6 @@ <h1>Realm stats</h1>
 
   </main>
 
-  {{template "scripts" .}}
-
   <script src="https://www.gstatic.com/charts/loader.js"></script>
   <script>
     google.charts.load('current', {packages: ['line']});
diff --git a/cmd/server/assets/realmkeys.html b/cmd/server/assets/realmkeys.html
index 280f555dd..95dc2f08d 100644
--- a/cmd/server/assets/realmkeys.html
+++ b/cmd/server/assets/realmkeys.html
@@ -294,8 +294,6 @@ <h1>Verification certificate key settings</h1>
 
     {{template "realmpublickeys" .}}
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/static/css/application.css b/cmd/server/assets/static/css/application.css
new file mode 100644
index 000000000..3e763c0c7
--- /dev/null
+++ b/cmd/server/assets/static/css/application.css
@@ -0,0 +1,142 @@
+div.admin-header {
+  background-color: #d66402;
+}
+
+a.input-group-text:hover {
+  cursor: pointer;
+  text-decoration: none;
+}
+
+a.disabled {
+  color: lightgray;
+  pointer-events: none;
+}
+
+main.container[role="main"] {
+  position: relative;
+}
+
+.floating-form {
+  width: 100%;
+  height: 100%;
+  margin: auto;
+}
+
+.form-label-group {
+  position: relative;
+  margin-bottom: 1rem;
+}
+
+.form-label-group input,
+.form-label-group label {
+  height: 3.125rem;
+  padding: 0.75rem;
+}
+
+.form-label-group label {
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: block;
+  width: 100%;
+  margin-bottom: 0;
+  /* Override default `<label>` margin */
+  line-height: 1.5;
+  color: #495057;
+  pointer-events: none;
+  cursor: text;
+  /* Match the input under the label */
+  border: 1px solid transparent;
+  border-radius: 0.25rem;
+  transition: all 0.1s ease-in-out;
+  z-index: 1000;
+}
+
+.form-label-group input::-webkit-input-placeholder,
+.form-label-group textarea::-webkit-input-placeholder {
+  color: transparent;
+}
+
+.form-label-group input::-moz-placeholder,
+.form-label-group textarea::-moz-placeholder {
+  color: transparent;
+}
+
+.form-label-group input:-ms-input-placeholder,
+.form-label-group textarea:-ms-input-placeholder {
+  color: transparent;
+}
+
+.form-label-group input::-ms-input-placeholder,
+.form-label-group textarea::-ms-input-placeholder {
+  color: transparent;
+}
+
+.form-label-group input::placeholder,
+.form-label-group textarea::placeholder {
+  color: transparent;
+}
+
+.form-label-group input:not(:-moz-placeholder-shown),
+.form-label-group textarea:not(:-moz-placeholder-shown) {
+  padding-top: 1.25rem;
+  padding-bottom: 0.25rem;
+}
+
+.form-label-group input:not(:-ms-input-placeholder),
+.form-label-group textarea:not(:-ms-input-placeholder) {
+  padding-top: 1.25rem;
+  padding-bottom: 0.25rem;
+}
+
+.form-label-group input:not(:placeholder-shown),
+.form-label-group textarea:not(:placeholder-shown) {
+  padding-top: 1.25rem;
+  padding-bottom: 0.25rem;
+}
+
+.form-label-group input:not(:-moz-placeholder-shown) ~ label,
+.form-label-group textarea:not(:-moz-placeholder-shown) ~ label {
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
+  font-size: 12px;
+  color: #777;
+}
+
+.form-label-group input:not(:-ms-input-placeholder) ~ label,
+.form-label-group textarea:not(:-ms-input-placeholder) ~ label {
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
+  font-size: 12px;
+  color: #777;
+}
+
+.form-label-group input:-webkit-autofill ~ label,
+.form-label-group textarea:-webkit-autofill ~ label,
+.form-label-group input:not(:placeholder-shown) ~ label,
+.form-label-group textarea:not(:placeholder-shown) ~ label {
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
+  font-size: 12px;
+  color: #777;
+}
+
+/* Fallback for Edge
+-------------------------------------------------- */
+@supports (-ms-ime-align: auto) {
+  .form-label-group {
+    display: -ms-flexbox;
+    display: flex;
+    -ms-flex-direction: column-reverse;
+    flex-direction: column-reverse;
+  }
+
+  .form-label-group label {
+    position: static;
+  }
+
+  .form-label-group input::-ms-input-placeholder,
+  .form-label-group textarea::-ms-input-placeholder {
+    color: #777;
+  }
+}
diff --git a/cmd/server/assets/static/js/application.js b/cmd/server/assets/static/js/application.js
new file mode 100644
index 000000000..80f2ac396
--- /dev/null
+++ b/cmd/server/assets/static/js/application.js
@@ -0,0 +1,250 @@
+$(function () {
+  // Add data-toogle="tooltop" to toggle tooltips!
+  $('[data-toggle="tooltip"]').tooltip();
+
+  // Add data-submit-form properties to a link to have it act as a submit
+  // button. You can also add a data-confirm attribute with a confirmation
+  // prompt.
+  $("a[data-submit-form]").click(function (e) {
+    e.preventDefault();
+
+    let $this = $(e.currentTarget);
+    let confirm = $this.data("confirm");
+    if (typeof confirm !== "undefined") {
+      if (window.confirm(confirm) !== true) {
+        return;
+      }
+    }
+
+    $this.closest("form").submit();
+  });
+
+  // Add data-method to a link and make the resulting href submit as that
+  // method. You can also add a data-confirm attribute with a confirmation
+  // prompt.
+  $("a[data-method]").click(function (e) {
+    e.preventDefault();
+
+    let $this = $(e.currentTarget);
+    let confirm = $this.data("confirm");
+
+    if (typeof confirm !== "undefined") {
+      if (window.confirm(confirm) !== true) {
+        return;
+      }
+    }
+
+    let $csrfField = $("{{.csrfField}}");
+
+    let $inputField = $("<input>")
+      .attr("type", "hidden")
+      .attr("name", "_method")
+      .attr("value", $this.data("method"));
+
+    let $form = $("<form>")
+      .attr("method", "POST")
+      .attr("action", $this.attr("href"));
+
+    $form.append($csrfField);
+    $form.append($inputField);
+
+    $form.appendTo("body").submit();
+  });
+
+  // Add data-toggle-password to an element with the value pointing to the id
+  // of an input[type="password"]. It will toggle/untoggle the value.
+  $("a[data-toggle-password]").click(function (e) {
+    e.preventDefault();
+
+    let $this = $(e.currentTarget);
+    let selector = $this.data("togglePassword");
+    let $input = $("#" + selector);
+    let $icon = $this.find("span.oi");
+
+    if ($input.attr("type") == "password") {
+      $input.attr("type", "text");
+      $icon.addClass("oi-lock-unlocked");
+      $icon.removeClass("oi-lock-locked");
+    } else if ($input.attr("type") == "text") {
+      $input.attr("type", "password");
+      $icon.addClass("oi-lock-locked");
+      $icon.removeClass("oi-lock-unlocked");
+    }
+  });
+
+  $("a[data-fill-target]").click(function (e) {
+    e.preventDefault();
+
+    let $this = $(e.currentTarget);
+    let selector = $this.data("fillTarget");
+
+    let value = $this.data("fillValue");
+    let $target = $("#" + selector);
+    $target.val(value);
+  });
+
+  $("a[data-copy]").click(function (e) {
+    e.preventDefault();
+
+    let $this = $(e.currentTarget);
+    let selector = $this.data("copyTarget");
+    let $target = $("#" + selector);
+
+    $target[0].focus();
+    $target[0].setSelectionRange(0, 99999);
+
+    document.execCommand("copy");
+    $this.tooltip("hide");
+    document.getSelection().removeAllRanges();
+  });
+
+  $("[data-timestamp]").each(function (i, e) {
+    let $this = $(e);
+    let date = new Date($this.data("timestamp"));
+
+    let year = date.getFullYear();
+    let month = date.getMonth() + 1;
+    if (month < 10) {
+      month = `0${month}`;
+    }
+    let day = date.getDate();
+    if (day < 10) {
+      day = `0${day}`;
+    }
+    let ampm = "AM";
+    let hours = date.getHours();
+    if (hours > 12) {
+      ampm = "PM";
+      hours = hours - 12;
+    }
+    if (hours < 10) {
+      hours = `0${hours}`;
+    }
+    let minutes = date.getMinutes();
+    if (minutes < 10) {
+      minutes = `0${minutes}`;
+    }
+
+    $this.html(`${year}-${month}-${day} ${hours}:${minutes} ${ampm}`);
+  });
+
+  // Toast shows alerts/flash messages.
+  $(".toast").toast("show");
+
+  // Flash is the flash handler
+  let flash = (function () {
+    let $alerts = $("#alerts-container");
+
+    let f = {};
+
+    // clear clears any existing flashes.
+    f.clear = function () {
+      $alerts.empty();
+    };
+
+    // error creates a flash error message.
+    f.error = function (message) {
+      f.flash("error", message);
+    };
+
+    // warning creates a flash warning message.
+    f.warning = function (message) {
+      f.flash("warning", message);
+    };
+
+    // alert creates a flash notice message.
+    f.alert = function (message) {
+      f.flash("alert", message);
+    };
+
+    // flash is a lower-level function for generating a flash message. Usually
+    // you want to call flash.alert() or flash.error() instead.
+    f.flash = function (level, message) {
+      let headerClass;
+      let headerIconClass;
+      let headerText;
+
+      switch (level) {
+        case "error":
+          headerClass = "text-danger";
+          headerIconClass = "oi-circle-x";
+          headerText = "Error";
+          break;
+        case "warning":
+          headerClass = "text-warning";
+          headerIconClass = "oi-warning";
+          headerText = "Warning";
+          break;
+        case "alert":
+          headerClass = "text-info";
+          headerIconClass = "oi-info";
+          headerText = "Notice";
+          break;
+        default:
+          throw `invalid level ${level}`;
+      }
+
+      let $toast = $("<div>");
+      $toast.addClass("toast bg-white");
+      $toast.attr("role", "alert");
+      $toast.attr("aria-live", "assertive");
+      $toast.attr("aria-atomic", "true");
+
+      // Auto-dismiss notices, but everything else is sticky.
+      if (level === "alert") {
+        $toast.attr("data-delay", 10000);
+        $toast.attr("data-autohide", true);
+      } else {
+        $toast.attr("data-autohide", false);
+      }
+
+      // Create the header.
+      let $header = $("<div>");
+      $header.addClass("toast-header");
+      $header.addClass(headerClass);
+
+      // Create the icon.
+      let $icon = $("<span>");
+      $icon.addClass("oi mr-2");
+      $icon.addClass(headerIconClass);
+      $icon.attr("aria-hidden", true);
+      $header.append($icon);
+
+      // Create the text next to the icon.
+      let $headerText = $("<strong>");
+      $headerText.addClass("mr-auto");
+      $headerText.html(headerText);
+      $header.append($headerText);
+
+      // Create the close button.
+      let $button = $("<button>");
+      $button.addClass("ml-2 mb-1 close");
+      $button.attr("type", "button");
+      $button.attr("data-dismiss", "toast");
+      $button.attr("aria-label", "Close");
+      $button.html('<span aria-hidden="true">&times;</span>');
+      $header.append($button);
+
+      // Add the header to the toast.
+      $toast.append($header);
+
+      // Create the body.
+      let $body = $("<div>");
+      $body.addClass("toast-body");
+      $body.html(message);
+
+      // Add the body to the toast.
+      $toast.append($body);
+
+      // Add the toast to the page.
+      $alerts.append($toast);
+
+      // Show the toast.
+      $toast.toast("show");
+    };
+
+    return f;
+  })();
+
+  window.flash = flash;
+});
diff --git a/cmd/server/assets/users/edit.html b/cmd/server/assets/users/edit.html
index 3bcf6e9e9..96ffd04a6 100644
--- a/cmd/server/assets/users/edit.html
+++ b/cmd/server/assets/users/edit.html
@@ -7,7 +7,6 @@
 <html lang="en">
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -28,8 +27,6 @@ <h1>Edit user</h1>
       </div>
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 </html>
 {{end}}
diff --git a/cmd/server/assets/users/import.html b/cmd/server/assets/users/import.html
index 58d2a1b4d..4eda2736d 100644
--- a/cmd/server/assets/users/import.html
+++ b/cmd/server/assets/users/import.html
@@ -70,7 +70,6 @@ <h1>Import users</h1>
     <a class=" card-link" href="/users">&larr; All users</a>
   </main>
 
-  {{template "scripts" .}}
   <script type="text/javascript">
     $(function() {
       let $form = $('#form');
diff --git a/cmd/server/assets/users/index.html b/cmd/server/assets/users/index.html
index 3bea830fb..eb243e288 100644
--- a/cmd/server/assets/users/index.html
+++ b/cmd/server/assets/users/index.html
@@ -15,7 +15,6 @@
 
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -115,8 +114,6 @@ <h1>Users</h1>
       {{end}}
     </div>
   </main>
-
-  {{template "scripts" .}}
 </body>
 
 </html>
diff --git a/cmd/server/assets/users/new.html b/cmd/server/assets/users/new.html
index af4055802..ffdf055aa 100644
--- a/cmd/server/assets/users/new.html
+++ b/cmd/server/assets/users/new.html
@@ -7,7 +7,6 @@
 
 <head>
   {{template "head" .}}
-  {{template "floatingform" .}}
 </head>
 
 <body class="tab-content">
@@ -29,8 +28,6 @@ <h1>New user</h1>
     </div>
     <a class="card-link" href="/users" id="all-users">&larr; All users</a>
   </main>
-
-  {{template "scripts" .}}
 </body>
 
 </html>
diff --git a/cmd/server/assets/users/show.html b/cmd/server/assets/users/show.html
index 5aca32fd3..33c186b91 100644
--- a/cmd/server/assets/users/show.html
+++ b/cmd/server/assets/users/show.html
@@ -86,8 +86,6 @@ <h1>{{$user.Name}}</h1>
     <a class="card-link" href="/users">&larr; All users</a>
   </main>
 
-  {{template "scripts" .}}
-
   {{if $stats}}
   <script src="https://www.gstatic.com/charts/loader.js" type="text/javascript"></script>
   <script type="text/javascript">
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 238dd84da..46f59b0e7 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -283,10 +283,7 @@ func realMain(ctx context.Context) error {
 		sub.Handle("", homeController.HandleHome()).Methods("GET")
 
 		// API for creating new verification codes. Called via AJAX.
-		issueapiController, err := issueapi.New(ctx, cfg, db, limiterStore, h)
-		if err != nil {
-			return fmt.Errorf("issueapi.New: %w", err)
-		}
+		issueapiController := issueapi.New(ctx, cfg, db, limiterStore, h)
 		sub.Handle("/issue", issueapiController.HandleIssue()).Methods("POST")
 	}
 
diff --git a/pkg/controller/issueapi/issueapi.go b/pkg/controller/issueapi/issueapi.go
index 13910be4a..d8c946481 100644
--- a/pkg/controller/issueapi/issueapi.go
+++ b/pkg/controller/issueapi/issueapi.go
@@ -42,7 +42,7 @@ type Controller struct {
 }
 
 // New creates a new IssueAPI controller.
-func New(ctx context.Context, config config.IssueAPIConfig, db *database.Database, limiter limiter.Store, h *render.Renderer) (*Controller, error) {
+func New(ctx context.Context, config config.IssueAPIConfig, db *database.Database, limiter limiter.Store, h *render.Renderer) *Controller {
 	return &Controller{
 		config:  config,
 		db:      db,
@@ -54,5 +54,5 @@ func New(ctx context.Context, config config.IssueAPIConfig, db *database.Databas
 			api.TestTypeLikely:    {},
 			api.TestTypeNegative:  {},
 		},
-	}, nil
+	}
 }
diff --git a/pkg/database/user.go b/pkg/database/user.go
index eb216a6a0..568bade11 100644
--- a/pkg/database/user.go
+++ b/pkg/database/user.go
@@ -109,7 +109,7 @@ func (u *User) BeforeSave(tx *gorm.DB) error {
 	}
 
 	if len(u.Errors()) > 0 {
-		return fmt.Errorf("validation failed")
+		return fmt.Errorf("validation failed: %s", strings.Join(u.ErrorMessages(), ", "))
 	}
 
 	return nil
diff --git a/pkg/testsuite/integration.go b/pkg/testsuite/integration.go
index 23511ce9c..073e1f209 100644
--- a/pkg/testsuite/integration.go
+++ b/pkg/testsuite/integration.go
@@ -171,10 +171,7 @@ func (s *IntegrationSuite) newAdminAPIServer(ctx context.Context, tb testing.TB)
 		// Install the APIKey Auth Middleware
 		sub.Use(requireAPIKey)
 
-		issueapiController, err := issueapi.New(ctx, &s.cfg.AdminAPISrvConfig, s.db, limiterStore, h)
-		if err != nil {
-			tb.Fatalf("failed to create issue api controller: %v", err)
-		}
+		issueapiController := issueapi.New(ctx, &s.cfg.AdminAPISrvConfig, s.db, limiterStore, h)
 		sub.Handle("/issue", issueapiController.HandleIssue()).Methods("POST")
 
 		codeStatusController := codestatus.NewAPI(ctx, &s.cfg.AdminAPISrvConfig, s.db, h)