added manual server form

dashboard-ui/scripts/connectlogin.js

@@ -28,6 +28,126 @@
 
     }
 
+    function handleConnectionResult(page, result) {
+
+        switch (result.State) {
+
+            case MediaBrowser.ConnectionState.SignedIn:
+                {
+                    var apiClient = result.ApiClient;
+
+                    Dashboard.serverAddress(apiClient.serverAddress());
+                    Dashboard.setCurrentUser(apiClient.getCurrentUserId(), apiClient.accessToken());
+                    window.location = 'index.html';
+                }
+                break;
+            case MediaBrowser.ConnectionState.ServerSignIn:
+                {
+                    window.location = 'connectlogin.html?mode=serversignin&serverid=' + result.Servers[0].Id;
+                }
+                break;
+            case MediaBrowser.ConnectionState.ServerSelection:
+                {
+                    onLoggedIn();
+                }
+                break;
+            case MediaBrowser.ConnectionState.ConnectSignIn:
+                {
+                    loadMode(page, 'welcome');
+                }
+                break;
+            default:
+                break;
+        }
+    }
+
+    function loadAppConnection(page) {
+
+        Dashboard.showLoadingMsg();
+
+        ConnectionManager.connect().done(function (result) {
+
+            Dashboard.hideLoadingMsg();
+
+            handleConnectionResult(page, result);
+
+        });
+    }
+
+    function loadPage(page) {
+
+        var mode = getParameterByName('mode');
+
+        if (!mode) {
+
+            if (Dashboard.isRunningInCordova()) {
+                loadAppConnection(page);
+                return;
+            }
+            mode = 'connect';
+        }
+
+        loadMode(page, mode);
+    }
+    function loadMode(page, mode) {
+
+        if (mode == 'welcome') {
+            $('.connectLoginForm', page).hide();
+            $('.welcomeContainer', page).show();
+            $('.manualServerForm', page).hide();
+        }
+        else if (mode == 'connect') {
+            $('.connectLoginForm', page).show();
+            $('.welcomeContainer', page).hide();
+            $('.manualServerForm', page).hide();
+        }
+        else if (mode == 'manualserver') {
+            $('.manualServerForm', page).show();
+            $('.connectLoginForm', page).hide();
+            $('.welcomeContainer', page).hide();
+        }
+    }
+
+    $(document).on('pageshow', "#connectLoginPage", function () {
+
+        var page = this;
+
+        loadPage(page);
+
+        var link = '<a href="http://emby.media" target="_blank">http://emby.media</a>';
+        $('.embyIntroDownloadMessage', page).html(Globalize.translate('EmbyIntroDownloadMessage', link));
+
+        if (Dashboard.isRunningInCordova()) {
+            $('.newUsers', page).hide();
+            $('.forgotPassword', page).hide();
+            $('.skip', page).show();
+        } else {
+            $('.skip', page).hide();
+            $('.newUsers', page).show();
+            $('.forgotPassword', page).show();
+        }
+    });
+
+    function submitManualServer(page) {
+
+        var host = $('#txtServerHost', page).val();
+        var port = $('#txtServerPort', page).val();
+
+        if (port) {
+            host += ':' + port;
+        }
+
+        Dashboard.showLoadingMsg();
+
+        ConnectionManager.connectToAddress(host).done(function (result) {
+
+            Dashboard.hideLoadingMsg();
+
+            handleConnectionResult(page, result);
+
+        });
+    }
+
     function submit(page) {
 
         var user = $('#txtManualName', page).val();
@@ -45,6 +165,15 @@
             submit(page);
 
             return false;
+        },
+
+        onManualServerSubmit: function () {
+            var page = $(this).parents('.page');
+
+            submitManualServer(page);
+
+            return false;
+
         }
     };
 

dashboard-ui/scripts/librarymenu.js

@@ -40,26 +40,29 @@
             html += '<button id="btnCast" class="btnCast btnDefaultCast headerButton headerButtonRight" type="button" data-role="none" style="visibility:hidden;"><div class="headerSelectedPlayer"></div><div class="btnCastImage"></div></button>';
 
         }
+        
+        if (user.name) {
+            
+            html += '<a class="headerButton headerButtonRight headerUserButton" href="#" onclick="Dashboard.showUserFlyout(this);">';
 
-        html += '<a class="headerButton headerButtonRight headerUserButton" href="#" onclick="Dashboard.showUserFlyout(this);">';
+            if (user.imageUrl) {
 
-        if (user.imageUrl) {
+                var userButtonHeight = 26;
 
-            var userButtonHeight = 26;
+                var url = user.imageUrl;
 
-            var url = user.imageUrl;
+                if (user.supportsImageParams) {
+                    url += "&height=" + (userButtonHeight * Math.max(devicePixelRatio || 1, 2));
+                }
 
-            if (user.supportsImageParams) {
-                url += "&height=" + (userButtonHeight * Math.max(devicePixelRatio || 1, 2));
+                html += '<img src="' + url + '" style="border-radius: 1000px; height:' + userButtonHeight + 'px;" />';
+            } else {
+                html += '<div class="fa fa-user"></div>';
             }
 
-            html += '<img src="' + url + '" style="border-radius: 1000px; height:' + userButtonHeight + 'px;" />';
-        } else {
-            html += '<div class="fa fa-user"></div>';
+            html += '</a>';
         }
 
-        html += '</a>';
-
         if (user.canManageServer) {
             html += '<a href="dashboard.html" class="headerButton headerButtonRight dashboardEntryHeaderButton"><div class="fa fa-cog"></div></a>';
         }

dashboard-ui/scripts/selectserver.js

@@ -19,6 +19,15 @@
                         window.location = 'index.html';
                     }
                     break;
+                case MediaBrowser.ConnectionState.ServerSignIn:
+                    {
+                        if (Dashboard.isRunningInCordova()) {
+                            window.location = 'connectlogin.html?mode=serversignin&serverid=' + result.Servers[0].Id;
+                        } else {
+                            showServerConnectionFailure();
+                        }
+                    }
+                    break;
                 default:
                     showServerConnectionFailure();
                     break;
@@ -326,11 +335,19 @@
 
     function loadInvitations(page) {
 
-        ConnectionManager.getUserInvitations().done(function (list) {
+        if (ConnectionManager.isLoggedIntoConnect()) {
 
-            renderInvitations(page, list);
+            ConnectionManager.getUserInvitations().done(function (list) {
+
+                renderInvitations(page, list);
+
+            });
+
+        } else {
+
+            renderInvitations(page, []);
+        }
 
-        });
     }
 
     function loadPage(page) {
@@ -345,6 +362,14 @@
         });
 
         loadInvitations(page);
+
+        if (Dashboard.isRunningInCordova()) {
+            $('.newServer', page).show();
+            $('.connectLogin', page).show();
+        } else {
+            $('.newServer', page).hide();
+            $('.connectLogin', page).hide();
+        }
     }
 
     $(document).on('pageshow', "#selectServerPage", function () {

dashboard-ui/scripts/site.js

@@ -42,8 +42,22 @@ var Dashboard = {
         $.mobile.panel.prototype.options.classes.panel = "largePanel ui-panel";
     },
 
+    isConnectMode: function () {
+
+        return true;
+        if (Dashboard.isRunningInCordova()) {
+            return true;
+        }
+
+        var url = getWindowUrl().toLowerCase();
+
+        return url.indexOf('mediabrowser.tv') != -1 ||
+			url.indexOf('emby.media') != -1;
+    },
+
     isRunningInCordova: function () {
 
+        return true;
         return window.appMode == 'cordova';
     },
 
@@ -185,18 +199,6 @@ var Dashboard = {
         Dashboard.getUserPromise = null;
     },
 
-    isConnectMode: function () {
-
-        if (Dashboard.isRunningInCordova()) {
-            return true;
-        }
-
-        var url = getWindowUrl().toLowerCase();
-
-        return url.indexOf('mediabrowser.tv') != -1 ||
-			url.indexOf('emby.media') != -1;
-    },
-
     logout: function (logoutWithServer) {
 
         store.removeItem("userId");
@@ -1648,18 +1650,6 @@ $(document).on('pagecreate', ".page", function () {
 
     var page = $(this);
 
-    var isConnectMode = Dashboard.isConnectMode();
-
-    if (isConnectMode && !page.hasClass('connectLoginPage')) {
-
-        if (!ConnectionManager.isLoggedIntoConnect()) {
-
-            console.log('Not logged into connect. Redirecting to login.');
-            Dashboard.logout();
-            return;
-        }
-    }
-
     var apiClient = ConnectionManager.currentApiClient();
 
     if (Dashboard.getAccessToken() && Dashboard.getCurrentUserId()) {
@@ -1686,6 +1676,16 @@ $(document).on('pagecreate', ".page", function () {
 
     else {
 
+        var isConnectMode = Dashboard.isConnectMode();
+
+        if (isConnectMode) {
+            
+            if (!Dashboard.isServerlessPage()) {
+                Dashboard.logout();
+                return;
+            }
+        }
+        
         if (this.id !== "loginPage" && !page.hasClass('forgotPasswordPage') && !page.hasClass('wizardPage') && !isConnectMode) {
 
             console.log('Not logged into server. Redirecting to login.');

dashboard-ui/scripts/sync.js

@@ -400,7 +400,9 @@
 
         var page = this;
 
-        showSyncButtonsPerUser(page);
+        if (!Dashboard.isServerlessPage()) {
+            showSyncButtonsPerUser(page);
+        }
 
     });