diff --git a/package.json b/package.json index 8cbe42cc8c..775fc5346b 100644 --- a/package.json +++ b/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", diff --git a/src/assets/css/site.css b/src/assets/css/site.css index f6326f4c9e..38e056df89 100644 --- a/src/assets/css/site.css +++ b/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; +} diff --git a/src/components/appRouter.js b/src/components/appRouter.js index 17b92cfd2a..a86c585759 100644 --- a/src/components/appRouter.js +++ b/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'); } }; diff --git a/src/notificationsetting.html b/src/controllers/dashboard/notifications/notification/index.html similarity index 100% rename from src/notificationsetting.html rename to src/controllers/dashboard/notifications/notification/index.html diff --git a/src/controllers/dashboard/notifications/notification.js b/src/controllers/dashboard/notifications/notification/index.js similarity index 100% rename from src/controllers/dashboard/notifications/notification.js rename to src/controllers/dashboard/notifications/notification/index.js diff --git a/src/notificationsettings.html b/src/controllers/dashboard/notifications/notifications/index.html similarity index 100% rename from src/notificationsettings.html rename to src/controllers/dashboard/notifications/notifications/index.html diff --git a/src/controllers/dashboard/notifications/notifications.js b/src/controllers/dashboard/notifications/notifications/index.js similarity index 100% rename from src/controllers/dashboard/notifications/notifications.js rename to src/controllers/dashboard/notifications/notifications/index.js diff --git a/src/addplugin.html b/src/controllers/dashboard/plugins/add/index.html similarity index 100% rename from src/addplugin.html rename to src/controllers/dashboard/plugins/add/index.html diff --git a/src/controllers/dashboard/plugins/add.js b/src/controllers/dashboard/plugins/add/index.js similarity index 100% rename from src/controllers/dashboard/plugins/add.js rename to src/controllers/dashboard/plugins/add/index.js diff --git a/src/availableplugins.html b/src/controllers/dashboard/plugins/available/index.html similarity index 100% rename from src/availableplugins.html rename to src/controllers/dashboard/plugins/available/index.html diff --git a/src/controllers/dashboard/plugins/available.js b/src/controllers/dashboard/plugins/available/index.js similarity index 100% rename from src/controllers/dashboard/plugins/available.js rename to src/controllers/dashboard/plugins/available/index.js diff --git a/src/installedplugins.html b/src/controllers/dashboard/plugins/installed/index.html similarity index 100% rename from src/installedplugins.html rename to src/controllers/dashboard/plugins/installed/index.html diff --git a/src/controllers/dashboard/plugins/installed.js b/src/controllers/dashboard/plugins/installed/index.js similarity index 100% rename from src/controllers/dashboard/plugins/installed.js rename to src/controllers/dashboard/plugins/installed/index.js diff --git a/src/repositories.html b/src/controllers/dashboard/plugins/repositories/index.html similarity index 100% rename from src/repositories.html rename to src/controllers/dashboard/plugins/repositories/index.html diff --git a/src/controllers/dashboard/plugins/repositories.js b/src/controllers/dashboard/plugins/repositories/index.js similarity index 100% rename from src/controllers/dashboard/plugins/repositories.js rename to src/controllers/dashboard/plugins/repositories/index.js diff --git a/src/nowplaying.html b/src/controllers/playback/queue/index.html similarity index 100% rename from src/nowplaying.html rename to src/controllers/playback/queue/index.html diff --git a/src/controllers/playback/nowplaying.js b/src/controllers/playback/queue/index.js similarity index 100% rename from src/controllers/playback/nowplaying.js rename to src/controllers/playback/queue/index.js diff --git a/src/videoosd.html b/src/controllers/playback/video/index.html similarity index 100% rename from src/videoosd.html rename to src/controllers/playback/video/index.html diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/video/index.js similarity index 100% rename from src/controllers/playback/videoosd.js rename to src/controllers/playback/video/index.js diff --git a/src/addserver.html b/src/controllers/session/addServer/index.html similarity index 100% rename from src/addserver.html rename to src/controllers/session/addServer/index.html diff --git a/src/controllers/auth/addserver.js b/src/controllers/session/addServer/index.js similarity index 100% rename from src/controllers/auth/addserver.js rename to src/controllers/session/addServer/index.js diff --git a/src/forgotpassword.html b/src/controllers/session/forgotPassword/index.html similarity index 94% rename from src/forgotpassword.html rename to src/controllers/session/forgotPassword/index.html index d4ed0d4170..80631564f8 100644 --- a/src/forgotpassword.html +++ b/src/controllers/session/forgotPassword/index.html @@ -1,5 +1,5 @@
-
+

${HeaderForgotPassword}

diff --git a/src/controllers/auth/forgotpassword.js b/src/controllers/session/forgotPassword/index.js similarity index 100% rename from src/controllers/auth/forgotpassword.js rename to src/controllers/session/forgotPassword/index.js diff --git a/src/login.html b/src/controllers/session/login/index.html similarity index 92% rename from src/login.html rename to src/controllers/session/login/index.html index fd52b4bf58..458ac7df3b 100644 --- a/src/login.html +++ b/src/controllers/session/login/index.html @@ -1,6 +1,6 @@ -
-
- +
+
+

${HeaderPleaseSignIn}

diff --git a/src/controllers/auth/login.js b/src/controllers/session/login/index.js similarity index 100% rename from src/controllers/auth/login.js rename to src/controllers/session/login/index.js diff --git a/src/forgotpasswordpin.html b/src/controllers/session/resetPassword/index.html similarity index 93% rename from src/forgotpasswordpin.html rename to src/controllers/session/resetPassword/index.html index 3b1ba0d37b..ef915be788 100644 --- a/src/forgotpasswordpin.html +++ b/src/controllers/session/resetPassword/index.html @@ -1,5 +1,5 @@
-
+

${HeaderPasswordReset}

diff --git a/src/controllers/auth/forgotpasswordpin.js b/src/controllers/session/resetPassword/index.js similarity index 100% rename from src/controllers/auth/forgotpasswordpin.js rename to src/controllers/session/resetPassword/index.js diff --git a/src/controllers/session/selectServer/index.html b/src/controllers/session/selectServer/index.html new file mode 100644 index 0000000000..0a14e7fa03 --- /dev/null +++ b/src/controllers/session/selectServer/index.html @@ -0,0 +1,17 @@ +
+
+
+
+

${HeaderSelectServer}

+
+
+
+
+
+
+ + ${ButtonAddServer} + +
+
+
diff --git a/src/controllers/auth/selectserver.js b/src/controllers/session/selectServer/index.js similarity index 100% rename from src/controllers/auth/selectserver.js rename to src/controllers/session/selectServer/index.js diff --git a/src/mypreferencesdisplay.html b/src/controllers/user/display/index.html similarity index 100% rename from src/mypreferencesdisplay.html rename to src/controllers/user/display/index.html diff --git a/src/controllers/user/display.js b/src/controllers/user/display/index.js similarity index 100% rename from src/controllers/user/display.js rename to src/controllers/user/display/index.js diff --git a/src/mypreferenceshome.html b/src/controllers/user/home/index.html similarity index 100% rename from src/mypreferenceshome.html rename to src/controllers/user/home/index.html diff --git a/src/controllers/user/home.js b/src/controllers/user/home/index.js similarity index 100% rename from src/controllers/user/home.js rename to src/controllers/user/home/index.js diff --git a/src/mypreferencesmenu.html b/src/controllers/user/menu/index.html similarity index 100% rename from src/mypreferencesmenu.html rename to src/controllers/user/menu/index.html diff --git a/src/controllers/user/menu.js b/src/controllers/user/menu/index.js similarity index 100% rename from src/controllers/user/menu.js rename to src/controllers/user/menu/index.js diff --git a/src/mypreferencesplayback.html b/src/controllers/user/playback/index.html similarity index 100% rename from src/mypreferencesplayback.html rename to src/controllers/user/playback/index.html diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback/index.js similarity index 100% rename from src/controllers/user/playback.js rename to src/controllers/user/playback/index.js diff --git a/src/myprofile.html b/src/controllers/user/profile/index.html similarity index 100% rename from src/myprofile.html rename to src/controllers/user/profile/index.html diff --git a/src/controllers/user/profile.js b/src/controllers/user/profile/index.js similarity index 100% rename from src/controllers/user/profile.js rename to src/controllers/user/profile/index.js diff --git a/src/mypreferencessubtitles.html b/src/controllers/user/subtitles/index.html similarity index 100% rename from src/mypreferencessubtitles.html rename to src/controllers/user/subtitles/index.html diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles/index.js similarity index 100% rename from src/controllers/user/subtitles.js rename to src/controllers/user/subtitles/index.js diff --git a/src/wizardfinish.html b/src/controllers/wizard/finish/index.html similarity index 100% rename from src/wizardfinish.html rename to src/controllers/wizard/finish/index.html diff --git a/src/controllers/wizard/finish.js b/src/controllers/wizard/finish/index.js similarity index 100% rename from src/controllers/wizard/finish.js rename to src/controllers/wizard/finish/index.js diff --git a/src/wizardremoteaccess.html b/src/controllers/wizard/remote/index.html similarity index 100% rename from src/wizardremoteaccess.html rename to src/controllers/wizard/remote/index.html diff --git a/src/controllers/wizard/remoteaccess.js b/src/controllers/wizard/remote/index.js similarity index 100% rename from src/controllers/wizard/remoteaccess.js rename to src/controllers/wizard/remote/index.js diff --git a/src/wizardsettings.html b/src/controllers/wizard/settings/index.html similarity index 100% rename from src/wizardsettings.html rename to src/controllers/wizard/settings/index.html diff --git a/src/controllers/wizard/settings.js b/src/controllers/wizard/settings/index.js similarity index 100% rename from src/controllers/wizard/settings.js rename to src/controllers/wizard/settings/index.js diff --git a/src/wizardstart.html b/src/controllers/wizard/start/index.html similarity index 100% rename from src/wizardstart.html rename to src/controllers/wizard/start/index.html diff --git a/src/controllers/wizard/start.js b/src/controllers/wizard/start/index.js similarity index 100% rename from src/controllers/wizard/start.js rename to src/controllers/wizard/start/index.js diff --git a/src/wizarduser.html b/src/controllers/wizard/user/index.html similarity index 100% rename from src/wizarduser.html rename to src/controllers/wizard/user/index.html diff --git a/src/controllers/wizard/user.js b/src/controllers/wizard/user/index.js similarity index 100% rename from src/controllers/wizard/user.js rename to src/controllers/wizard/user/index.js diff --git a/src/scripts/routes.js b/src/scripts/routes.js index ab12b53abf..d79819456a 100644 --- a/src/scripts/routes.js +++ b/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, diff --git a/src/scripts/site.js b/src/scripts/site.js index 2fffe60231..cddf2506a0 100644 --- a/src/scripts/site.js +++ b/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 () { diff --git a/src/selectserver.html b/src/selectserver.html deleted file mode 100644 index 3318a6b80e..0000000000 --- a/src/selectserver.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
-
-

${HeaderSelectServer}

-
-
-
-
-
-
- - ${ButtonAddServer} - -
-