From bf0a4ad7161d087df2a95a99330bfc5812012308 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Fri, 3 Apr 2020 17:58:32 -0600 Subject: [PATCH] Show "Loading..." while waiting for account login page to show up --- www/assets/iframeloading.html | 31 +++++++++++++++++++++++++++++++ www/assets/js/login.js | 2 +- www/pages/login.html | 4 ++-- www/routes.js | 7 +------ 4 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 www/assets/iframeloading.html diff --git a/www/assets/iframeloading.html b/www/assets/iframeloading.html new file mode 100644 index 0000000..5eabc55 --- /dev/null +++ b/www/assets/iframeloading.html @@ -0,0 +1,31 @@ + + + + + Loading + + + + + +
Loading...
+ + + + + diff --git a/www/assets/js/login.js b/www/assets/js/login.js index 844a419..01ae400 100644 --- a/www/assets/js/login.js +++ b/www/assets/js/login.js @@ -1,4 +1,4 @@ -/* +/* * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/www/pages/login.html b/www/pages/login.html index ea5bec7..608853f 100644 --- a/www/pages/login.html +++ b/www/pages/login.html @@ -17,8 +17,8 @@
- +
- + \ No newline at end of file diff --git a/www/routes.js b/www/routes.js index 3229918..8cb9c48 100644 --- a/www/routes.js +++ b/www/routes.js @@ -214,12 +214,7 @@ var routes = [ { path: '/login', templateUrl: './pages/login.html', - name: 'login', - options: { - context: { - loginurl: SETTINGS.loginurl - } - } + name: 'login' }, { path: '/toolbox',