Merge remote-tracking branch 'upstream/master' into quickconnect

src/scripts/routes.js

@@ -38,6 +38,14 @@ define([
         controller: 'auth/selectserver',
         type: 'selectserver'
     });
+    defineRoute({
+        path: '/login.html',
+        autoFocus: false,
+        anonymous: true,
+        startup: true,
+        controller: 'auth/login',
+        type: 'login'
+    });
     defineRoute({
         path: '/forgotpassword.html',
         anonymous: true,
@@ -52,12 +60,6 @@ define([
         controller: 'auth/forgotpasswordpin'
     });
 
-    defineRoute({
-        path: '/addplugin.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/plugins/add'
-    });
     defineRoute({
         path: '/mypreferencesmenu.html',
         autoFocus: false,
@@ -142,19 +144,37 @@ define([
         path: '/dlnaprofile.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/dlna/dlnaprofile'
+        controller: 'dashboard/dlna/profile'
     });
     defineRoute({
         path: '/dlnaprofiles.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/dlna/dlnaprofiles'
+        controller: 'dashboard/dlna/profiles'
+    });
+    defineRoute({
+        path: '/addplugin.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/plugins/add'
+    });
+    defineRoute({
+        path: '/library.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/mediaLibrary'
+    });
+    defineRoute({
+        path: '/librarydisplay.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/librarydisplay'
     });
     defineRoute({
         path: '/dlnasettings.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/dlna/dlnasettings'
+        controller: 'dashboard/dlna/settings'
     });
     defineRoute({
         path: '/edititemmetadata.html',
@@ -167,6 +187,48 @@ define([
         roles: 'admin',
         controller: 'dashboard/encodingsettings'
     });
+    defineRoute({
+        path: '/log.html',
+        roles: 'admin',
+        controller: 'dashboard/logs'
+    });
+    defineRoute({
+        path: '/metadataimages.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/metadataImages'
+    });
+    defineRoute({
+        path: '/metadatanfo.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/metadatanfo'
+    });
+    defineRoute({
+        path: '/notificationsetting.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/notifications/notification'
+    });
+    defineRoute({
+        path: '/notificationsettings.html',
+        controller: 'dashboard/notifications/notifications',
+        autoFocus: false,
+        roles: 'admin'
+    });
+    defineRoute({
+        path: '/playbackconfiguration.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/playback'
+    });
+    defineRoute({
+        path: '/availableplugins.html',
+        autoFocus: false,
+        roles: 'admin',
+        controller: 'dashboard/plugins/available'
+    });
+
     defineRoute({
         path: '/home.html',
         autoFocus: false,
@@ -174,6 +236,10 @@ define([
         transition: 'fade',
         type: 'home'
     });
+    defineRoute({
+        path: '/search.html',
+        controller: 'searchpage'
+    });
     defineRoute({
         path: '/list.html',
         autoFocus: false,
@@ -182,22 +248,10 @@ define([
     });
     defineRoute({
         path: '/itemdetails.html',
-        controller: 'itemdetailpage',
+        controller: 'itemDetails',
         autoFocus: false,
         transition: 'fade'
     });
-    defineRoute({
-        path: '/library.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/medialibrarypage'
-    });
-    defineRoute({
-        path: '/librarydisplay.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/librarydisplay'
-    });
     defineRoute({
         path: '/livetv.html',
         controller: 'livetv/livetvsuggested',
@@ -227,31 +281,6 @@ define([
         roles: 'admin',
         controller: 'livetvtuner'
     });
-    defineRoute({
-        path: '/log.html',
-        roles: 'admin',
-        controller: 'dashboard/logs'
-    });
-    defineRoute({
-        path: '/login.html',
-        autoFocus: false,
-        anonymous: true,
-        startup: true,
-        controller: 'auth/login',
-        type: 'login'
-    });
-    defineRoute({
-        path: '/metadataimages.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/metadataimagespage'
-    });
-    defineRoute({
-        path: '/metadatanfo.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/metadatanfo'
-    });
     defineRoute({
         path: '/movies.html',
         autoFocus: false,
@@ -264,30 +293,6 @@ define([
         autoFocus: false,
         transition: 'fade'
     });
-    defineRoute({
-        path: '/notificationsetting.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/notifications/notification'
-    });
-    defineRoute({
-        path: '/notificationsettings.html',
-        controller: 'dashboard/notifications/notifications',
-        autoFocus: false,
-        roles: 'admin'
-    });
-    defineRoute({
-        path: '/playbackconfiguration.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/playbackconfiguration'
-    });
-    defineRoute({
-        path: '/availableplugins.html',
-        autoFocus: false,
-        roles: 'admin',
-        controller: 'dashboard/plugins/available'
-    });
     defineRoute({
         path: '/installedplugins.html',
         autoFocus: false,
@@ -306,10 +311,6 @@ define([
         roles: 'admin',
         controller: 'dashboard/scheduledtasks/scheduledtasks'
     });
-    defineRoute({
-        path: '/search.html',
-        controller: 'searchpage'
-    });
     defineRoute({
         path: '/serveractivity.html',
         autoFocus: false,
@@ -326,7 +327,7 @@ define([
         path: '/streamingsettings.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'dashboard/streamingsettings'
+        controller: 'dashboard/streaming'
     });
     defineRoute({
         path: '/tv.html',
@@ -334,40 +335,41 @@ define([
         controller: 'shows/tvrecommended',
         transition: 'fade'
     });
+
     defineRoute({
         path: '/useredit.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'useredit'
+        controller: 'dashboard/users/useredit'
     });
     defineRoute({
         path: '/userlibraryaccess.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'userlibraryaccess'
+        controller: 'dashboard/users/userlibraryaccess'
     });
     defineRoute({
         path: '/usernew.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'usernew'
+        controller: 'dashboard/users/usernew'
     });
     defineRoute({
         path: '/userparentalcontrol.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'userparentalcontrol'
+        controller: 'dashboard/users/userparentalcontrol'
     });
     defineRoute({
         path: '/userpassword.html',
         autoFocus: false,
-        controller: 'userpasswordpage'
+        controller: 'dashboard/users/userpasswordpage'
     });
     defineRoute({
         path: '/userprofiles.html',
         autoFocus: false,
         roles: 'admin',
-        controller: 'userprofilespage'
+        controller: 'dashboard/users/userprofilespage'
     });
 
     defineRoute({
@@ -386,7 +388,7 @@ define([
         path: '/wizardlibrary.html',
         autoFocus: false,
         anonymous: true,
-        controller: 'medialibrarypage'
+        controller: 'dashboard/mediaLibrary'
     });
     defineRoute({
         path: '/wizardsettings.html',