added tv service provider selection

dashboard-ui/css/librarybrowser.css

@@ -436,7 +436,7 @@ a.itemTag:hover {
 }
 
 .itemDetailImage {
-    max-height: 240px;
+    max-height: 220px;
     max-width: 320px;
     -moz-box-shadow: 0px 0 20px #000;
     -webkit-box-shadow: 0px 0 20px #000;
@@ -751,7 +751,7 @@ a.itemTag:hover {
     }
 
     .detailPageContent {
-        max-width: 900px;
+        max-width: 850px;
     }
 
     .primaryDetailPageContent {
@@ -765,10 +765,6 @@ a.itemTag:hover {
         max-width: 950px;
     }
 
-    .detailPageContent {
-        max-width: 1000px;
-    }
-
     .primaryDetailPageContent {
         max-width: 850px;
     }

dashboard-ui/css/posteritem.css

@@ -32,7 +32,7 @@
 }
 
 .posterItemOverlayInner {
-    padding: 15px 13px 10px;
+    padding: 13px 13px 10px;
 }
 
 .smallBackdropPosterItem, .smallPosterItem {
@@ -264,6 +264,18 @@
         }
 }
 
+@media all and (min-width: 1000px) {
+
+
+    .smallBackdropPosterItem {
+        width: 202px;
+    }
+
+        .smallBackdropPosterItem .posterItemImage {
+            height: 113.625px;
+        }
+}
+
 @media all and (min-width: 1200px) {
 
     .backdropPosterItem {
@@ -282,14 +294,6 @@
             height: 207px;
         }
 
-    .smallBackdropPosterItem {
-        width: 228px;
-    }
-
-        .smallBackdropPosterItem .posterItemImage {
-            height: 128.25px;
-        }
-
     .storeReviewCount {
         display: inline;
     }

dashboard-ui/css/tileitem.css

@@ -245,10 +245,6 @@
         .squareTileItem .tileImage {
             height: 130px;
         }
-
-    .smallPosterTileItem {
-        width: 22%;
-    }
 }
 
 @media all and (min-width: 1440px) {

dashboard-ui/itembynamedetails.html

@@ -146,7 +146,7 @@
                 <button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button>
             </span>
             <span>
-                <button id="btnRemote" type="button" data-icon="remote" data-inline="true" data-mini="true">Remote</button>
+                <button id="btnRemote" type="button" data-icon="wireless" data-inline="true" data-mini="true">Play On</button>
             </span>
             <span id="editButtonContainer" style="display: none;">
                 <a id="btnEdit" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">Edit</a>

dashboard-ui/itemdetails.html

@@ -148,7 +148,7 @@
                 <a id="btnPlayExternal" data-role="button" data-icon="play" data-inline="true" data-mini="true" href="#" target="_blank">Play</a>
             </span>
             <span>
-                <button id="btnRemote" type="button" data-icon="remote" data-inline="true" data-mini="true">Remote</button>
+                <button id="btnRemote" type="button" data-icon="wireless" data-inline="true" data-mini="true">Play On</button>
             </span>
             <span id="editButtonContainer" style="display: none;">
                 <a id="btnEdit" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">Edit</a>

dashboard-ui/livetvchannel.html

@@ -31,7 +31,7 @@
                 <button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button>
             </span>
             <span>
-                <button id="btnRemote" type="button" data-icon="remote" data-inline="true" data-mini="true">Remote</button>
+                <button id="btnRemote" type="button" data-icon="wireless" data-inline="true" data-mini="true">Play On</button>
             </span>
             <span id="editButtonContainer" style="display: none;">
                 <button id="btnEdit" type="button" data-icon="edit" data-inline="true" data-mini="true">Edit</button>

dashboard-ui/livetvprogram.html

@@ -48,7 +48,7 @@
                 <button id="btnRecord" type="button" data-icon="video" data-inline="true" data-mini="true">Record</button>
             </span>
             <span>
-                <button id="btnRemote" type="button" data-icon="remote" data-inline="true" data-mini="true">Remote</button>
+                <button id="btnRemote" type="button" data-icon="wireless" data-inline="true" data-mini="true">Play On</button>
             </span>
         </div>
         <div data-role="content">

dashboard-ui/livetvrecording.html

@@ -42,7 +42,7 @@
                 <button id="btnPlay" type="button" data-icon="play" data-inline="true" data-mini="true">Play</button>
             </span>
             <span>
-                <button id="btnRemote" type="button" data-icon="remote" data-inline="true" data-mini="true">Remote</button>
+                <button id="btnRemote" type="button" data-icon="wireless" data-inline="true" data-mini="true">Play On</button>
             </span>
             <span id="deleteButtonContainer" style="display: none;">
                 <button id="btnDelete" type="button" data-icon="delete" data-inline="true" data-mini="true">Delete</button>

dashboard-ui/livetvsettings.html

@@ -10,10 +10,23 @@
             <div class="content-primary">
                 <form class="liveTvSettingsForm" style="display: none;">
 
+                    <br />
+                    <div>
+                        <p>Current active service: <span id="activeServiceName"></span></p>
+                        <p>Status: <span id="activeServiceStatus"></span></p>
+                    </div>
+                    <br />
                     <ul data-role="listview" class="ulForm">
+                        <li>
+                            <label for="selectActiveService">Active service: </label>
+                            <select id="selectActiveService" data-mini="true">
+                            </select>
+                            <div class="fieldDescription">Although multiple tv plugins can be installed only one can be active at a time.</div>
+                        </li>
+
                         <li>
                             <label for="selectGuideDays">Number of days of guide data to download: </label>
-                            <select id="selectGuideDays">
+                            <select id="selectGuideDays" data-mini="true">
                                 <option value="">Auto</option>
                                 <option value="1">1</option>
                                 <option value="2">2</option>

dashboard-ui/scripts/itemdetailpage.js

@@ -211,7 +211,7 @@
             $('#castCollapsible', page).hide();
         } else {
             $('#castCollapsible', page).show();
-            renderCast(page, item, context, 8);
+            renderCast(page, item, context, 6);
         }
 
         if (!item.PartCount || item.PartCount < 2) {

dashboard-ui/scripts/librarybrowser.js

@@ -1810,7 +1810,7 @@
 
             var url;
 
-            var imageHeight = 510;
+            var imageHeight = 440;
 
             if (imageTags.Primary) {
 
@@ -2439,197 +2439,6 @@
 
 })(window, document, jQuery, screen, localStorage);
 
-(function ($, document, window) {
-
-    var showOverlayTimeout;
-    var hideOverlayTimeout;
-    var currentPosterItem;
-
-    function onOverlayMouseOver() {
-
-        if (hideOverlayTimeout) {
-            clearTimeout(hideOverlayTimeout);
-            hideOverlayTimeout = null;
-        }
-    }
-
-    function onOverlayMouseOut() {
-
-        startHideOverlayTimer();
-    }
-
-    function getOverlayHtml(item) {
-
-        var html = '';
-
-        html += '<div class="itemOverlayContent">';
-
-        html += '<p class="itemMiscInfo">';
-        html += LibraryBrowser.getMiscInfoHtml(item);
-        html += '</p>';
-
-        html += '<p style="margin: 1.25em 0;">';
-        html += '<span class="itemCommunityRating">';
-        html += LibraryBrowser.getRatingHtml(item);
-        html += '</span>';
-        html += '</p>';
-
-        html += '<p style="margin: 1.25em 0;">';
-        html += '<span class="userDataIcons">';
-        html += LibraryBrowser.getUserDataIconsHtml(item);
-        html += '</span>';
-        html += '</p>';
-
-        html += '<p class="itemOverlayHtml">';
-        html += (item.OverviewHtml || item.Overview || '');
-        html += '</p>';
-
-        html += '<p>';
-
-        html += '<button type="button" data-mini="true" data-inline="true" data-icon="play" data-iconpos="notext">Play</button>';
-        html += '<button type="button" data-mini="true" data-inline="true" data-icon="video" data-iconpos="notext">Play</button>';
-        html += '<button type="button" data-mini="true" data-inline="true" data-icon="remote" data-iconpos="notext">Play</button>';
-        html += '<button type="button" data-mini="true" data-inline="true" data-icon="edit" data-iconpos="notext">Play</button>';
-
-        html += '</p>';
-
-        html += '</div>';
-
-        return html;
-    }
-
-    function showOverlay(elem, item) {
-
-        $('.itemFlyout').popup('close').remove();
-
-        var html = '<div data-role="popup" class="itemFlyout" data-theme="b" data-arrow="true" data-history="false">';
-
-        html += '<div class="ui-bar-b" style="text-align:center;">';
-        html += '<h3 style="margin: .5em 0;padding:0 1em;font-weight:normal;">' + LibraryBrowser.getPosterViewDisplayName(item, true) + '</h3>';
-        html += '</div>';
-
-        html += '<div style="padding: .8em 1em;">';
-        html += getOverlayHtml(item);
-        html += '</div>';
-
-        html += '</div>';
-
-        $('.itemFlyout').popup('close').popup('destroy').remove();
-
-        $(document.body).append(html);
-
-        var popup = $('.itemFlyout').on('mouseenter', onOverlayMouseOver).on('mouseleave', onOverlayMouseOut).popup({
-
-            positionTo: $('.posterItemOverlayTarget', elem)
-
-        }).trigger('create').popup("open").on("popupafterclose", function () {
-
-            $(this).off("popupafterclose").off("mouseenter").off("mouseleave").remove();
-        });
-
-        popup.parents().prev('.ui-popup-screen').remove();
-        currentPosterItem = elem;
-    }
-
-    function onPosterItemClicked() {
-
-        if (showOverlayTimeout) {
-            clearTimeout(showOverlayTimeout);
-            showOverlayTimeout = null;
-        }
-
-        if (hideOverlayTimeout) {
-            clearTimeout(hideOverlayTimeout);
-            hideOverlayTimeout = null;
-        }
-
-        hideOverlay();
-    }
-
-    function hideOverlay() {
-
-        $('.itemFlyout').popup('close').remove();
-
-        if (currentPosterItem) {
-
-            $(currentPosterItem).off('click.overlay');
-            currentPosterItem = null;
-        }
-    }
-
-    function startHideOverlayTimer() {
-
-        if (hideOverlayTimeout) {
-            clearTimeout(hideOverlayTimeout);
-            hideOverlayTimeout = null;
-        }
-
-        hideOverlayTimeout = setTimeout(hideOverlay, 400);
-    }
-
-    function onHoverOut() {
-
-        if (showOverlayTimeout) {
-            clearTimeout(showOverlayTimeout);
-            showOverlayTimeout = null;
-        }
-
-        startHideOverlayTimer();
-    }
-
-    $.fn.createPosterItemHoverMenu = function () {
-
-        function onShowTimerExpired(elem) {
-
-            var id = elem.getAttribute('data-itemid');
-
-            ApiClient.getItem(Dashboard.getCurrentUserId(), id).done(function (item) {
-
-                showOverlay(elem, item);
-
-            });
-        }
-
-        function onHoverIn() {
-
-            if (showOverlayTimeout) {
-                clearTimeout(showOverlayTimeout);
-                showOverlayTimeout = null;
-            }
-
-            if (hideOverlayTimeout) {
-                clearTimeout(hideOverlayTimeout);
-                hideOverlayTimeout = null;
-            }
-
-            var elem = this;
-
-            if (currentPosterItem && currentPosterItem == elem) {
-                return;
-            }
-
-            showOverlayTimeout = setTimeout(function () {
-
-                onShowTimerExpired(elem);
-
-            }, 300);
-        }
-
-        // https://hacks.mozilla.org/2013/04/detecting-touch-its-the-why-not-the-how/
-
-        if (('ontouchstart' in window) || (navigator.maxTouchPoints > 0) || (navigator.msMaxTouchPoints > 0)) {
-            /* browser with either Touch Events of Pointer Events
-               running on touch-capable device */
-            return this;
-        }
-
-        return this.on('mouseenter', '.posterItem', onHoverIn)
-            .on('mouseleave', '.posterItem', onHoverOut)
-            .on('click', '.posterItem', onPosterItemClicked);
-    };
-
-})(jQuery, document, window);
-
 (function ($, document, window) {
 
     var showOverlayTimeout;
@@ -2673,7 +2482,7 @@
         var name = LibraryBrowser.getPosterViewDisplayName(item, true);
 
         html += '<div style="font-weight:bold;margin-bottom:1em;">';
-        var logoHeight = isPortrait || isSmallItem ? 20 : 22;
+        var logoHeight = isSmallItem ? 20 : 24;
         var maxLogoWidth = isPortrait ? 100 : 200;
         var imgUrl;
 
@@ -2711,7 +2520,7 @@
             html += '</p>';
         }
 
-        html += '<p style="margin:.75em 0;">';
+        html += '<p style="margin:1.25em 0;">';
         html += '<span class="itemCommunityRating">';
         html += LibraryBrowser.getRatingHtml(item, false);
         html += '</span>';
@@ -2753,7 +2562,7 @@
         }
 
         if (!isPortrait || buttonCount < 3) {
-            html += '<button type="button" data-mini="true" data-inline="true" data-icon="wireless" data-iconpos="notext" title="Send to Device" class="btnRemoteControl" data-itemid="' + item.Id + '" style="' + buttonMargin + '">Send to Device</button>';
+            html += '<button type="button" data-mini="true" data-inline="true" data-icon="wireless" data-iconpos="notext" title="Play On" class="btnRemoteControl" data-itemid="' + item.Id + '" style="' + buttonMargin + '">Play On</button>';
         }
 
         html += '</div>';
@@ -2830,7 +2639,7 @@
 
                 onShowTimerExpired(elem);
 
-            }, 800);
+            }, 1000);
         }
 
         // https://hacks.mozilla.org/2013/04/detecting-touch-its-the-why-not-the-how/

dashboard-ui/scripts/livetvsettings.js

@@ -14,6 +14,30 @@
 
         $('#selectGuideDays', page).val(config.LiveTvOptions.GuideDays || '').selectmenu('refresh');
 
+        var serviceOptions = liveTvInfo.Services.map(function (s) {
+            return '<option value="' + s.Name + '">' + s.Name + '</option>';
+        });
+
+        $('#selectActiveService', page).html(serviceOptions).selectmenu('refresh');
+
+        var service = liveTvInfo.Services.filter(function (s) {
+            return s.Name == liveTvInfo.ActiveServiceName;
+        })[0];
+
+        $('#activeServiceName', page).html(liveTvInfo.ActiveServiceName);
+
+
+        var status = service.Status;
+
+        if (status != 'Ok') {
+
+            if (service.StatusMessage) {
+                status += ' (' + service.StatusMessage + ')';
+            }
+            status = '<span style="color:red;">' + status + '</span>';
+        }
+        $('#activeServiceStatus', page).html(status);
+
         Dashboard.hideLoadingMsg();
     }
 
@@ -37,7 +61,7 @@
 
     window.LiveTvSettingsPage = {
 
-        onSubmit: function() {
+        onSubmit: function () {
 
             Dashboard.showLoadingMsg();
 

dashboard-ui/scripts/remotecontrol.js

@@ -69,7 +69,7 @@
         html += '<a href="#" data-rel="back" data-role="button" data-icon="delete" data-iconpos="notext" class="ui-btn-right" data-theme="b">Close</a>';
 
         html += '<div class="ui-bar-b" style="text-align:center;">';
-        html += '<div style="margin:.5em 0;">Send to Device</div>';
+        html += '<div style="margin:.5em 0;">Play On</div>';
         html += '</div>';
 
         html += '<div style="padding: 1em;">';
@@ -90,7 +90,7 @@
 
         html += '<span id="queueButtonContainer" style="display:none;"><button onclick="$(\'#fldPlayCommand\').val(\'PlayLast\');" type="submit" data-icon="plus" data-mini="true" data-inline="true">Queue</button></span>';
 
-        html += '<span id="browseButtonContainer" style="display:none;"><button onclick="$(\'#fldPlayCommand\').val(\'Browse\');" type="submit" data-icon="eye" data-mini="true" data-inline="true">Browse</button></span>';
+        html += '<span id="browseButtonContainer" style="display:none;"><button onclick="$(\'#fldPlayCommand\').val(\'Browse\');" type="submit" data-icon="eye" data-mini="true" data-inline="true">View on Screen</button></span>';
 
         html += '</p>';
 
@@ -454,10 +454,10 @@
         var html = '';
 
         html += '<div style="margin-top:0;">';
-        html += '<label for="selectCommand">Send:</label>';
+        html += '<label for="selectCommand">Play:</label>';
         html += '<select id="selectCommand" data-mini="true">';
 
-        var mediaLabel = item.MediaType || 'Media';
+        var mediaLabel = item.Type;
         
         html += '<option value="Play" selected>' + mediaLabel + '</label>';
 

dashboard-ui/scripts/site.js

@@ -1360,7 +1360,7 @@ $(function () {
     footerHtml += '<button onclick="MediaPlayer.showChannelsFlyout();" id="channelsButton" class="mediaButton channelsButton" title="TV Channels" type="button" data-icon="tv" data-iconpos="notext" data-inline="true">TV Channels</button>';
     footerHtml += '<div class="mediaFlyoutContainer"><div id="channelsFlyout" style="display:none;" class="mediaPlayerFlyout channelsFlyout"></div></div>';
 
-    footerHtml += '<button onclick="MediaPlayer.showSendMediaMenu();" id="sendMediaButton" class="mediaButton sendMediaButton" title="Send to Device" type="button" data-icon="wireless" data-iconpos="notext" data-inline="true">Send to Device</button>';
+    footerHtml += '<button onclick="MediaPlayer.showSendMediaMenu();" id="sendMediaButton" class="mediaButton sendMediaButton" title="Play On" type="button" data-icon="wireless" data-iconpos="notext" data-inline="true">Play On</button>';
 
     footerHtml += '</div>';
 

dashboard-ui/scripts/supporterpage.js

@@ -19,7 +19,7 @@
             } else {
                 $('.supporterOnly', page).hide();
             }
-            $('#paypalReturnUrl', page).val(ApiClient.getUrl("dashboard/supporterkey.html"));
+            $('#paypalReturnUrl', page).val(ApiClient.getUrl("supporterkey.html"));
             Dashboard.hideLoadingMsg();
         });
     }

dashboard-ui/scripts/wizardimagesettings.js

@@ -11,8 +11,6 @@
             config.ImageSavingConvention = $('#selectImageSavingConvention', page).val();
 
             config.EnableMovieChapterImageExtraction = $('#chkMovies', page).checked();
-            config.EnableEpisodeChapterImageExtraction = $('#chkEpisodes', page).checked();
-            config.EnableOtherVideoChapterImageExtraction = $('#chkOtherVideos', page).checked();
 
             ApiClient.updateServerConfiguration(config).done(function (result) {
 

dashboard-ui/wizardimagesettings.html

@@ -29,19 +29,10 @@
                 </div>
 
                 <div style="margin: 2em 0;">
-                    <label>Extract chapter images for:</label>
+                    <label for="chkMovies">Extract chapter image extraction for Movies</label>
-                    <div data-role="controlgroup">
+                    <input id="chkMovies" name="chkMovies" type="checkbox" checked="checked" />
-                        <input type="checkbox" data-mini="true" id="chkMovies" name="chkMovies" checked="checked" />
-                        <label for="chkMovies">Movies</label>
-
-                        <input type="checkbox" data-mini="true" id="chkEpisodes" name="chkEpisodes" />
-                        <label for="chkEpisodes">Episodes</label>
-
-                        <input type="checkbox" data-mini="true" id="chkOtherVideos" name="chkOtherVideos" />
-                        <label for="chkOtherVideos">Other Videos</label>
                     <div class="fieldDescription">Extracting chapter images will allow clients to display graphical scene selection menus. The process can be slow, cpu-intensive and may require several gigabytes of space. It runs as a nightly scheduled task at 4am, although this is configurable in the scheduled tasks area. It is not recommended to run this task during peak usage hours.</div>
                 </div>
-                </div>
 
                 <div class="wizardNavigation">
                     <button type="button" data-iconpos="left" data-icon="arrow-l" data-inline="true" onclick="history.back();">Previous</button>