From 3d0e125dd37dca346f0f2fd81fc92050af4d57a9 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 23 Feb 2014 00:52:30 -0500
Subject: [PATCH] added chromecast boilerplate

---
 dashboard-ui/episodes.html                    |   2 +-
 dashboard-ui/itembynamedetails.html           |   6 +-
 dashboard-ui/itemdetails.html                 |   2 +-
 dashboard-ui/scripts/chromecast.js            | 317 ++++++++++++++++++
 dashboard-ui/scripts/edititempeople.js        |   2 +-
 dashboard-ui/scripts/librarymenu.js           |   2 +-
 dashboard-ui/scripts/site.js                  |   2 +-
 dashboard-ui/scripts/tvlatest.js              |  38 +++
 dashboard-ui/scripts/tvnextup.js              |  48 ---
 dashboard-ui/scripts/tvrecommended.js         |  78 +++--
 dashboard-ui/tvgenres.html                    |   2 +-
 dashboard-ui/{tvnextup.html => tvlatest.html} |   6 +-
 dashboard-ui/tvpeople.html                    |   2 +-
 dashboard-ui/tvrecommended.html               |   6 +-
 dashboard-ui/tvshows.html                     |   2 +-
 dashboard-ui/tvstudios.html                   |   2 +-
 dashboard-ui/tvupcoming.html                  |   2 +-
 17 files changed, 422 insertions(+), 97 deletions(-)
 create mode 100644 dashboard-ui/scripts/chromecast.js
 create mode 100644 dashboard-ui/scripts/tvlatest.js
 delete mode 100644 dashboard-ui/scripts/tvnextup.js
 rename dashboard-ui/{tvnextup.html => tvlatest.html} (81%)

diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html
index 76a7c42876..48d464a9fb 100644
--- a/dashboard-ui/episodes.html
+++ b/dashboard-ui/episodes.html
@@ -8,7 +8,7 @@
 
         <div class="libraryViewNav">
             <a href="tvrecommended.html">Suggested</a>
-            <a href="tvnextup.html">Next up</a>
+            <a href="tvlatest.html">Latest</a>
             <a href="tvupcoming.html">Upcoming</a>
             <a href="tvshows.html">Shows</a>
             <a href="episodes.html" class="ui-btn-active">Episodes</a>
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index c22dd3b9b4..22d9cf6753 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -41,7 +41,7 @@
         <div id="tvGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav">
                 <a href="tvrecommended.html">Suggested</a>
-                <a href="tvnextup.html">Next up</a>
+                <a href="tvlatest.html">Latest</a>
                 <a href="tvupcoming.html">Upcoming</a>
                 <a href="tvshows.html">Shows</a>
                 <a href="episodes.html">Episodes</a>
@@ -53,7 +53,7 @@
         <div id="tvPeopleTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav">
                 <a href="tvrecommended.html">Suggested</a>
-                <a href="tvnextup.html">Next up</a>
+                <a href="tvlatest.html">Latest</a>
                 <a href="tvupcoming.html">Upcoming</a>
                 <a href="tvshows.html">Shows</a>
                 <a href="episodes.html">Episodes</a>
@@ -65,7 +65,7 @@
         <div id="tvStudioTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav">
                 <a href="tvrecommended.html">Suggested</a>
-                <a href="tvnextup.html">Next up</a>
+                <a href="tvlatest.html">Latest</a>
                 <a href="tvupcoming.html">Upcoming</a>
                 <a href="tvshows.html">Shows</a>
                 <a href="episodes.html">Episodes</a>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 139981d132..db588fe329 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -41,7 +41,7 @@
         <div id="tvShowsTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav">
                 <a href="tvrecommended.html">Suggested</a>
-                <a href="tvnextup.html">Next up</a>
+                <a href="tvlatest.html">Latest</a>
                 <a href="tvupcoming.html">Upcoming</a>
                 <a href="tvshows.html" class="ui-btn-active">Shows</a>
                 <a href="episodes.html">Episodes</a>
diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js
new file mode 100644
index 0000000000..a9fe0991de
--- /dev/null
+++ b/dashboard-ui/scripts/chromecast.js
@@ -0,0 +1,317 @@
+(function (window, chrome, console) {
+
+    // Based on https://github.com/googlecast/CastVideos-chrome/blob/master/CastVideos.js
+    
+    /**
+     * Constants of states for Chromecast device 
+     **/
+    var DEVICE_STATE = {
+        'IDLE': 0,
+        'ACTIVE': 1,
+        'WARNING': 2,
+        'ERROR': 3,
+    };
+
+    /**
+     * Constants of states for CastPlayer 
+     **/
+    var PLAYER_STATE = {
+        'IDLE': 'IDLE',
+        'LOADING': 'LOADING',
+        'LOADED': 'LOADED',
+        'PLAYING': 'PLAYING',
+        'PAUSED': 'PAUSED',
+        'STOPPED': 'STOPPED',
+        'SEEKING': 'SEEKING',
+        'ERROR': 'ERROR'
+    };
+
+    var CastPlayer = function () {
+
+        /* device variables */
+        // @type {DEVICE_STATE} A state for device
+        this.deviceState = DEVICE_STATE.IDLE;
+
+        /* Cast player variables */
+        // @type {Object} a chrome.cast.media.Media object
+        this.currentMediaSession = null;
+        // @type {Number} volume
+        this.currentVolume = 0.5;
+        // @type {Boolean} A flag for autoplay after load
+        this.autoplay = true;
+        // @type {string} a chrome.cast.Session object
+        this.session = null;
+        // @type {PLAYER_STATE} A state for Cast media player
+        this.castPlayerState = PLAYER_STATE.IDLE;
+
+        /* Local player variables */
+        // @type {PLAYER_STATE} A state for local media player
+        this.localPlayerState = PLAYER_STATE.IDLE;
+        // @type {HTMLElement} local player
+        this.localPlayer = null;
+        // @type {Boolean} Fullscreen mode on/off
+        this.fullscreen = false;
+
+        /* Current media variables */
+        // @type {Boolean} Audio on and off
+        this.audio = true;
+        // @type {Number} A number for current media index
+        this.currentMediaIndex = 0;
+        // @type {Number} A number for current media time
+        this.currentMediaTime = 0;
+        // @type {Number} A number for current media duration
+        this.currentMediaDuration = -1;
+        // @type {Timer} A timer for tracking progress of media
+        this.timer = null;
+        // @type {Boolean} A boolean to stop timer update of progress when triggered by media status event 
+        this.progressFlag = true;
+        // @type {Number} A number in milliseconds for minimal progress update
+        this.timerStep = 1000;
+
+        /* media contents from JSON */
+        this.mediaContents = null;
+
+        this.initializeCastPlayer();
+    };
+
+    /**
+     * Initialize Cast media player 
+     * Initializes the API. Note that either successCallback and errorCallback will be
+     * invoked once the API has finished initialization. The sessionListener and 
+     * receiverListener may be invoked at any time afterwards, and possibly more than once. 
+     */
+    CastPlayer.prototype.initializeCastPlayer = function () {
+
+        if (!chrome.cast || !chrome.cast.isAvailable) {
+            return;
+        }
+
+        var applicationID = 'AE4DA10A';
+
+        // request session
+        var sessionRequest = new chrome.cast.SessionRequest(applicationID);
+        var apiConfig = new chrome.cast.ApiConfig(sessionRequest,
+          this.sessionListener.bind(this),
+          this.receiverListener.bind(this));
+
+        chrome.cast.initialize(apiConfig, this.onInitSuccess.bind(this), this.onError.bind(this));
+    };
+
+    /**
+     * Callback function for init success 
+     */
+    CastPlayer.prototype.onInitSuccess = function () {
+        console.log("init success");
+        this.updateMediaControlUI();
+    };
+
+    /**
+     * Generic error callback function 
+     */
+    CastPlayer.prototype.onError = function () {
+        console.log("error");
+    };
+
+    /**
+     * @param {!Object} e A new session
+     * This handles auto-join when a page is reloaded
+     * When active session is detected, playback will automatically
+     * join existing session and occur in Cast mode and media
+     * status gets synced up with current media of the session 
+     */
+    CastPlayer.prototype.sessionListener = function(e) {
+        this.session = e;
+        if (this.session) {
+            this.deviceState = DEVICE_STATE.ACTIVE;
+            if (this.session.media[0]) {
+                this.onMediaDiscovered('activeSession', this.session.media[0]);
+            } else {
+                this.loadMedia(this.currentMediaIndex);
+            }
+        }
+    };
+
+    /**
+     * @param {string} e Receiver availability
+     * This indicates availability of receivers but
+     * does not provide a list of device IDs
+     */
+    CastPlayer.prototype.receiverListener = function (e) {
+        if (e === 'available') {
+            console.log("receiver found");
+        }
+        else {
+            console.log("receiver list empty");
+        }
+    };
+
+    /**
+     * Requests that a receiver application session be created or joined. By default, the SessionRequest
+     * passed to the API at initialization time is used; this may be overridden by passing a different
+     * session request in opt_sessionRequest. 
+     */
+    CastPlayer.prototype.launchApp = function () {
+        console.log("launching app...");
+        chrome.cast.requestSession(this.onRequestSessionSuccess.bind(this), this.onLaunchError.bind(this));
+        if (this.timer) {
+            clearInterval(this.timer);
+        }
+    };
+
+    /**
+     * Callback function for request session success 
+     * @param {Object} e A chrome.cast.Session object
+     */
+    CastPlayer.prototype.onRequestSessionSuccess = function (e) {
+        console.log("session success: " + e.sessionId);
+        this.session = e;
+        this.deviceState = DEVICE_STATE.ACTIVE;
+        this.updateMediaControlUI();
+        this.loadMedia(this.currentMediaIndex);
+    };
+
+    /**
+     * Callback function for launch error
+     */
+    CastPlayer.prototype.onLaunchError = function () {
+        console.log("launch error");
+        this.deviceState = DEVICE_STATE.ERROR;
+    };
+
+    /**
+     * Stops the running receiver application associated with the session.
+     */
+    CastPlayer.prototype.stopApp = function () {
+        this.session.stop(this.onStopAppSuccess.bind(this, 'Session stopped'),
+            this.onError.bind(this));
+
+    };
+
+    /**
+     * Callback function for stop app success 
+     */
+    CastPlayer.prototype.onStopAppSuccess = function (message) {
+        console.log(message);
+        this.deviceState = DEVICE_STATE.IDLE;
+        this.castPlayerState = PLAYER_STATE.IDLE;
+        this.currentMediaSession = null;
+        clearInterval(this.timer);
+        this.updateDisplayMessage();
+
+        // continue to play media locally
+        console.log("current time: " + this.currentMediaTime);
+        this.playMediaLocally(this.currentMediaTime);
+        this.updateMediaControlUI();
+    };
+
+    /**
+     * Loads media into a running receiver application
+     * @param {Number} mediaIndex An index number to indicate current media content
+     */
+    CastPlayer.prototype.loadMedia = function (mediaIndex) {
+        //if (!this.session) {
+        //    console.log("no session");
+        //    return;
+        //}
+        //console.log("loading..." + this.mediaContents[mediaIndex]['title']);
+        //var mediaInfo = new chrome.cast.media.MediaInfo(this.mediaContents[mediaIndex]['sources'][0]);
+        //mediaInfo.contentType = 'video/mp4';
+        //var request = new chrome.cast.media.LoadRequest(mediaInfo);
+        //request.autoplay = this.autoplay;
+        //if (this.localPlayerState == PLAYER_STATE.PLAYING) {
+        //    request.currentTime = this.localPlayer.currentTime;
+        //}
+        //else {
+        //    request.currentTime = 0;
+        //}
+        //var payload = {
+        //    "title:": this.mediaContents[0]['title'],
+        //    "thumb": this.mediaContents[0]['thumb']
+        //};
+
+        //var json = {
+        //    "payload": payload
+        //};
+
+        //request.customData = json;
+
+        //this.castPlayerState = PLAYER_STATE.LOADING;
+        //this.session.loadMedia(request,
+        //  this.onMediaDiscovered.bind(this, 'loadMedia'),
+        //  this.onLoadMediaError.bind(this));
+
+        //document.getElementById("media_title").innerHTML = this.mediaContents[this.currentMediaIndex]['title'];
+        //document.getElementById("media_subtitle").innerHTML = this.mediaContents[this.currentMediaIndex]['subtitle'];
+        //document.getElementById("media_desc").innerHTML = this.mediaContents[this.currentMediaIndex]['description'];
+
+    };
+
+    /**
+     * Callback function for loadMedia success
+     * @param {Object} mediaSession A new media object.
+     */
+    CastPlayer.prototype.onMediaDiscovered = function (how, mediaSession) {
+        //console.log("new media session ID:" + mediaSession.mediaSessionId + ' (' + how + ')');
+        //this.currentMediaSession = mediaSession;
+        //if (how == 'loadMedia') {
+        //    if (this.autoplay) {
+        //        this.castPlayerState = PLAYER_STATE.PLAYING;
+        //    }
+        //    else {
+        //        this.castPlayerState = PLAYER_STATE.LOADED;
+        //    }
+        //}
+
+        //if (how == 'activeSession') {
+        //    this.castPlayerState = this.session.media[0].playerState;
+        //    this.currentMediaTime = this.session.media[0].currentTime;
+        //}
+
+        //if (this.castPlayerState == PLAYER_STATE.PLAYING) {
+        //    // start progress timer
+        //    this.startProgressTimer(this.incrementMediaTime);
+        //}
+
+        //this.currentMediaSession.addUpdateListener(this.onMediaStatusUpdate.bind(this));
+
+        //this.currentMediaDuration = this.currentMediaSession.media.duration;
+        //var duration = this.currentMediaDuration;
+        //var hr = parseInt(duration / 3600);
+        //duration -= hr * 3600;
+        //var min = parseInt(duration / 60);
+        //var sec = parseInt(duration % 60);
+        //if (hr > 0) {
+        //    duration = hr + ":" + min + ":" + sec;
+        //}
+        //else {
+        //    if (min > 0) {
+        //        duration = min + ":" + sec;
+        //    }
+        //    else {
+        //        duration = sec;
+        //    }
+        //}
+        //document.getElementById("duration").innerHTML = duration;
+
+        //if (this.localPlayerState == PLAYER_STATE.PLAYING) {
+        //    this.localPlayerState == PLAYER_STATE.STOPPED;
+        //    var vi = document.getElementById('video_image')
+        //    vi.style.display = 'block';
+        //    this.localPlayer.style.display = 'none';
+        //    // start progress timer
+        //    this.startProgressTimer(this.incrementMediaTime);
+        //}
+        //// update UIs
+        //this.updateMediaControlUI();
+        //this.updateDisplayMessage();
+    };
+
+    window.CastPlayer = CastPlayer;
+
+    $(function() {
+
+        var castPlayer = new CastPlayer();
+
+    });
+
+})(window, window.chrome, console);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/edititempeople.js b/dashboard-ui/scripts/edititempeople.js
index f9f85c4125..b88a6622e4 100644
--- a/dashboard-ui/scripts/edititempeople.js
+++ b/dashboard-ui/scripts/edititempeople.js
@@ -209,7 +209,7 @@
             html += '</select>';
 
             html += '<p>';
-            html += '<button type="submit" data-theme="b" data-icon="ok">OK</button>';
+            html += '<button type="submit" data-theme="b" data-icon="check">OK</button>';
             html += '<button type="button" data-icon="delete" onclick="$(this).parents(\'.popup\').popup(\'close\');">Cancel</button>';
             html += '</p>';
             html += '</form>';
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index e8ed65f3b7..e2936cb895 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -136,7 +136,7 @@
                 html += getCollapsibleHtml('TV', [
 
                     { text: 'Suggested', href: 'tvrecommended.html' },
-                    { text: 'Next Up', href: 'tvnextup.html' },
+                    { text: 'Latest', href: 'tvlatest.html' },
                     { text: 'Upcoming', href: 'tvupcoming.html' },
                     { text: 'Shows', href: 'tvshows.html' },
                     { text: 'Episodes', href: 'episodes.html' },
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 3ff7fbc749..6530bd78ad 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -43,7 +43,7 @@ var Dashboard = {
 
         //$.mobile.popup.prototype.options.theme = "c";
         //$.mobile.popup.prototype.options.transition = "none";
-        //$.mobile.defaultPageTransition = "none";
+        $.mobile.defaultPageTransition = "none";
         //$.mobile.collapsible.prototype.options.contentTheme = "a";
     },
 
diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js
new file mode 100644
index 0000000000..68f0b34e4d
--- /dev/null
+++ b/dashboard-ui/scripts/tvlatest.js
@@ -0,0 +1,38 @@
+(function ($, document) {
+
+    $(document).on('pagebeforeshow', "#tvNextUpPage", function () {
+
+        var screenWidth = $(window).width();
+
+        var page = this;
+
+        var options = {
+
+            SortBy: "DateCreated",
+            SortOrder: "Descending",
+            IncludeItemTypes: "Episode",
+            Limit: screenWidth >= 1920 ? 24 : (screenWidth >= 1440 ? 16 : 15),
+            Recursive: true,
+            Fields: "PrimaryImageAspectRatio,SeriesInfo,UserData",
+            Filters: "IsUnplayed",
+            ExcludeLocationTypes: "Virtual"
+        };
+
+        ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
+
+            $('#latestEpisodes', page).html(LibraryBrowser.getPosterViewHtml({
+                items: result.Items,
+                useAverageAspectRatio: true,
+                shape: "backdrop",
+                showTitle: true,
+                showParentTitle: true,
+                overlayText: true
+
+            })).createPosterItemHoverMenu();
+
+        });
+
+    });
+
+
+})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/tvnextup.js b/dashboard-ui/scripts/tvnextup.js
deleted file mode 100644
index 622c46a965..0000000000
--- a/dashboard-ui/scripts/tvnextup.js
+++ /dev/null
@@ -1,48 +0,0 @@
-(function ($, document) {
-
-    $(document).on('pagebeforeshow', "#tvNextUpPage", function () {
-
-        var screenWidth = $(window).width();
-
-        var page = this;
-
-        var options = {
-
-            Limit: screenWidth >= 1920 ? 25 : 24,
-            Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated",
-            UserId: Dashboard.getCurrentUserId(),
-            ExcludeLocationTypes: "Virtual"
-        };
-
-        ApiClient.getNextUpEpisodes(options).done(function (result) {
-
-            if (result.Items.length) {
-                $('#resumableSection', page).show();
-            } else {
-                $('#resumableSection', page).hide();
-            }
-
-            if (result.Items.length) {
-
-                $('#nextUpItems', page).html(LibraryBrowser.getPosterViewHtml({
-                    items: result.Items,
-                    useAverageAspectRatio: true,
-                    shape: "backdrop",
-                    showTitle: true,
-                    showParentTitle: true,
-                    overlayText: true
-
-                })).createPosterItemHoverMenu();
-
-            } else {
-
-                $('#nextUpItems', page).html('<br/><p style="text-align:center;">None found. Start watching your shows!</p>');
-
-            }
-
-        });
-
-    });
-
-
-})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js
index 1d97193413..d31b11a908 100644
--- a/dashboard-ui/scripts/tvrecommended.js
+++ b/dashboard-ui/scripts/tvrecommended.js
@@ -1,39 +1,11 @@
 (function ($, document) {
 
-    $(document).on('pagebeforeshow', "#tvRecommendedPage", function () {
+    function loadResume(page) {
 
         var screenWidth = $(window).width();
 
-        var page = this;
-
         var options = {
 
-            SortBy: "DateCreated",
-            SortOrder: "Descending",
-            IncludeItemTypes: "Episode",
-            Limit: screenWidth >= 1920 ? 20 : (screenWidth >= 1440 ? 16 : 15),
-            Recursive: true,
-            Fields: "PrimaryImageAspectRatio,SeriesInfo,UserData",
-            Filters: "IsUnplayed",
-            ExcludeLocationTypes: "Virtual"
-        };
-
-        ApiClient.getItems(Dashboard.getCurrentUserId(), options).done(function (result) {
-
-            $('#recentlyAddedItems', page).html(LibraryBrowser.getPosterViewHtml({
-                items: result.Items,
-                useAverageAspectRatio: true,
-                shape: "backdrop",
-                showTitle: true,
-                showParentTitle: true,
-                overlayText: true
-                
-            })).createPosterItemHoverMenu();
-
-        });
-
-        options = {
-
             SortBy: "DatePlayed",
             SortOrder: "Descending",
             IncludeItemTypes: "Episode",
@@ -59,11 +31,57 @@
                 showTitle: true,
                 showParentTitle: true,
                 overlayText: true
-                
+
             })).createPosterItemHoverMenu();
 
         });
+    }
 
+    function loadNextUp(page) {
+
+        var options = {
+
+            Limit: 24,
+            Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated",
+            UserId: Dashboard.getCurrentUserId(),
+            ExcludeLocationTypes: "Virtual"
+        };
+
+        ApiClient.getNextUpEpisodes(options).done(function (result) {
+
+            if (result.Items.length) {
+                $('#resumableSection', page).show();
+            } else {
+                $('#resumableSection', page).hide();
+            }
+
+            if (result.Items.length) {
+
+                $('#nextUpItems', page).html(LibraryBrowser.getPosterViewHtml({
+                    items: result.Items,
+                    useAverageAspectRatio: true,
+                    shape: "backdrop",
+                    showTitle: true,
+                    showParentTitle: true,
+                    overlayText: true
+
+                })).createPosterItemHoverMenu();
+
+            } else {
+
+                $('#nextUpItems', page).html('<br/><p>None found. Start watching your shows!</p>');
+
+            }
+
+        });
+    }
+
+    $(document).on('pagebeforeshow', "#tvRecommendedPage", function () {
+
+        var page = this;
+
+        loadResume(page);
+        loadNextUp(page);
     });
 
 
diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html
index 073d657672..bcb0f0c5bc 100644
--- a/dashboard-ui/tvgenres.html
+++ b/dashboard-ui/tvgenres.html
@@ -7,7 +7,7 @@
     <div id="tvGenresPage" data-role="page" class="page libraryPage" data-theme="b" data-view="tv">
         <div class="libraryViewNav">
             <a href="tvrecommended.html">Suggested</a>
-            <a href="tvnextup.html">Next up</a>
+            <a href="tvlatest.html">Latest</a>
             <a href="tvupcoming.html">Upcoming</a>
             <a href="tvshows.html">Shows</a>
             <a href="episodes.html">Episodes</a>
diff --git a/dashboard-ui/tvnextup.html b/dashboard-ui/tvlatest.html
similarity index 81%
rename from dashboard-ui/tvnextup.html
rename to dashboard-ui/tvlatest.html
index 0ab5221aaa..5026af7e37 100644
--- a/dashboard-ui/tvnextup.html
+++ b/dashboard-ui/tvlatest.html
@@ -7,7 +7,7 @@
     <div id="tvNextUpPage" data-role="page" class="page libraryPage" data-theme="b" data-view="tv">
         <div class="libraryViewNav">
             <a href="tvrecommended.html">Suggested</a>
-            <a href="tvnextup.html" class="ui-btn-active">Next up</a>
+            <a href="tvlatest.html" class="ui-btn-active">Latest</a>
             <a href="tvupcoming.html">Upcoming</a>
             <a href="tvshows.html">Shows</a>
             <a href="episodes.html">Episodes</a>
@@ -17,8 +17,8 @@
         </div>
         <div data-role="content">
             <div class="ehsContent">
-                <h1 class="listHeader">Next Up</h1>
-                <div id="nextUpItems">
+                <h1 class="listHeader">Latest Episodes</h1>
+                <div id="latestEpisodes">
                 </div>
             </div>
         </div>
diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html
index 624084aef0..6a4ee7740d 100644
--- a/dashboard-ui/tvpeople.html
+++ b/dashboard-ui/tvpeople.html
@@ -7,7 +7,7 @@
     <div id="tvPeoplePage" data-role="page" class="page libraryPage" data-theme="b" data-view="tv">
         <div class="libraryViewNav">
             <a href="tvrecommended.html">Suggested</a>
-            <a href="tvnextup.html">Next up</a>
+            <a href="tvlatest.html">Latest</a>
             <a href="tvupcoming.html">Upcoming</a>
             <a href="tvshows.html">Shows</a>
             <a href="episodes.html">Episodes</a>
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index 1a0cd2aa9e..bd73e29aa4 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -7,7 +7,7 @@
     <div id="tvRecommendedPage" data-role="page" class="page libraryPage" data-theme="b" data-view="tv">
         <div class="libraryViewNav">
             <a href="tvrecommended.html" class="ui-btn-active">Suggested</a>
-            <a href="tvnextup.html">Next up</a>
+            <a href="tvlatest.html">Latest</a>
             <a href="tvupcoming.html">Upcoming</a>
             <a href="tvshows.html">Shows</a>
             <a href="episodes.html">Episodes</a>
@@ -27,9 +27,9 @@
                             </div>
                         </div>
 
-                        <h1 class="listHeader">Latest Episodes</h1>
+                        <h1 class="listHeader">Next Up</h1>
 
-                        <div id="recentlyAddedItems">
+                        <div id="nextUpItems">
                         </div>
                     </td>
                 </tr>
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html
index 6ec4e6e639..6bcdb4459b 100644
--- a/dashboard-ui/tvshows.html
+++ b/dashboard-ui/tvshows.html
@@ -7,7 +7,7 @@
     <div id="tvShowsPage" data-role="page" class="page libraryPage" data-theme="b" data-view="tv">
         <div class="libraryViewNav">
             <a href="tvrecommended.html">Suggested</a>
-            <a href="tvnextup.html">Next up</a>
+            <a href="tvlatest.html">Latest</a>
             <a href="tvupcoming.html">Upcoming</a>
             <a href="tvshows.html" class="ui-btn-active">Shows</a>
             <a href="episodes.html">Episodes</a>
diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html
index 0c43572618..25bc220462 100644
--- a/dashboard-ui/tvstudios.html
+++ b/dashboard-ui/tvstudios.html
@@ -7,7 +7,7 @@
     <div id="tvStudiosPage" data-role="page" class="page libraryPage" data-theme="b" data-view="tv">
         <div class="libraryViewNav">
             <a href="tvrecommended.html">Suggested</a>
-            <a href="tvnextup.html">Next up</a>
+            <a href="tvlatest.html">Latest</a>
             <a href="tvupcoming.html">Upcoming</a>
             <a href="tvshows.html">Shows</a>
             <a href="episodes.html">Episodes</a>
diff --git a/dashboard-ui/tvupcoming.html b/dashboard-ui/tvupcoming.html
index 02f6ddad08..394c5e0c9a 100644
--- a/dashboard-ui/tvupcoming.html
+++ b/dashboard-ui/tvupcoming.html
@@ -7,7 +7,7 @@
     <div id="tvUpcomingPage" data-role="page" class="page libraryPage" data-theme="b" data-view="tv">
         <div class="libraryViewNav">
             <a href="tvrecommended.html">Suggested</a>
-            <a href="tvnextup.html">Next up</a>
+            <a href="tvlatest.html">Latest</a>
             <a href="tvupcoming.html" class="ui-btn-active">Upcoming</a>
             <a href="tvshows.html">Shows</a>
             <a href="episodes.html">Episodes</a>