From 34c0d6019e9990137f8713f62bcba29ec2157539 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sun, 15 Dec 2019 20:47:47 +0900
Subject: [PATCH 1/6] move around half the dashboard controllers to a
 subdirectory

---
 .../dashboard.js}                             |   0
 .../general.js}                               |   0
 .../{logpage.js => dashboard/logs.js}         |   0
 src/controllers/{ => dashboard}/networking.js |   0
 .../notifications/notification.js}            |   0
 .../notifications/notifications.js}           |   0
 .../plugins/add.js}                           |   0
 .../plugins/available.js}                     |   0
 .../plugins/installed.js}                     |   0
 .../scheduledtasks/scheduledtask.js}          |   0
 .../scheduledtasks/scheduledtasks.js}         |   0
 src/scripts/routes.js                         | 133 +++++++++---------
 12 files changed, 64 insertions(+), 69 deletions(-)
 rename src/controllers/{dashboardpage.js => dashboard/dashboard.js} (100%)
 rename src/controllers/{dashboardgeneral.js => dashboard/general.js} (100%)
 rename src/controllers/{logpage.js => dashboard/logs.js} (100%)
 rename src/controllers/{ => dashboard}/networking.js (100%)
 rename src/controllers/{notificationsetting.js => dashboard/notifications/notification.js} (100%)
 rename src/controllers/{notificationsettings.js => dashboard/notifications/notifications.js} (100%)
 rename src/controllers/{addpluginpage.js => dashboard/plugins/add.js} (100%)
 rename src/controllers/{availableplugins.js => dashboard/plugins/available.js} (100%)
 rename src/controllers/{installedplugins.js => dashboard/plugins/installed.js} (100%)
 rename src/controllers/{scheduledtaskpage.js => dashboard/scheduledtasks/scheduledtask.js} (100%)
 rename src/controllers/{scheduledtaskspage.js => dashboard/scheduledtasks/scheduledtasks.js} (100%)

diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboard/dashboard.js
similarity index 100%
rename from src/controllers/dashboardpage.js
rename to src/controllers/dashboard/dashboard.js
diff --git a/src/controllers/dashboardgeneral.js b/src/controllers/dashboard/general.js
similarity index 100%
rename from src/controllers/dashboardgeneral.js
rename to src/controllers/dashboard/general.js
diff --git a/src/controllers/logpage.js b/src/controllers/dashboard/logs.js
similarity index 100%
rename from src/controllers/logpage.js
rename to src/controllers/dashboard/logs.js
diff --git a/src/controllers/networking.js b/src/controllers/dashboard/networking.js
similarity index 100%
rename from src/controllers/networking.js
rename to src/controllers/dashboard/networking.js
diff --git a/src/controllers/notificationsetting.js b/src/controllers/dashboard/notifications/notification.js
similarity index 100%
rename from src/controllers/notificationsetting.js
rename to src/controllers/dashboard/notifications/notification.js
diff --git a/src/controllers/notificationsettings.js b/src/controllers/dashboard/notifications/notifications.js
similarity index 100%
rename from src/controllers/notificationsettings.js
rename to src/controllers/dashboard/notifications/notifications.js
diff --git a/src/controllers/addpluginpage.js b/src/controllers/dashboard/plugins/add.js
similarity index 100%
rename from src/controllers/addpluginpage.js
rename to src/controllers/dashboard/plugins/add.js
diff --git a/src/controllers/availableplugins.js b/src/controllers/dashboard/plugins/available.js
similarity index 100%
rename from src/controllers/availableplugins.js
rename to src/controllers/dashboard/plugins/available.js
diff --git a/src/controllers/installedplugins.js b/src/controllers/dashboard/plugins/installed.js
similarity index 100%
rename from src/controllers/installedplugins.js
rename to src/controllers/dashboard/plugins/installed.js
diff --git a/src/controllers/scheduledtaskpage.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
similarity index 100%
rename from src/controllers/scheduledtaskpage.js
rename to src/controllers/dashboard/scheduledtasks/scheduledtask.js
diff --git a/src/controllers/scheduledtaskspage.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
similarity index 100%
rename from src/controllers/scheduledtaskspage.js
rename to src/controllers/dashboard/scheduledtasks/scheduledtasks.js
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index a72e7e0566..c4e7dbb58a 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -16,28 +16,14 @@ define([
 
     function defineRoute(newRoute) {
         var path = newRoute.path;
-        console.log("Defining route: " + path);
+        console.log("defining route: " + path);
         newRoute.dictionary = "core";
         Emby.Page.addRoute(path, newRoute);
     }
 
-    console.log("Defining core routes");
+    console.log("defining core routes");
 
-    defineRoute({
-        path: "/addplugin.html",
-        autoFocus: false,
-        roles: "admin",
-        controller: "addpluginpage"
-    });
-    defineRoute({
-        path: "/autoorganizelog.html",
-        roles: "admin"
-    });
-    defineRoute({
-        path: "/channelsettings.html",
-        autoFocus: false,
-        roles: "admin"
-    });
+    // authentication
     defineRoute({
         path: "/addserver.html",
         autoFocus: false,
@@ -45,15 +31,51 @@ define([
         startup: true,
         controller: "addserver"
     });
+    defineRoute({
+        path: "/forgotpassword.html",
+        anonymous: true,
+        startup: true,
+        controller: "forgotpassword"
+    });
+    defineRoute({
+        path: "/forgotpasswordpin.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "forgotpasswordpin"
+    });
+
+    // playback
+    defineRoute({
+        path: "/nowplaying.html",
+        controller: "nowplayingpage",
+        autoFocus: false,
+        transition: "fade",
+        fullscreen: true,
+        supportsThemeMedia: true,
+        enableMediaControl: false
+    });
+    defineRoute({
+        path: "/videoosd.html",
+        transition: "fade",
+        controller: "videoosd",
+        autoFocus: false,
+        type: "video-osd",
+        supportsThemeMedia: true,
+        fullscreen: true,
+        enableMediaControl: false
+    });
+
+    // dashboard
     defineRoute({
         path: "/dashboard.html",
         autoFocus: false,
         roles: "admin",
-        controller: "dashboardpage"
+        controller: "dashboard/dashboard"
     });
     defineRoute({
         path: "/dashboardgeneral.html",
-        controller: "dashboardgeneral",
+        controller: "dashboard/general",
         autoFocus: false,
         roles: "admin"
     });
@@ -61,7 +83,7 @@ define([
         path: "/networking.html",
         autoFocus: false,
         roles: "admin",
-        controller: "networking"
+        controller: "dashboard/networking"
     });
     defineRoute({
         path: "/devices.html",
@@ -104,19 +126,6 @@ define([
         roles: "admin",
         controller: "encodingsettings"
     });
-    defineRoute({
-        path: "/forgotpassword.html",
-        anonymous: true,
-        startup: true,
-        controller: "forgotpassword"
-    });
-    defineRoute({
-        path: "/forgotpasswordpin.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "forgotpasswordpin"
-    });
     defineRoute({
         path: "/home.html",
         autoFocus: false,
@@ -130,11 +139,6 @@ define([
         controller: "list",
         transition: "fade"
     });
-    defineRoute({
-        path: "/index.html",
-        autoFocus: false,
-        isDefaultRoute: true
-    });
     defineRoute({
         path: "/itemdetails.html",
         controller: "itemdetailpage",
@@ -191,7 +195,7 @@ define([
     defineRoute({
         path: "/log.html",
         roles: "admin",
-        controller: "logpage"
+        controller: "dashboard/logs"
     });
     defineRoute({
         path: "/login.html",
@@ -269,52 +273,49 @@ define([
         path: "/notificationsetting.html",
         autoFocus: false,
         roles: "admin",
-        controller: "notificationsetting"
+        controller: "dashboard/notifications/notification"
     });
     defineRoute({
         path: "/notificationsettings.html",
-        controller: "notificationsettings",
+        controller: "dashboard/notifications/notifications",
         autoFocus: false,
         roles: "admin"
     });
-    defineRoute({
-        path: "/nowplaying.html",
-        controller: "nowplayingpage",
-        autoFocus: false,
-        transition: "fade",
-        fullscreen: true,
-        supportsThemeMedia: true,
-        enableMediaControl: false
-    });
     defineRoute({
         path: "/playbackconfiguration.html",
         autoFocus: false,
         roles: "admin",
         controller: "playbackconfiguration"
     });
+    defineRoute({
+        path: "/addplugin.html",
+        autoFocus: false,
+        roles: "admin",
+        controller: "dashboard/plugins/add"
+    });
     defineRoute({
         path: "/availableplugins.html",
         autoFocus: false,
         roles: "admin",
-        controller: "availableplugins"
+        controller: "dashboard/plugins/available"
     });
     defineRoute({
         path: "/installedplugins.html",
         autoFocus: false,
         roles: "admin",
-        controller: "installedplugins"
+        controller: "dashboard/plugins/installed"
     });
     defineRoute({
         path: "/scheduledtask.html",
         autoFocus: false,
         roles: "admin",
-        controller: "scheduledtaskpage"
+        controller: "scheduledtasks/scheduledtask"
     });
     defineRoute({
         path: "/scheduledtasks.html",
         autoFocus: false,
         roles: "admin",
-        controller: "scheduledtaskspage"
+        controller: "scheduledtasks/scheduledtasks"
     });
     defineRoute({
         path: "/search.html",
@@ -345,11 +346,6 @@ define([
         roles: "admin",
         controller: "streamingsettings"
     });
-    defineRoute({
-        path: "/support.html",
-        autoFocus: false,
-        roles: "admin"
-    });
     defineRoute({
         path: "/tv.html",
         autoFocus: false,
@@ -391,6 +387,8 @@ define([
         roles: "admin",
         controller: "userprofilespage"
     });
+
+    // startup wizard
     defineRoute({
         path: "/wizardremoteaccess.html",
         autoFocus: false,
@@ -427,16 +425,6 @@ define([
         autoFocus: false,
         anonymous: true
     });
-    defineRoute({
-        path: "/videoosd.html",
-        transition: "fade",
-        controller: "videoosd",
-        autoFocus: false,
-        type: "video-osd",
-        supportsThemeMedia: true,
-        fullscreen: true,
-        enableMediaControl: false
-    });
     defineRoute({
         path: "/configurationpage",
         autoFocus: false,
@@ -444,9 +432,16 @@ define([
         enableContentQueryString: true,
         roles: "admin"
     });
+
+    // root
     defineRoute({
         path: "/",
         isDefaultRoute: true,
         autoFocus: false
     });
+    defineRoute({
+        path: "/index.html",
+        autoFocus: false,
+        isDefaultRoute: true
+    });
 });

From 4bf12b1682bf51595aa3410c6602f78febe494a8 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sun, 15 Dec 2019 22:42:33 +0900
Subject: [PATCH 2/6] order all routes by category

---
 src/scripts/routes.js | 223 +++++++++++++++++++++---------------------
 1 file changed, 112 insertions(+), 111 deletions(-)

diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index c4e7dbb58a..87f55650fd 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -24,6 +24,13 @@ define([
     console.log("defining core routes");
 
     // authentication
+    defineRoute({
+        path: "/selectserver.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "selectserver"
+    });
     defineRoute({
         path: "/addserver.html",
         autoFocus: false,
@@ -31,6 +38,13 @@ define([
         startup: true,
         controller: "addserver"
     });
+    defineRoute({
+        path: "/login.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "loginpage"
+    });
     defineRoute({
         path: "/forgotpassword.html",
         anonymous: true,
@@ -66,6 +80,93 @@ define([
         enableMediaControl: false
     });
 
+    // media
+    defineRoute({
+        path: "/home.html",
+        autoFocus: false,
+        controller: "home",
+        transition: "fade",
+        type: "home"
+    });
+    defineRoute({
+        path: "/list.html",
+        autoFocus: false,
+        controller: "list",
+        transition: "fade"
+    });
+    defineRoute({
+        path: "/search.html",
+        controller: "searchpage"
+    });
+    defineRoute({
+        path: "/itemdetails.html",
+        controller: "itemdetailpage",
+        autoFocus: false,
+        transition: "fade"
+    });
+    defineRoute({
+        path: "/livetv.html",
+        controller: "livetv/livetvsuggested",
+        autoFocus: false,
+        transition: "fade"
+    });
+    defineRoute({
+        path: "/movies.html",
+        autoFocus: false,
+        controller: "movies/moviesrecommended",
+        transition: "fade"
+    });
+    defineRoute({
+        path: "/music.html",
+        controller: "music/musicrecommended",
+        autoFocus: false,
+        transition: "fade"
+    });
+    defineRoute({
+        path: "/tv.html",
+        autoFocus: false,
+        controller: "shows/tvrecommended",
+        transition: "fade"
+    });
+
+    // user
+    defineRoute({
+        path: "/mypreferencesmenu.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/menu"
+    });
+    defineRoute({
+        path: "/myprofile.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/profile"
+    });
+    defineRoute({
+        path: "/mypreferencesdisplay.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/display"
+    });
+    defineRoute({
+        path: "/mypreferenceshome.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/home"
+    });
+    defineRoute({
+        path: "/mypreferencesplayback.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/playback"
+    });
+    defineRoute({
+        path: "/mypreferencessubtitles.html",
+        autoFocus: false,
+        transition: "fade",
+        controller: "user/subtitles"
+    });
+
     // dashboard
     defineRoute({
         path: "/dashboard.html",
@@ -126,25 +227,6 @@ define([
         roles: "admin",
         controller: "encodingsettings"
     });
-    defineRoute({
-        path: "/home.html",
-        autoFocus: false,
-        controller: "home",
-        transition: "fade",
-        type: "home"
-    });
-    defineRoute({
-        path: "/list.html",
-        autoFocus: false,
-        controller: "list",
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/itemdetails.html",
-        controller: "itemdetailpage",
-        autoFocus: false,
-        transition: "fade"
-    });
     defineRoute({
         path: "/library.html",
         autoFocus: false,
@@ -163,12 +245,6 @@ define([
         roles: "admin",
         controller: "librarysettings"
     });
-    defineRoute({
-        path: "/livetv.html",
-        controller: "livetv/livetvsuggested",
-        autoFocus: false,
-        transition: "fade"
-    });
     defineRoute({
         path: "/livetvguideprovider.html",
         autoFocus: false,
@@ -197,18 +273,6 @@ define([
         roles: "admin",
         controller: "dashboard/logs"
     });
-    defineRoute({
-        path: "/login.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "loginpage"
-    });
-    defineRoute({
-        path: "/metadataadvanced.html",
-        autoFocus: false,
-        roles: "admin"
-    });
     defineRoute({
         path: "/metadataimages.html",
         autoFocus: false,
@@ -221,54 +285,6 @@ define([
         roles: "admin",
         controller: "metadatanfo"
     });
-    defineRoute({
-        path: "/movies.html",
-        autoFocus: false,
-        controller: "movies/moviesrecommended",
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/music.html",
-        controller: "music/musicrecommended",
-        autoFocus: false,
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/mypreferencesmenu.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/menu"
-    });
-    defineRoute({
-        path: "/myprofile.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/profile"
-    });
-    defineRoute({
-        path: "/mypreferencesdisplay.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/display"
-    });
-    defineRoute({
-        path: "/mypreferenceshome.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/home"
-    });
-    defineRoute({
-        path: "/mypreferencesplayback.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/playback"
-    });
-    defineRoute({
-        path: "/mypreferencessubtitles.html",
-        autoFocus: false,
-        transition: "fade",
-        controller: "user/subtitles"
-    });
     defineRoute({
         path: "/notificationsetting.html",
         autoFocus: false,
@@ -309,24 +325,13 @@ define([
         path: "/scheduledtask.html",
         autoFocus: false,
         roles: "admin",
-        controller: "scheduledtasks/scheduledtask"
+        controller: "dashboard/scheduledtasks/scheduledtask"
     });
     defineRoute({
         path: "/scheduledtasks.html",
         autoFocus: false,
         roles: "admin",
-        controller: "scheduledtasks/scheduledtasks"
-    });
-    defineRoute({
-        path: "/search.html",
-        controller: "searchpage"
-    });
-    defineRoute({
-        path: "/selectserver.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "selectserver"
+        controller: "dashboard/scheduledtasks/scheduledtasks"
     });
     defineRoute({
         path: "/serveractivity.html",
@@ -346,12 +351,6 @@ define([
         roles: "admin",
         controller: "streamingsettings"
     });
-    defineRoute({
-        path: "/tv.html",
-        autoFocus: false,
-        controller: "shows/tvrecommended",
-        transition: "fade"
-    });
     defineRoute({
         path: "/useredit.html",
         autoFocus: false,
@@ -388,6 +387,15 @@ define([
         controller: "userprofilespage"
     });
 
+    // plugins
+    defineRoute({
+        path: "/configurationpage",
+        autoFocus: false,
+        enableCache: false,
+        enableContentQueryString: true,
+        roles: "admin"
+    });
+
     // startup wizard
     defineRoute({
         path: "/wizardremoteaccess.html",
@@ -425,13 +433,6 @@ define([
         autoFocus: false,
         anonymous: true
     });
-    defineRoute({
-        path: "/configurationpage",
-        autoFocus: false,
-        enableCache: false,
-        enableContentQueryString: true,
-        roles: "admin"
-    });
 
     // root
     defineRoute({

From 07994e0a408638639b929b40661bc6faa61679fd Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sun, 15 Dec 2019 23:53:13 +0900
Subject: [PATCH 3/6] move authentication and playback controllers to
 subdirectories

---
 src/controllers/{ => auth}/addserver.js       |  0
 src/controllers/{ => auth}/forgotpassword.js  |  0
 .../{ => auth}/forgotpasswordpin.js           |  0
 .../{loginpage.js => auth/login.js}           |  0
 src/controllers/{ => auth}/selectserver.js    |  0
 .../{ => playback}/nowplayingpage.js          |  0
 src/controllers/{ => playback}/videoosd.js    |  0
 .../access.js}                                |  0
 .../{wizardfinishpage.js => wizard/finish.js} |  0
 .../{wizardsettings.js => wizard/settings.js} |  0
 .../{wizardstart.js => wizard/start.js}       |  0
 .../{wizarduserpage.js => wizard/user.js}     |  0
 src/scripts/routes.js                         | 24 +++++++++----------
 13 files changed, 12 insertions(+), 12 deletions(-)
 rename src/controllers/{ => auth}/addserver.js (100%)
 rename src/controllers/{ => auth}/forgotpassword.js (100%)
 rename src/controllers/{ => auth}/forgotpasswordpin.js (100%)
 rename src/controllers/{loginpage.js => auth/login.js} (100%)
 rename src/controllers/{ => auth}/selectserver.js (100%)
 rename src/controllers/{ => playback}/nowplayingpage.js (100%)
 rename src/controllers/{ => playback}/videoosd.js (100%)
 rename src/controllers/{wizardremoteaccess.js => wizard/access.js} (100%)
 rename src/controllers/{wizardfinishpage.js => wizard/finish.js} (100%)
 rename src/controllers/{wizardsettings.js => wizard/settings.js} (100%)
 rename src/controllers/{wizardstart.js => wizard/start.js} (100%)
 rename src/controllers/{wizarduserpage.js => wizard/user.js} (100%)

diff --git a/src/controllers/addserver.js b/src/controllers/auth/addserver.js
similarity index 100%
rename from src/controllers/addserver.js
rename to src/controllers/auth/addserver.js
diff --git a/src/controllers/forgotpassword.js b/src/controllers/auth/forgotpassword.js
similarity index 100%
rename from src/controllers/forgotpassword.js
rename to src/controllers/auth/forgotpassword.js
diff --git a/src/controllers/forgotpasswordpin.js b/src/controllers/auth/forgotpasswordpin.js
similarity index 100%
rename from src/controllers/forgotpasswordpin.js
rename to src/controllers/auth/forgotpasswordpin.js
diff --git a/src/controllers/loginpage.js b/src/controllers/auth/login.js
similarity index 100%
rename from src/controllers/loginpage.js
rename to src/controllers/auth/login.js
diff --git a/src/controllers/selectserver.js b/src/controllers/auth/selectserver.js
similarity index 100%
rename from src/controllers/selectserver.js
rename to src/controllers/auth/selectserver.js
diff --git a/src/controllers/nowplayingpage.js b/src/controllers/playback/nowplayingpage.js
similarity index 100%
rename from src/controllers/nowplayingpage.js
rename to src/controllers/playback/nowplayingpage.js
diff --git a/src/controllers/videoosd.js b/src/controllers/playback/videoosd.js
similarity index 100%
rename from src/controllers/videoosd.js
rename to src/controllers/playback/videoosd.js
diff --git a/src/controllers/wizardremoteaccess.js b/src/controllers/wizard/access.js
similarity index 100%
rename from src/controllers/wizardremoteaccess.js
rename to src/controllers/wizard/access.js
diff --git a/src/controllers/wizardfinishpage.js b/src/controllers/wizard/finish.js
similarity index 100%
rename from src/controllers/wizardfinishpage.js
rename to src/controllers/wizard/finish.js
diff --git a/src/controllers/wizardsettings.js b/src/controllers/wizard/settings.js
similarity index 100%
rename from src/controllers/wizardsettings.js
rename to src/controllers/wizard/settings.js
diff --git a/src/controllers/wizardstart.js b/src/controllers/wizard/start.js
similarity index 100%
rename from src/controllers/wizardstart.js
rename to src/controllers/wizard/start.js
diff --git a/src/controllers/wizarduserpage.js b/src/controllers/wizard/user.js
similarity index 100%
rename from src/controllers/wizarduserpage.js
rename to src/controllers/wizard/user.js
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 87f55650fd..0e4544bb6f 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -29,40 +29,40 @@ define([
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "selectserver"
+        controller: "auth/selectserver"
     });
     defineRoute({
         path: "/addserver.html",
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "addserver"
+        controller: "auth/addserver"
     });
     defineRoute({
         path: "/login.html",
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "loginpage"
+        controller: "auth/login"
     });
     defineRoute({
         path: "/forgotpassword.html",
         anonymous: true,
         startup: true,
-        controller: "forgotpassword"
+        controller: "auth/forgotpassword"
     });
     defineRoute({
         path: "/forgotpasswordpin.html",
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: "forgotpasswordpin"
+        controller: "auth/forgotpasswordpin"
     });
 
     // playback
     defineRoute({
         path: "/nowplaying.html",
-        controller: "nowplayingpage",
+        controller: "playback/nowplaying",
         autoFocus: false,
         transition: "fade",
         fullscreen: true,
@@ -72,7 +72,7 @@ define([
     defineRoute({
         path: "/videoosd.html",
         transition: "fade",
-        controller: "videoosd",
+        controller: "playback/videoosd",
         autoFocus: false,
         type: "video-osd",
         supportsThemeMedia: true,
@@ -401,13 +401,13 @@ define([
         path: "/wizardremoteaccess.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardremoteaccess"
+        controller: "wizard/access"
     });
     defineRoute({
         path: "/wizardfinish.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardfinishpage"
+        controller: "wizard/finish"
     });
     defineRoute({
         path: "/wizardlibrary.html",
@@ -419,17 +419,17 @@ define([
         path: "/wizardsettings.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardsettings"
+        controller: "wizard/settings"
     });
     defineRoute({
         path: "/wizardstart.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizardstart"
+        controller: "wizard/start"
     });
     defineRoute({
         path: "/wizarduser.html",
-        controller: "wizarduserpage",
+        controller: "wizard/user",
         autoFocus: false,
         anonymous: true
     });

From 7f2f10a595c4b85a9296cf0088844e5a35223b47 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Mon, 16 Dec 2019 00:07:55 +0900
Subject: [PATCH 4/6] style fixes in html files

---
 src/addplugin.html              |  9 ++-----
 src/apikeys.html                |  6 ++---
 src/dashboard.html              |  3 ---
 src/dashboardgeneral.html       |  8 +-----
 src/device.html                 | 11 +++-----
 src/devices.html                |  6 ++---
 src/encodingsettings.html       |  7 +++--
 src/forgotpassword.html         |  6 +----
 src/forgotpasswordpin.html      |  6 +----
 src/itemdetails.html            | 48 +++++++++++----------------------
 src/librarydisplay.html         |  4 +--
 src/login.html                  | 12 +++------
 src/manifest.json               |  4 +--
 src/mypreferencesplayback.html  |  5 ++--
 src/mypreferencessubtitles.html |  5 ++--
 src/myprofile.html              |  6 ++---
 src/scheduledtask.html          |  5 +---
 src/scheduledtasks.html         |  4 +--
 src/search.html                 | 10 +++----
 src/serveractivity.html         |  8 +++---
 src/streamingsettings.html      |  6 +++--
 src/videoosd.html               | 26 ++++++++----------
 22 files changed, 71 insertions(+), 134 deletions(-)

diff --git a/src/addplugin.html b/src/addplugin.html
index 309f0f96c4..83640033bb 100644
--- a/src/addplugin.html
+++ b/src/addplugin.html
@@ -1,10 +1,7 @@
 <div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-backbutton="true">
-
     <div>
         <div class="content-primary">
-
             <div class="readOnlyContent">
-
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h1 class="sectionTitle pluginName"></h1>
@@ -13,9 +10,7 @@
 
                     <p id="tagline" style="font-style: italic;"></p>
                     <p id="pPreviewImage"></p>
-
                     <p id="overview"></p>
-
                 </div>
 
                 <div class="verticalSection">
@@ -27,12 +22,12 @@
                             <select id="selectVersion" name="selectVersion" is="emby-select" label="${LabelSelectVersionToInstall}"></select>
                         </div>
 
-                        <p id="btnInstallDiv" class="hide">
+                        <div id="btnInstallDiv" class="hide">
                             <button is="emby-button" type="submit" id="btnInstall" class="raised button-submit block">
                                 <span>${Install}</span>
                             </button>
                             <div class="fieldDescription">${ServerRestartNeededAfterPluginInstall}</div>
-                        </p>
+                        </div>
                         <p id="nonServerMsg"></p>
                     </form>
                 </div>
diff --git a/src/apikeys.html b/src/apikeys.html
index 43cfae5b13..47f032c1f4 100644
--- a/src/apikeys.html
+++ b/src/apikeys.html
@@ -2,9 +2,7 @@
     <div>
         <div class="content-primary">
             <div class="detailSectionHeader">
-                <h2 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
-                    ${HeaderApiKeys}
-                </h2>
+                <h2 style="margin:.6em 0;vertical-align:middle;display:inline-block;">${HeaderApiKeys}</h2>
                 <button is="emby-button" type="button" class="fab btnNewKey submit" style="margin-left:1em;" title="${ButtonAdd}">
                     <i class="md-icon">add</i>
                 </button>
@@ -24,4 +22,4 @@
             </table>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/dashboard.html b/src/dashboard.html
index 43a081f8db..f29de59f93 100644
--- a/src/dashboard.html
+++ b/src/dashboard.html
@@ -105,10 +105,8 @@
                             </div>
                         </div>
                     </div>
-
                 </div>
             </div>
-
         </div>
 
         <div class="dashboardFooter">
@@ -118,5 +116,4 @@
             </div>
         </div>
     </div>
-
 </div>
diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html
index 91708f382a..6387128d5e 100644
--- a/src/dashboardgeneral.html
+++ b/src/dashboardgeneral.html
@@ -1,10 +1,7 @@
 <div id="dashboardGeneralPage" data-role="page" class="page type-interior dashboardHomePage">
-
     <div>
         <div class="content-primary">
-
             <form class="dashboardGeneralForm">
-
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle">${TabSettings}</h2>
@@ -31,9 +28,7 @@
                             <input is="emby-checkbox" type="checkbox" id="chkAutoRunWebApp" />
                             <span>${LaunchWebAppOnStartup}</span>
                         </label>
-                        <div class="fieldDescription checkboxFieldDescription">
-                            ${LaunchWebAppOnStartupHelp}
-                        </div>
+                        <div class="fieldDescription checkboxFieldDescription">${LaunchWebAppOnStartupHelp}</div>
                     </div>
                 </div>
 
@@ -94,7 +89,6 @@
                     </button>
                 </div>
             </form>
-
         </div>
     </div>
 </div>
diff --git a/src/device.html b/src/device.html
index b63d298ca6..11fc9671b1 100644
--- a/src/device.html
+++ b/src/device.html
@@ -1,11 +1,7 @@
 <div id="devicePage" data-role="page" class="page type-interior devicesPage noSecondaryNavPage">
-
     <div>
         <div class="content-primary">
-
-
             <form class="deviceForm">
-
                 <div class="verticalSection verticalSection-extrabottompadding">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle reportedName"></h2>
@@ -18,10 +14,11 @@
                     </div>
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</span>
+                    </button>
                 </div>
             </form>
-
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/devices.html b/src/devices.html
index b05f10fa19..4e6552f05e 100644
--- a/src/devices.html
+++ b/src/devices.html
@@ -7,9 +7,7 @@
                     <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/devices.html">${Help}</a>
                 </div>
             </div>
-
-            <div is="emby-itemscontainer" class="devicesList vertical-wrap" data-multiselect="false">
-            </div>
+            <div is="emby-itemscontainer" class="devicesList vertical-wrap" data-multiselect="false"></div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/encodingsettings.html b/src/encodingsettings.html
index da7f6c9c6c..3d67544c0b 100644
--- a/src/encodingsettings.html
+++ b/src/encodingsettings.html
@@ -22,6 +22,7 @@
                     </select>
                     <div class="fieldDescription">${LabelHardwareAccelerationTypeHelp}</div>
                 </div>
+
                 <div class="inputContainer hide fldVaapiDevice">
                     <input is="emby-input" type="text" id="txtVaapiDevice" label="${LabelVaapiDevice}" />
                     <div class="fieldDescription">${LabelVaapiDeviceHelp}</div>
@@ -142,9 +143,11 @@
                 </div>
 
                 <div>
-                    <button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised button-submit block">
+                        <span>${ButtonSave}</span>
+                    </button>
                 </div>
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/forgotpassword.html b/src/forgotpassword.html
index aac53ed296..d4ed0d4170 100644
--- a/src/forgotpassword.html
+++ b/src/forgotpassword.html
@@ -1,9 +1,6 @@
 <div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage">
-
     <div>
-
         <form class="forgotPasswordForm" style="text-align: center; margin: 0 auto;">
-
             <div style="text-align: left;">
                 <h1>${HeaderForgotPassword}</h1>
 
@@ -23,6 +20,5 @@
                 </div>
             </div>
         </form>
-
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/forgotpasswordpin.html b/src/forgotpasswordpin.html
index 0eb8b8a1a5..3b1ba0d37b 100644
--- a/src/forgotpasswordpin.html
+++ b/src/forgotpasswordpin.html
@@ -1,9 +1,6 @@
 <div data-role="page" class="page standalonePage forgotPasswordPinPage">
-
     <div>
-
         <form class="forgotPasswordPinForm" style="text-align: center; margin: 0 auto;">
-
             <div style="text-align: left;">
                 <h2>${HeaderPasswordReset}</h2>
 
@@ -22,6 +19,5 @@
                 </div>
             </div>
         </form>
-
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/itemdetails.html b/src/itemdetails.html
index 2a29cce96b..303202bf61 100644
--- a/src/itemdetails.html
+++ b/src/itemdetails.html
@@ -2,7 +2,6 @@
 
     <style>
         @media all and (min-width: 62.5em) {
-
             .itemBackdrop {
                 display: none;
             }
@@ -10,45 +9,31 @@
     </style>
 
     <div id="itemBackdrop" class="itemBackdrop noBackdrop">
-        <div class="itemBackdropFader">
-        </div>
-        <button is="emby-button" type="button" class="btnPlay detailFloatingButton hide fab autoSize" title="${ButtonPlay}" data-mode="resume"><i class="md-icon">play_arrow</i></button>
+        <div class="itemBackdropFader"></div>
+        <button is="emby-button" type="button" class="btnPlay detailFloatingButton hide fab autoSize" title="${ButtonPlay}" data-mode="resume">
+            <i class="md-icon">play_arrow</i>
+        </button>
     </div>
 
     <div class="detailLogo"></div>
 
     <div class="detailPageContent padded-bottom-page">
-
         <div class="detailPagePrimaryContainer padded-left padded-right">
-            <div class="detailImageContainer">
-            </div>
+            <div class="detailImageContainer"></div>
             <div class="detailPagePrimaryContent">
-
                 <div class="detailSection" style="margin-bottom: 0;">
 
-                    <div class="nameContainer">
+                    <div class="nameContainer"></div>
 
-                    </div>
+                    <div class="itemMiscInfo nativeName hide"></div>
 
-                    <div class="itemMiscInfo nativeName hide">
+                    <div class="itemMiscInfo itemMiscInfo-primary" style="margin: .7em 0;font-size:92%;"></div>
 
-                    </div>
+                    <div class="itemMiscInfo itemMiscInfo-secondary" style="margin: .7em 0;font-size:92%;"></div>
 
-                    <div class="itemMiscInfo itemMiscInfo-primary" style="margin: .7em 0;font-size:92%;">
+                    <div class="genres hide" style="margin: .7em 0;font-size:92%;"></div>
 
-                    </div>
-
-                    <div class="itemMiscInfo itemMiscInfo-secondary" style="margin: .7em 0;font-size:92%;">
-
-                    </div>
-
-                    <div class="genres hide" style="margin: .7em 0;font-size:92%;">
-
-                    </div>
-
-                    <div class="directors hide" style="margin: .7em 0;font-size:92%;">
-
-                    </div>
+                    <div class="directors hide" style="margin: .7em 0;font-size:92%;"></div>
 
                     <form class="trackSelections flex align-items-center flex-wrap-wrap hide focuscontainer-x" style="margin: .5em 0;font-size:92%; padding: 0;">
                         <div class="selectContainer selectContainer-inline selectSourceContainer hide trackSelectionFieldContainer flex-shrink-zero" style="margin-right:1.5em;">
@@ -66,7 +51,6 @@
                     </form>
 
                     <div class="mainDetailButtons">
-
                         <button is="emby-button" type="button" class="raised btnResume hide detailButton" data-mode="resume">
                             <span>${ButtonResume}</span>
                         </button>
@@ -217,12 +201,10 @@
             </div>
         </div>
         <div class="seriesTimerScheduleSection verticalSection detailVerticalSection hide" style="margin-top:-3em;">
-            <h2 class="sectionTitle padded-left">
-                ${HeaderSchedule}
-            </h2>
-            <div class="seriesTimerSchedule padded-left padded-right">
-            </div>
+            <h2 class="sectionTitle padded-left">${HeaderSchedule}</h2>
+            <div class="seriesTimerSchedule padded-left padded-right"></div>
         </div>
+
         <div class="collectionItems"></div>
         <div class="nextUpSection verticalSection detailVerticalSection hide">
             <h2 class="sectionTitle sectionTitle-cards padded-left">${HeaderNextUp}</h2>
@@ -261,6 +243,7 @@
                 <div id="castContent" is="emby-itemscontainer" class="scrollSlider focuscontainer-x itemsContainer"></div>
             </div>
         </div>
+
         <div id="seriesScheduleSection" class="verticalSection detailVerticalSection hide">
             <h2 class="sectionTitle padded-left padded-right">${HeaderUpcomingOnTV}</h2>
             <div id="seriesScheduleList" is="emby-itemscontainer" class="itemsContainer vertical-list padded-left padded-right"></div>
@@ -270,6 +253,7 @@
             <h2 class="sectionTitle sectionTitle-cards padded-left">${HeaderSpecialFeatures}</h2>
             <div id="specialsContent" is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right"></div>
         </div>
+
         <div id="musicVideosCollapsible" class="verticalSection detailVerticalSection hide">
             <h2 class="sectionTitle sectionTitle-cards padded-left">${HeaderMusicVideos}</h2>
             <div id="musicVideosContent" is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right"></div>
diff --git a/src/librarydisplay.html b/src/librarydisplay.html
index b5510ddb14..25dce48223 100644
--- a/src/librarydisplay.html
+++ b/src/librarydisplay.html
@@ -47,11 +47,11 @@
                     <div class="fieldDescription checkboxFieldDescription">${OptionSaveMetadataAsHiddenHelp}</div>
                 </div>
 
-                <br />
+                <br/>
                 <button is="emby-button" type="submit" class="raised button-submit block">
                     <span>${ButtonSave}</span>
                 </button>
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/login.html b/src/login.html
index 629f434313..21c9d8a347 100644
--- a/src/login.html
+++ b/src/login.html
@@ -1,11 +1,7 @@
 <div id="loginPage" data-role="page" class="page standalonePage" data-backbutton="false">
-
     <div class="padded-left padded-right padded-bottom-page">
-
         <form class="manualLoginForm hide" style="margin: 0 auto;">
-
             <h1 style="margin-top:1em;text-align: left;">${HeaderPleaseSignIn}</h1>
-
             <div style="height:0; overflow: hidden;">
                 <input type="text" name="fakeusernameremembered" tabindex="-1" />
                 <input type="password" name="fakepasswordremembered" tabindex="-1" />
@@ -27,13 +23,14 @@
             <button is="emby-button" type="submit" class="raised button-submit block">
                 <span>${ButtonSignIn}</span>
             </button>
+
             <div style="margin-top:.5em;">
                 <button is="emby-button" type="button" class="raised cancel block btnCancel">
                     <span>${ButtonCancel}</span>
                 </button>
             </div>
-            <br />
-            <br />
+            <br/>
+            <br/>
         </form>
 
         <div class="visualLoginForm" style="text-align: center;">
@@ -56,6 +53,5 @@
 
             <p class="disclaimer" style="text-align: center; margin-top: 2em;"></p>
         </div>
-
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/manifest.json b/src/manifest.json
index a87b086dac..fed1177e24 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,5 +1,4 @@
 {
-
     "name": "Jellyfin",
     "description": "Jellyfin: the Free Software Media System.",
     "lang": "en-US",
@@ -8,7 +7,8 @@
     "theme_color": "#101010",
     "background_color": "#101010",
     "display": "standalone",
-    "icons": [{
+    "icons": [
+        {
             "sizes": "72x72",
             "src": "touchicon72.png",
             "type": "image/png"
diff --git a/src/mypreferencesplayback.html b/src/mypreferencesplayback.html
index 93f806d0d4..d908c06096 100644
--- a/src/mypreferencesplayback.html
+++ b/src/mypreferencesplayback.html
@@ -1,4 +1,3 @@
 <div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${TitlePlayback}" data-backbutton="true">
-    <div class="settingsContainer padded-left padded-right padded-bottom-page">
-    </div>
-</div>
\ No newline at end of file
+    <div class="settingsContainer padded-left padded-right padded-bottom-page"></div>
+</div>
diff --git a/src/mypreferencessubtitles.html b/src/mypreferencessubtitles.html
index aa26a8f157..29d1c84898 100644
--- a/src/mypreferencessubtitles.html
+++ b/src/mypreferencessubtitles.html
@@ -1,4 +1,3 @@
 <div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${Subtitles}" data-backbutton="true">
-    <div class="settingsContainer padded-left padded-right padded-bottom-page">
-    </div>
-</div>
\ No newline at end of file
+    <div class="settingsContainer padded-left padded-right padded-bottom-page"></div>
+</div>
diff --git a/src/myprofile.html b/src/myprofile.html
index d30f905818..3765ac5e75 100644
--- a/src/myprofile.html
+++ b/src/myprofile.html
@@ -42,9 +42,7 @@
         </form>
         <form class="localAccessForm localAccessSection userProfileSettingsForm hide" style="margin: 3em auto 0;">
             <div class="verticalSection">
-                <h2 class="sectionTitle">
-                    ${HeaderEasyPinCode}
-                </h2>
+                <h2 class="sectionTitle">${HeaderEasyPinCode}</h2>
                 <div>${EasyPasswordHelp}</div>
                 <br />
                 <div class="inputContainer">
@@ -68,4 +66,4 @@
             </div>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/scheduledtask.html b/src/scheduledtask.html
index ee2a2c3420..8ecaf04dbe 100644
--- a/src/scheduledtask.html
+++ b/src/scheduledtask.html
@@ -1,7 +1,6 @@
 <div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage">
     <div>
         <div class="content-primary">
-
             <div class="verticalSection">
                 <div class="sectionTitleContainer flex align-items-center">
                     <h2 class="sectionTitle taskName"></h2>
@@ -12,9 +11,7 @@
 
             <div class="readOnlyContent">
                 <div>
-                    <h2 style="vertical-align: middle; display: inline-block;">
-                        ${HeaderTaskTriggers}
-                    </h2>
+                    <h2 style="vertical-align: middle; display: inline-block;">${HeaderTaskTriggers}</h2>
                     <button is="emby-button" type="button" class="fab fab-mini btnAddTrigger submit" style="margin-left: 1em;" title="${ButtonAddScheduledTaskTrigger}">
                         <i class="md-icon">add</i>
                     </button>
diff --git a/src/scheduledtasks.html b/src/scheduledtasks.html
index ce4405bab0..cbff6bcd9d 100644
--- a/src/scheduledtasks.html
+++ b/src/scheduledtasks.html
@@ -1,5 +1,4 @@
 <div id="scheduledTasksPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage">
-
     <style>
         .taskProgressOuter {
             height: 6px;
@@ -15,8 +14,7 @@
     </style>
     <div>
         <div class="content-primary">
-
             <div class="divScheduledTasks readOnlyContent"></div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/search.html b/src/search.html
index 1fc65e3f11..acf65e7317 100644
--- a/src/search.html
+++ b/src/search.html
@@ -1,8 +1,4 @@
 <div id="searchPage" data-role="page" class="page libraryPage allLibraryPage noSecondaryNavPage" data-title="${ButtonSearch}" data-backbutton="true">
-
-    <div class="padded-left padded-right searchFields">
-    </div>
-
-    <div class="searchResults padded-bottom-page padded-top">
-    </div>
-</div>
\ No newline at end of file
+    <div class="padded-left padded-right searchFields"></div>
+    <div class="searchResults padded-bottom-page padded-top"></div>
+</div>
diff --git a/src/serveractivity.html b/src/serveractivity.html
index e2e1795691..29cacd300e 100644
--- a/src/serveractivity.html
+++ b/src/serveractivity.html
@@ -2,13 +2,11 @@
     <div>
         <div class="content-primary">
             <div class="verticalSection">
-                <h2 class="sectionTitle">
-                </h2>
+                <h2 class="sectionTitle"></h2>
             </div>
             <div class="readOnlyContent">
-                <div class="paperList activityItems" data-activitylimit="100">
-                </div>
+                <div class="paperList activityItems" data-activitylimit="100"></div>
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/streamingsettings.html b/src/streamingsettings.html
index 7efb4a3966..2d51d9ee77 100644
--- a/src/streamingsettings.html
+++ b/src/streamingsettings.html
@@ -11,8 +11,10 @@
                         <div class="fieldDescription">${LabelRemoteClientBitrateLimitHelp}</div>
                     </div>
                 </div>
-                <button is="emby-button" type="submit" class="raised button-submit block"><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised button-submit block">
+                    <span>${ButtonSave}</span>
+                </button>
             </form>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/videoosd.html b/src/videoosd.html
index 0c7a910908..c9a46fd021 100644
--- a/src/videoosd.html
+++ b/src/videoosd.html
@@ -1,27 +1,19 @@
 <div id="videoOsdPage" data-role="page" class="page libraryPage" data-backbutton="true">
-    <div class="pageContainer flex">
-
-    </div>
-    <div class="upNextContainer hide">
-    </div>
-
+    <div class="pageContainer flex"></div>
+    <div class="upNextContainer hide"></div>
     <div class="videoOsdBottom videoOsdBottom-maincontrols">
-
-        <div class="osdPoster">
-
-        </div>
+        <div class="osdPoster"></div>
         <div class="osdControls">
-
             <div class="osdTextContainer osdMainTextContainer">
                 <h3 class="osdTitle"></h3>
                 <div class="osdMediaInfo"></div>
                 <div class="osdMediaStatus hide">
-                    <i class="md-icon animate">autorenew</i> <span>${FetchingData}</span>
+                    <i class="md-icon animate">autorenew</i>
+                    <span>${FetchingData}</span>
                 </div>
             </div>
 
-            <div class="osdTextContainer osdSecondaryMediaInfo">
-            </div>
+            <div class="osdTextContainer osdSecondaryMediaInfo"></div>
 
             <div class="flex flex-direction-row align-items-center">
                 <div class="osdTextContainer startTimeText" style="margin: 0 .25em 0 0;"></div>
@@ -73,7 +65,11 @@
                     <i class="xlargePaperIconButton md-icon">picture_in_picture_alt</i>
                 </button>
 
-                <div class="osdTimeText"><span class="osdPositionText"></span><span class="osdDurationText"></span><span class="endsAtText"></span></div>
+                <div class="osdTimeText">
+                    <span class="osdPositionText"></span>
+                    <span class="osdDurationText"></span>
+                    <span class="endsAtText"></span>
+                </div>
 
                 <div class="volumeButtons hide-mouse-idle-tv">
                     <button is="paper-icon-button-light" class="buttonMute autoSize" title="${Mute} (m)">

From a08d142db2ad68d0aeae23cbad0caf77c87447e4 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Wed, 8 Jan 2020 01:36:34 +0900
Subject: [PATCH 5/6] move some routes to their original locations for now

---
 src/scripts/routes.js | 243 ++++++++++++++++++++----------------------
 1 file changed, 116 insertions(+), 127 deletions(-)

diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 0e4544bb6f..9f3c794863 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -23,113 +23,12 @@ define([
 
     console.log("defining core routes");
 
-    // authentication
     defineRoute({
-        path: "/selectserver.html",
+        path: "/addplugin.html",
         autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/selectserver"
+        roles: "admin",
+        controller: "dashboard/plugins/add"
     });
-    defineRoute({
-        path: "/addserver.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/addserver"
-    });
-    defineRoute({
-        path: "/login.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/login"
-    });
-    defineRoute({
-        path: "/forgotpassword.html",
-        anonymous: true,
-        startup: true,
-        controller: "auth/forgotpassword"
-    });
-    defineRoute({
-        path: "/forgotpasswordpin.html",
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: "auth/forgotpasswordpin"
-    });
-
-    // playback
-    defineRoute({
-        path: "/nowplaying.html",
-        controller: "playback/nowplaying",
-        autoFocus: false,
-        transition: "fade",
-        fullscreen: true,
-        supportsThemeMedia: true,
-        enableMediaControl: false
-    });
-    defineRoute({
-        path: "/videoosd.html",
-        transition: "fade",
-        controller: "playback/videoosd",
-        autoFocus: false,
-        type: "video-osd",
-        supportsThemeMedia: true,
-        fullscreen: true,
-        enableMediaControl: false
-    });
-
-    // media
-    defineRoute({
-        path: "/home.html",
-        autoFocus: false,
-        controller: "home",
-        transition: "fade",
-        type: "home"
-    });
-    defineRoute({
-        path: "/list.html",
-        autoFocus: false,
-        controller: "list",
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/search.html",
-        controller: "searchpage"
-    });
-    defineRoute({
-        path: "/itemdetails.html",
-        controller: "itemdetailpage",
-        autoFocus: false,
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/livetv.html",
-        controller: "livetv/livetvsuggested",
-        autoFocus: false,
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/movies.html",
-        autoFocus: false,
-        controller: "movies/moviesrecommended",
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/music.html",
-        controller: "music/musicrecommended",
-        autoFocus: false,
-        transition: "fade"
-    });
-    defineRoute({
-        path: "/tv.html",
-        autoFocus: false,
-        controller: "shows/tvrecommended",
-        transition: "fade"
-    });
-
-    // user
     defineRoute({
         path: "/mypreferencesmenu.html",
         autoFocus: false,
@@ -142,6 +41,13 @@ define([
         transition: "fade",
         controller: "user/profile"
     });
+    defineRoute({
+        path: "/addserver.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/addserver"
+    });
     defineRoute({
         path: "/mypreferencesdisplay.html",
         autoFocus: false,
@@ -167,7 +73,6 @@ define([
         controller: "user/subtitles"
     });
 
-    // dashboard
     defineRoute({
         path: "/dashboard.html",
         autoFocus: false,
@@ -227,6 +132,43 @@ define([
         roles: "admin",
         controller: "encodingsettings"
     });
+    defineRoute({
+        path: "/forgotpassword.html",
+        anonymous: true,
+        startup: true,
+        controller: "auth/forgotpassword"
+    });
+    defineRoute({
+        path: "/forgotpasswordpin.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/forgotpasswordpin"
+    });
+    defineRoute({
+        path: "/home.html",
+        autoFocus: false,
+        controller: "home",
+        transition: "fade",
+        type: "home"
+    });
+    defineRoute({
+        path: "/list.html",
+        autoFocus: false,
+        controller: "list",
+        transition: "fade"
+    });
+    defineRoute({
+        path: "/index.html",
+        autoFocus: false,
+        isDefaultRoute: true
+    });
+    defineRoute({
+        path: "/itemdetails.html",
+        controller: "itemdetailpage",
+        autoFocus: false,
+        transition: "fade"
+    });
     defineRoute({
         path: "/library.html",
         autoFocus: false,
@@ -245,6 +187,12 @@ define([
         roles: "admin",
         controller: "librarysettings"
     });
+    defineRoute({
+        path: "/livetv.html",
+        controller: "livetv/livetvsuggested",
+        autoFocus: false,
+        transition: "fade"
+    });
     defineRoute({
         path: "/livetvguideprovider.html",
         autoFocus: false,
@@ -273,6 +221,13 @@ define([
         roles: "admin",
         controller: "dashboard/logs"
     });
+    defineRoute({
+        path: "/login.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/login"
+    });
     defineRoute({
         path: "/metadataimages.html",
         autoFocus: false,
@@ -285,6 +240,18 @@ define([
         roles: "admin",
         controller: "metadatanfo"
     });
+    defineRoute({
+        path: "/movies.html",
+        autoFocus: false,
+        controller: "movies/moviesrecommended",
+        transition: "fade"
+    });
+    defineRoute({
+        path: "/music.html",
+        controller: "music/musicrecommended",
+        autoFocus: false,
+        transition: "fade"
+    });
     defineRoute({
         path: "/notificationsetting.html",
         autoFocus: false,
@@ -297,18 +264,21 @@ define([
         autoFocus: false,
         roles: "admin"
     });
+    defineRoute({
+        path: "/nowplaying.html",
+        controller: "playback/nowplaying",
+        autoFocus: false,
+        transition: "fade",
+        fullscreen: true,
+        supportsThemeMedia: true,
+        enableMediaControl: false
+    });
     defineRoute({
         path: "/playbackconfiguration.html",
         autoFocus: false,
         roles: "admin",
         controller: "playbackconfiguration"
     });
-    defineRoute({
-        path: "/addplugin.html",
-        autoFocus: false,
-        roles: "admin",
-        controller: "dashboard/plugins/add"
-    });
     defineRoute({
         path: "/availableplugins.html",
         autoFocus: false,
@@ -333,6 +303,17 @@ define([
         roles: "admin",
         controller: "dashboard/scheduledtasks/scheduledtasks"
     });
+    defineRoute({
+        path: "/search.html",
+        controller: "searchpage"
+    });
+    defineRoute({
+        path: "/selectserver.html",
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: "auth/selectserver"
+    });
     defineRoute({
         path: "/serveractivity.html",
         autoFocus: false,
@@ -351,6 +332,12 @@ define([
         roles: "admin",
         controller: "streamingsettings"
     });
+    defineRoute({
+        path: "/tv.html",
+        autoFocus: false,
+        controller: "shows/tvrecommended",
+        transition: "fade"
+    });
     defineRoute({
         path: "/useredit.html",
         autoFocus: false,
@@ -387,16 +374,6 @@ define([
         controller: "userprofilespage"
     });
 
-    // plugins
-    defineRoute({
-        path: "/configurationpage",
-        autoFocus: false,
-        enableCache: false,
-        enableContentQueryString: true,
-        roles: "admin"
-    });
-
-    // startup wizard
     defineRoute({
         path: "/wizardremoteaccess.html",
         autoFocus: false,
@@ -434,15 +411,27 @@ define([
         anonymous: true
     });
 
-    // root
+    defineRoute({
+        path: "/videoosd.html",
+        transition: "fade",
+        controller: "playback/videoosd",
+        autoFocus: false,
+        type: "video-osd",
+        supportsThemeMedia: true,
+        fullscreen: true,
+        enableMediaControl: false
+    });
+    defineRoute({
+        path: "/configurationpage",
+        autoFocus: false,
+        enableCache: false,
+        enableContentQueryString: true,
+        roles: "admin"
+    });
+
     defineRoute({
         path: "/",
         isDefaultRoute: true,
         autoFocus: false
     });
-    defineRoute({
-        path: "/index.html",
-        autoFocus: false,
-        isDefaultRoute: true
-    });
 });

From 3047b12382691ce9d2480eb576fa9708ca4f07c3 Mon Sep 17 00:00:00 2001
From: dkanada <dkanada@users.noreply.github.com>
Date: Sun, 12 Jan 2020 02:23:16 +0900
Subject: [PATCH 6/6] add code suggestions

---
 src/controllers/wizard/{access.js => remoteaccess.js} | 0
 src/scripts/routes.js                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/controllers/wizard/{access.js => remoteaccess.js} (100%)

diff --git a/src/controllers/wizard/access.js b/src/controllers/wizard/remoteaccess.js
similarity index 100%
rename from src/controllers/wizard/access.js
rename to src/controllers/wizard/remoteaccess.js
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 9f3c794863..a3427c6551 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -378,7 +378,7 @@ define([
         path: "/wizardremoteaccess.html",
         autoFocus: false,
         anonymous: true,
-        controller: "wizard/access"
+        controller: "wizard/remoteaccess"
     });
     defineRoute({
         path: "/wizardfinish.html",