Merge remote-tracking branch 'upstream/master' into dead-code-society

package.json

@@ -156,11 +156,11 @@
           "src/components/syncPlay/playbackPermissionManager.js",
           "src/components/syncPlay/syncPlayManager.js",
           "src/components/syncPlay/timeSyncManager.js",
-          "src/controllers/auth/addserver.js",
-          "src/controllers/auth/forgotpassword.js",
-          "src/controllers/auth/forgotpasswordpin.js",
-          "src/controllers/auth/login.js",
-          "src/controllers/auth/selectserver.js",
+          "src/controllers/session/addServer/index.js",
+          "src/controllers/session/forgotPassword/index.js",
+          "src/controllers/session/redeemPassword/index.js",
+          "src/controllers/session/login/index.js",
+          "src/controllers/sessopm/selectServer/index.js",
           "src/controllers/dashboard/apikeys.js",
           "src/controllers/dashboard/dashboard.js",
           "src/controllers/dashboard/devices/device.js",
@@ -177,7 +177,7 @@
           "src/controllers/dashboard/metadatanfo.js",
           "src/controllers/dashboard/networking.js",
           "src/controllers/dashboard/playback.js",
-          "src/controllers/dashboard/plugins/repositories.js",
+          "src/controllers/dashboard/plugins/repositories/index.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtask.js",
           "src/controllers/dashboard/scheduledtasks/scheduledtasks.js",
           "src/controllers/dashboard/serveractivity.js",
@@ -188,8 +188,8 @@
           "src/controllers/dashboard/users/userparentalcontrol.js",
           "src/controllers/dashboard/users/userpasswordpage.js",
           "src/controllers/dashboard/users/userprofilespage.js",
-          "src/controllers/playback/nowplaying.js",
-          "src/controllers/playback/videoosd.js",
+          "src/controllers/playback/queue/index.js",
+          "src/controllers/playback/video/index.js",
           "src/controllers/searchpage.js",
           "src/controllers/shows/episodes.js",
           "src/controllers/shows/tvgenres.js",
@@ -198,18 +198,18 @@
           "src/controllers/shows/tvshows.js",
           "src/controllers/shows/tvstudios.js",
           "src/controllers/shows/tvupcoming.js",
-          "src/controllers/user/display.js",
-          "src/controllers/user/home.js",
-          "src/controllers/user/menu.js",
-          "src/controllers/user/playback.js",
-          "src/controllers/user/profile.js",
-          "src/controllers/user/subtitles.js",
-          "src/controllers/user/subtitles.js",
-          "src/controllers/wizard/finish.js",
-          "src/controllers/wizard/remoteaccess.js",
-          "src/controllers/wizard/settings.js",
-          "src/controllers/wizard/start.js",
-          "src/controllers/wizard/user.js",
+          "src/controllers/user/display/index.js",
+          "src/controllers/user/home/index.js",
+          "src/controllers/user/menu/index.js",
+          "src/controllers/user/playback/index.js",
+          "src/controllers/user/profile/index.js",
+          "src/controllers/user/subtitles/index.js",
+          "src/controllers/user/subtitles/index.js",
+          "src/controllers/wizard/finish/index.js",
+          "src/controllers/wizard/remote/index.js",
+          "src/controllers/wizard/settings/index.js",
+          "src/controllers/wizard/start/index.js",
+          "src/controllers/wizard/user/index.js",
           "src/elements/emby-button/emby-button.js",
           "src/elements/emby-button/paper-icon-button-light.js",
           "src/elements/emby-checkbox/emby-checkbox.js",

src/assets/css/site.css

@@ -133,3 +133,13 @@ div[data-role=page] {
 .w-100 {
     width: 100%;
 }
+
+.margin-auto-x {
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.margin-auto-y {
+    margin-top: auto;
+    margin-bottom: auto;
+}

src/components/appRouter.js

@@ -16,7 +16,7 @@ define(['loading', 'globalize', 'events', 'viewManager', 'skinManager', 'backdro
             show('/settings/settings.html');
         },
         showNowPlaying: function () {
-            show('/nowplaying.html');
+            show('queue');
         }
     };
 

src/controllers/session/forgotPassword/index.html

@@ -1,5 +1,5 @@
 <div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage">
-    <div>
+    <div class="padded-left padded-right padded-bottom-page">
         <form class="forgotPasswordForm" style="text-align: center; margin: 0 auto;">
             <div style="text-align: left;">
                 <h1>${HeaderForgotPassword}</h1>

src/controllers/session/login/index.html

@@ -1,6 +1,6 @@
-<div id="loginPage" data-role="page" class="page standalonePage flex flex-direction-column align-items-center justify-content-center" data-backbutton="false">
-    <div class="padded-left padded-right padded-bottom-page">
-        <form class="manualLoginForm hide">
+<div id="loginPage" data-role="page" class="page standalonePage flex flex-direction-column" data-backbutton="false">
+    <div class="padded-left padded-right padded-bottom-page margin-auto-y">
+        <form class="manualLoginForm margin-auto-x hide">
             <div class="padded-left padded-right flex align-items-center justify-content-center">
                 <h1 class="sectionTitle">${HeaderPleaseSignIn}</h1>
             </div>

src/controllers/session/resetPassword/index.html

@@ -1,5 +1,5 @@
 <div data-role="page" class="page standalonePage forgotPasswordPinPage">
-    <div>
+    <div class="padded-left padded-right padded-bottom-page">
         <form class="forgotPasswordPinForm" style="text-align: center; margin: 0 auto;">
             <div style="text-align: left;">
                 <h2>${HeaderPasswordReset}</h2>

src/controllers/session/selectServer/index.html

@@ -0,0 +1,17 @@
+<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage pageContainer fullWidthContent vertical flex flex-direction-column">
+    <div class="margin-auto-y">
+        <div class="verticalSection flex-shrink-zero w-100 flex flex-direction-column">
+            <div class="padded-left padded-right flex align-items-center justify-content-center">
+                <h1 class="sectionTitle sectionTitle-cards">${HeaderSelectServer}</h1>
+            </div>
+            <div class="padded-top padded-bottom-focusscale flex-grow flex" data-horizontal="true" data-centerfocus="card">
+                <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x servers flex-grow" style="display: block; text-align: center;" data-hovermenu="false" data-multiselect="false"></div>
+            </div>
+        </div>
+        <div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap margin-auto-x">
+            <a is="emby-linkbutton" href="addserver.html" class="raised cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
+                <span>${ButtonAddServer}</span>
+            </a>
+        </div>
+    </div>
+</div>

src/scripts/routes.js

@@ -24,77 +24,88 @@ define([
     console.debug('defining core routes');
 
     defineRoute({
-        path: '/addserver.html',
+        alias: '/addserver.html',
+        path: '/controllers/session/addServer/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/addserver'
+        controller: 'session/addServer/index'
     });
     defineRoute({
-        path: '/selectserver.html',
+        alias: '/selectserver.html',
+        path: '/controllers/session/selectServer/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/selectserver',
+        controller: 'session/selectServer/index',
         type: 'selectserver'
     });
     defineRoute({
-        path: '/login.html',
+        alias: '/login.html',
+        path: '/controllers/session/login/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/login',
+        controller: 'session/login/index',
         type: 'login'
     });
     defineRoute({
-        path: '/forgotpassword.html',
+        alias: '/forgotpassword.html',
+        path: '/controllers/session/forgotPassword/index.html',
         anonymous: true,
         startup: true,
-        controller: 'auth/forgotpassword'
+        controller: 'session/forgotPassword/index'
     });
     defineRoute({
-        path: '/forgotpasswordpin.html',
+        alias: '/forgotpasswordpin.html',
+        path: '/controllers/session/redeemPassword/index.html',
         autoFocus: false,
         anonymous: true,
         startup: true,
-        controller: 'auth/forgotpasswordpin'
+        controller: 'session/redeemPassword/index'
     });
 
     defineRoute({
-        path: '/mypreferencesmenu.html',
+        alias: '/mypreferencesmenu.html',
+        path: '/controllers/user/menu/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/menu'
+        controller: 'user/menu/index'
     });
     defineRoute({
-        path: '/myprofile.html',
+        alias: '/myprofile.html',
+        path: '/controllers/user/profile/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/profile'
+        controller: 'user/profile/index'
     });
     defineRoute({
-        path: '/mypreferencesdisplay.html',
+        alias: '/mypreferencesdisplay.html',
+        path: '/controllers/user/display/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/display'
+        controller: 'user/display/index'
     });
     defineRoute({
-        path: '/mypreferenceshome.html',
+        alias: '/mypreferenceshome.html',
+        path: '/controllers/user/home/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/home'
+        controller: 'user/home/index'
     });
     defineRoute({
-        path: '/mypreferencesplayback.html',
+        alias: '/mypreferencesplayback.html',
+        path: '/controllers/user/playback/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/playback'
+        controller: 'user/playback/index'
     });
     defineRoute({
-        path: '/mypreferencessubtitles.html',
+        alias: '/mypreferencessubtitles.html',
+        path: '/controllers/user/subtitles/index.html',
         autoFocus: false,
         transition: 'fade',
-        controller: 'user/subtitles'
+        controller: 'user/subtitles/index'
     });
 
     defineRoute({
@@ -140,10 +151,11 @@ define([
         controller: 'dashboard/dlna/profiles'
     });
     defineRoute({
-        path: '/addplugin.html',
+        alias: '/addplugin.html',
+        path: '/controllers/dashboard/plugins/add/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/add'
+        controller: 'dashboard/plugins/add/index'
     });
     defineRoute({
         path: '/library.html',
@@ -192,14 +204,16 @@ define([
         controller: 'dashboard/metadatanfo'
     });
     defineRoute({
-        path: '/notificationsetting.html',
+        alias: '/notificationsetting.html',
+        path: '/controllers/dashboard/notifications/notification/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/notifications/notification'
+        controller: 'dashboard/notifications/notification/index'
     });
     defineRoute({
-        path: '/notificationsettings.html',
-        controller: 'dashboard/notifications/notifications',
+        alias: '/notificationsettings.html',
+        path: '/controllers/dashboard/notifications/notifications/index.html',
+        controller: 'dashboard/notifications/notifications/index',
         autoFocus: false,
         roles: 'admin'
     });
@@ -210,16 +224,18 @@ define([
         controller: 'dashboard/playback'
     });
     defineRoute({
-        path: '/availableplugins.html',
+        alias: '/availableplugins.html',
+        path: '/controllers/dashboard/plugins/available/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/available'
+        controller: 'dashboard/plugins/available/index'
     });
     defineRoute({
-        path: '/repositories.html',
+        alias: '/repositories.html',
+        path: '/controllers/dashboard/plugins/repositories/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/repositories'
+        controller: 'dashboard/plugins/repositories/index'
     });
 
     defineRoute({
@@ -288,10 +304,11 @@ define([
         transition: 'fade'
     });
     defineRoute({
-        path: '/installedplugins.html',
+        alias: '/installedplugins.html',
+        path: '/controllers/dashboard/plugins/installed/index.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/plugins/installed'
+        controller: 'dashboard/plugins/installed/index'
     });
     defineRoute({
         path: '/scheduledtask.html',
@@ -367,16 +384,18 @@ define([
     });
 
     defineRoute({
-        path: '/wizardremoteaccess.html',
+        alias: '/wizardremoteaccess.html',
+        path: '/controllers/wizard/remote/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/remoteaccess'
+        controller: 'wizard/remote/index'
     });
     defineRoute({
-        path: '/wizardfinish.html',
+        alias: '/wizardfinish.html',
+        path: '/controllers/wizard/finish/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/finish'
+        controller: 'wizard/finish/index'
     });
     defineRoute({
         path: '/wizardlibrary.html',
@@ -385,28 +404,32 @@ define([
         controller: 'dashboard/mediaLibrary'
     });
     defineRoute({
-        path: '/wizardsettings.html',
+        alias: '/wizardsettings.html',
+        path: '/controllers/wizard/settings/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/settings'
+        controller: 'wizard/settings/index'
     });
     defineRoute({
-        path: '/wizardstart.html',
+        alias: '/wizardstart.html',
+        path: '/controllers/wizard/start/index.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'wizard/start'
+        controller: 'wizard/start/index'
     });
     defineRoute({
-        path: '/wizarduser.html',
-        controller: 'wizard/user',
+        alias: '/wizarduser.html',
+        path: '/controllers/wizard/user/index.html',
+        controller: 'wizard/user/index',
         autoFocus: false,
         anonymous: true
     });
 
     defineRoute({
-        path: '/videoosd.html',
+        alias: '/video',
+        path: '/controllers/playback/video/index.html',
         transition: 'fade',
-        controller: 'playback/videoosd',
+        controller: 'playback/video/index',
         autoFocus: false,
         type: 'video-osd',
         supportsThemeMedia: true,
@@ -414,8 +437,9 @@ define([
         enableMediaControl: false
     });
     defineRoute({
-        path: '/nowplaying.html',
-        controller: 'playback/nowplaying',
+        alias: '/queue',
+        path: '/controllers/playback/queue/index.html',
+        controller: 'playback/queue/index',
         autoFocus: false,
         transition: 'fade',
         fullscreen: true,

src/scripts/site.js

@@ -886,7 +886,7 @@ function initClient() {
             };
 
             appRouter.showVideoOsd = function () {
-                return Dashboard.navigate('videoosd.html');
+                return Dashboard.navigate('video');
             };
 
             appRouter.showSelectServer = function () {

src/selectserver.html

@@ -1,15 +0,0 @@
-<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage pageContainer fullWidthContent vertical flex flex-direction-column align-items-center justify-content-center">
-    <div class="verticalSection flex-shrink-zero w-100 flex flex-direction-column">
-        <div class="padded-left padded-right flex align-items-center justify-content-center">
-            <h1 class="sectionTitle sectionTitle-cards">${HeaderSelectServer}</h1>
-        </div>
-        <div class="padded-top padded-bottom-focusscale flex-grow flex" data-horizontal="true" data-centerfocus="card">
-            <div is="emby-itemscontainer" class="scrollSlider focuscontainer-x servers flex-grow" style="display: block; text-align: center;" data-hovermenu="false" data-multiselect="false"></div>
-        </div>
-    </div>
-    <div class="padded-top padded-left padded-right flex flex-shrink-zero justify-content-center verticalSection flex-wrap-wrap" style="margin-left:auto;margin-right:auto;">
-        <a is="emby-linkbutton" href="addserver.html" class="raised block cancel btnAddServer flex-shrink-zero" style="margin: .25em;">
-            <span>${ButtonAddServer}</span>
-        </a>
-    </div>
-</div>