updated nuget

2025-03-30 19:56:21 +00:00 · 2014-07-27 18:01:29 -04:00 · 2014-07-27 18:01:29 -04:00 · b89707f7b9
commit b89707f7b9
parent 2384a7e088
14 changed files with 260 additions and 60 deletions
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@ -137,6 +137,10 @@
    height: 100%;
 }

+.coveredCardImage {
+    background-size: cover;
+}
+
 .card-1-1 {
    width: 50%;
 }
--- a/dashboard-ui/css/chromecast.css
+++ b/dashboard-ui/css/chromecast.css
@ -37,9 +37,8 @@
    }
 }

-
@media all and (max-width: 400px) {
    .btnCastImage {
-        width: 28px;
+        width: 26px;
    }
 }
--- a/dashboard-ui/css/images/menu.png
+++ b/dashboard-ui/css/images/menu.png
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@ -678,12 +678,12 @@ a.itemTag:hover {
    }
 }

-@media all and (min-width: 1000px) {
+/*@media all and (min-width: 1000px) {

    .primaryDetailPageContent {
        max-width: 850px;
    }
-}
+}*/

 .detailPageParentLink {
    text-decoration: none;
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@ -52,6 +52,13 @@
        padding-left: 10px;
    }

+.menuArrow {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAbklEQ…yGDxkLaBtENI9kPMk0gaoW0Dyj0aWowFLYNYzWB6MWMAAAq1H3+Mhu2hQAAAAASUVORK5CYII=);
+    height: 24px;
+    width: 24px;
+    display: inline-block;
+}
+
 .headerButtonRight {
    border-width: 0 !important;
    padding: 0 15px;
@ -62,39 +69,70 @@
        border-width: 0 !important;
    }

-.barsMenuButton img {
-    border: 1px solid #444 !important;
-    padding: .5em;
-    background-color: #181818;
-    border-radius: 5px;
-    height: 14px !important;
+.libraryMenuButton, .dashboardMenuButton {
+    padding-left: 10px !important;
+}
+
+.barMenuInner {
+    padding: 7px 10px;
+    border: 1px solid #000;
+    border-radius: 4px;
+    box-shadow: rgba(255, 255, 255, 0.0980392) 0px 1px 0px 0px inset, rgba(255, 255, 255, 0.0745098) 0px 1px 0px 0px;
+    background-color: rgb(14, 14, 14);
+    background-image: linear-gradient(rgb(21, 21, 21), rgb(4, 4, 4));
+    background-repeat: repeat-x;
+    border-bottom-color: rgba(0, 0, 0, 0.247059);
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-bottom-style: solid;
+    border-bottom-width: 1px;
+    border-image-outset: 0px;
+    border-image-repeat: stretch;
+    border-image-slice: 100%;
+    border-image-source: none;
+    border-image-width: 1;
+    border-left-color: rgba(0, 0, 0, 0.0980392);
+    border-left-style: solid;
+    border-left-width: 1px;
+    border-right-color: rgba(0, 0, 0, 0.0980392);
+    border-right-style: solid;
+    border-right-width: 1px;
+    border-top-color: rgba(0, 0, 0, 0.0980392);
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    border-top-style: solid;
+    border-top-width: 1px;
 }

 .barsMenuButton:hover {
-    opacity: 1 !important;
+    opacity: .5 !important;
 }

-.barsMenuButton img:hover {
-    background-color: #38c;
+.icon-bar {
+    display: block;
+    width: 18px;
+    height: 2px;
+    background-color: #f5f5f5;
+    -webkit-border-radius: 1px;
+    -moz-border-radius: 1px;
+    border-radius: 1px;
+    -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+    -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
 }

-@media all and (min-width: 600px) {
-    .barsMenuButton {
-        opacity: .9;
+    .icon-bar + .icon-bar {
+        margin-top: 3px;
    }
-}

 .libraryMenuButtonText {
    color: #fff !important;
    text-decoration: none;
-    font-weight: 400 !important;
+    font-weight: 300 !important;
    font-size: 15px;
    display: inline-block;
    vertical-align: middle;
-    line-height: 51px;
    padding-left: 0 !important;
-    position: relative;
-    top: 2px;
    margin-left: -8px;
    cursor: default;
 }
@ -139,10 +177,6 @@
    opacity: 1;
 }

-.barsMenuButton:hover {
-    opacity: .6;
-}
-
 .headerButtonRight:hover {
    opacity: .5;
 }
@ -276,16 +310,20 @@
    border-bottom: 5px solid transparent;
 }

-    .libraryViewNav a:hover {
+    .libraryViewNav a:not(.ui-btn-active):hover {
        color: #2ad !important;
    }

 .libraryViewNavLinkContent {
    display: inline-block;
-    padding: 2px 15px 2px 17px;
+    padding: 2px 15px 2px 15px;
 }

-.libraryViewNav a+a .libraryViewNavLinkContent {
+.libraryViewNav a + a .libraryViewNavLinkContent {
+    padding-left: 17px;
+}
+
+.libraryViewNav a + a .libraryViewNavLinkContent {
    border-left: 1px solid #333;
    position: relative;
    left: -2px;
--- a/dashboard-ui/css/notifications.css
+++ b/dashboard-ui/css/notifications.css
@ -16,7 +16,7 @@
    -moz-border-radius: 2px;
    -webkit-border-radius: 2px;
    border-radius: 2px;
-    padding: 5px 12px;
+    padding: 4px 12px 5px;
    text-align: center;
    text-decoration: none !important;
    -moz-user-select: none;
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@ -83,14 +83,18 @@ body {
    }

 h1, h1 a {
+    font-weight: 300!important;
+    font-size: 28px;
+}
+
+.libraryPage h1, .libraryPage h1 a {
    font-weight: 100!important;
    font-size: 28px;
-    font-family: Roboto;
 }

 .ui-loader h1 {
    font-family: Roboto;
-    font-weight: bold!important;
+    font-weight: 500!important;
    font-size: 18px;
 }

@ -164,14 +168,6 @@ pre, textarea.pre {
    display: none;
 }

-/*
-    Page / Base styles
-    */
-.page:not(.libraryPage) {
-    background: #f2f2f2;
-    background-attachment: fixed;
-}
-
 /*
    Header
    */
@ -437,7 +433,7 @@ h1 .imageLink {

    .content-primary {
        padding: 80px 0 3em 0;
-        margin: 0 0 0 270px;
+        margin: 0 0 0 260px;
    }

        .content-primary ul:first-child {
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@ -130,9 +130,14 @@
                                <br />
                                <ul data-role="listview" class="ulForm">
                                    <li>
-                                        <label for="txtMaxAllowedBitrate">${LabelMaxBitrate}</label>
+                                        <label for="txtMaxAllowedBitrate">${LabelMaxStreamingBitrate}</label>
                                        <input type="number" id="txtMaxAllowedBitrate" pattern="[0-9]*" min="1" data-mini="true" />
-                                        <div class="fieldDescription">${LabelMaxBitrateHelp}</div>
+                                        <div class="fieldDescription">${LabelMaxStreamingBitrateHelp}</div>
+                                    </li>
+                                    <li>
+                                        <label for="txtMaxStaticBitrate">${LabelMaxStaticBitrate}</label>
+                                        <input type="number" id="txtMaxStaticBitrate" pattern="[0-9]*" min="1" data-mini="true" />
+                                        <div class="fieldDescription">${LabelMaxStaticBitrateHelp}</div>
                                    </li>
                                    <li>
                                        <label for="chkIgnoreTranscodeByteRangeRequests">${OptionIgnoreTranscodeByteRangeRequests}</label>
@ -384,6 +389,22 @@
                            </select>
                        </div>

+                        <div style="margin: 1em 0;">
+                            <label for="selectTranscodingContext">${LabelContext}</label>
+                            <select id="selectTranscodingContext" data-mini="true">
+                                <option value="Streaming">${OptionContextStreaming}</option>
+                                <option value="Static">${OptionContextStatic}</option>
+                            </select>
+                        </div>
+
+                        <div id="fldTranscodingProtocol" style="margin: 1em 0;">
+                            <label for="selectTranscodingProtocol">${LabelProtocol}</label>
+                            <select id="selectTranscodingProtocol" data-mini="true">
+                                <option value="Http">${OptionProtocolHttp}</option>
+                                <option value="Hls">${OptionProtocolHls}</option>
+                            </select>
+                        </div>
+
                        <div style="margin: 1em 0;">
                            <label for="txtTranscodingContainer">${LabelTranscodingContainer}</label>
                            <input type="text" id="txtTranscodingContainer" data-mini="true" required="required" />
--- a/dashboard-ui/scripts/dashboardsync.js
+++ b/dashboard-ui/scripts/dashboardsync.js
@ -10,6 +10,119 @@
        return target ? target.Name : 'Unknown Device';
    }

+    function getSyncJobHtml(job) {
+
+        var html = '';
+
+        html += "<div class='card card-1-1'>";
+
+        html += '<div class="cardBox visualCardBox">';
+        html += '<div class="cardScalable">';
+
+        html += '<div class="cardPadder"></div>';
+
+        html += '<div class="cardContent">';
+
+        var imgUrl;
+
+        if (job.PrimaryImageItemId) {
+            imgUrl = ApiClient.getScaledImageUrl(job.PrimaryImageItemId, {
+                type: "Primary",
+                width: 400,
+                tag: job.PrimaryImageTag
+            });
+        }
+
+        if (imgUrl) {
+            html += '<div class="cardImage coveredCardImage lazy" data-src="' + imgUrl + '">';
+            html += "</div>";
+        }
+
+        if (job.Status == 'Completed') {
+            html += '<div class="playedIndicator"><div class="ui-icon-check ui-btn-icon-notext"></div></div>';
+        }
+        else if (job.Status == 'Queued') {
+            html += '<div class="playedIndicator" style="background-color:#38c;"><div class="ui-icon-clock ui-btn-icon-notext"></div></div>';
+        }
+        else if (job.Status == 'Transcoding' || job.Status == 'Transferring') {
+            html += '<div class="playedIndicator"><div class="ui-icon-refresh ui-btn-icon-notext"></div></div>';
+        }
+        else if (job.Status == 'Cancelled') {
+            html += '<div class="playedIndicator" style="background-color:#FF6A00;"><div class="ui-icon-minus ui-btn-icon-notext"></div></div>';
+        }
+        else if (job.Status == 'TranscodingFailed') {
+            html += '<div class="playedIndicator" style="background-color:#cc0000;"><div class="ui-icon-delete ui-btn-icon-notext"></div></div>';
+        }
+
+        // cardContent
+        html += "</div>";
+
+        // cardScalable
+        html += "</div>";
+
+        html += '<div class="cardFooter">';
+
+        var textLines = [];
+
+        if (job.ParentName) {
+            textLines.push(job.ParentName);
+        }
+
+        textLines.push(job.Name);
+
+        if (job.ItemCount == 1) {
+            textLines.push(job.ItemCount + ' item');
+        } else {
+            textLines.push(job.ItemCount + ' items');
+        }
+
+        if (!job.ParentName) {
+            textLines.push('&nbsp;');
+        }
+
+        for (var i = 0, length = textLines.length; i < length; i++) {
+            html += "<div class='cardText'>";
+            html += textLines[i];
+            html += "</div>";
+        }
+
+        //if (!plugin.isExternal) {
+        //    html += "<div class='cardText packageReviewText'>";
+        //    html += plugin.price > 0 ? "$" + plugin.price.toFixed(2) : Globalize.translate('LabelFree');
+        //    html += RatingHelpers.getStoreRatingHtml(plugin.avgRating, plugin.id, plugin.name);
+
+        //    html += "<span class='storeReviewCount'>";
+        //    html += " " + Globalize.translate('LabelNumberReviews').replace("{0}", plugin.totalRatings);
+        //    html += "</span>";
+
+        //    html += "</div>";
+        //}
+
+        //var installedPlugin = plugin.isApp ? null : installedPlugins.filter(function (ip) {
+        //    return ip.Name == plugin.name;
+        //})[0];
+
+        //html += "<div class='cardText'>";
+
+        //if (installedPlugin) {
+        //    html += Globalize.translate('LabelVersionInstalled').replace("{0}", installedPlugin.Version);
+        //} else {
+        //    html += '&nbsp;';
+        //}
+        //html += "</div>";
+
+        // cardFooter
+        html += "</div>";
+
+        // cardBox
+        html += "</div>";
+
+        // card
+        html += "</div>";
+
+        return html;
+    }
+
    function loadData(page, jobs, targets) {

        var html = '';
@ -25,6 +138,8 @@

                lastTargetName = targetName;
            }
+
+            html += getSyncJobHtml(job);
        }

        $('.syncActivity', page).html(html).trigger('create');
--- a/dashboard-ui/scripts/dlnaprofile.js
+++ b/dashboard-ui/scripts/dlnaprofile.js
@ -75,7 +75,8 @@
        $('#txtIconMaxHeight', page).val(profile.MaxIconHeight || '');

        $('#chkIgnoreTranscodeByteRangeRequests', page).checked(profile.IgnoreTranscodeByteRangeRequests).checkboxradio('refresh');
-        $('#txtMaxAllowedBitrate', page).val(profile.MaxBitrate || '');
+        $('#txtMaxAllowedBitrate', page).val(profile.MaxStreamingBitrate || '');
+        $('#txtMaxStaticBitrate', page).val(profile.MaxStaticBitrate || '');

        $('#chkRequiresPlainFolders', page).checked(profile.RequiresPlainFolders).checkboxradio('refresh');
        $('#chkRequiresPlainVideoItems', page).checked(profile.RequiresPlainVideoItems).checkboxradio('refresh');
@ -346,6 +347,8 @@
        $('#txtTranscodingContainer', popup).val(transcodingProfile.Container || '');
        $('#txtTranscodingAudioCodec', popup).val(transcodingProfile.AudioCodec || '');
        $('#txtTranscodingVideoCodec', popup).val(transcodingProfile.VideoCodec || '');
+        $('#selectTranscodingProtocol', popup).val(transcodingProfile.Protocol || 'Http').selectmenu('refresh');
+        $('#selectTranscodingContext', popup).val(transcodingProfile.Context || 'Streaming').selectmenu('refresh');

        $('#txtTranscodingVideoProfile', popup).val(transcodingProfile.VideoProfile || '');
        $('#chkEnableMpegtsM2TsMode', popup).checked(transcodingProfile.EnableMpegtsM2TsMode || false).checkboxradio('refresh');
@ -371,6 +374,8 @@
        currentSubProfile.Container = $('#txtTranscodingContainer', page).val();
        currentSubProfile.AudioCodec = $('#txtTranscodingAudioCodec', page).val();
        currentSubProfile.VideoCodec = $('#txtTranscodingVideoCodec', page).val();
+        currentSubProfile.Protocol = $('#selectTranscodingProtocol', page).val();
+        currentSubProfile.Context = $('#selectTranscodingContext', page).val();

        currentSubProfile.VideoProfile = $('#txtTranscodingVideoProfile', page).val();
        currentSubProfile.EnableMpegtsM2TsMode = $('#chkEnableMpegtsM2TsMode', page).checked();
@ -777,7 +782,8 @@
        profile.RequiresPlainVideoItems = $('#chkRequiresPlainVideoItems', page).checked();

        profile.IgnoreTranscodeByteRangeRequests = $('#chkIgnoreTranscodeByteRangeRequests', page).checked();
-        profile.MaxBitrate = $('#txtMaxAllowedBitrate', page).val();
+        profile.MaxStreamingBitrate = $('#txtMaxAllowedBitrate', page).val();
+        profile.MaxStaticBitrate = $('#LabelMaxStaticBitrateHelp', page).val();

        profile.ProtocolInfo = $('#txtProtocolInfo', page).val();
        profile.XDlnaCap = $('#txtXDlnaCap', page).val();
@ -819,10 +825,12 @@

            if (this.value == 'Video') {
                $('#fldTranscodingVideoCodec', page).show();
+                $('#fldTranscodingProtocol', page).show();
                $('#fldEnableMpegtsM2TsMode', page).show();
                $('#fldVideoProfile', page).show();
            } else {
                $('#fldTranscodingVideoCodec', page).hide();
+                $('#fldTranscodingProtocol', page).hide();
                $('#fldEnableMpegtsM2TsMode', page).hide();
                $('#fldVideoProfile', page).hide();
            }
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@ -416,16 +416,17 @@

            var select = $('#selectOfficialRating', page);

-            populateRatings(result, select);
+            populateRatings(result, select, item.OfficialRating);

            select.val(item.OfficialRating || "").selectmenu('refresh');

            select = $('#selectCustomRating', page);

-            populateRatings(result, select);
+            populateRatings(result, select, item.CustomRating);

            select.val(item.CustomRating || "").selectmenu('refresh');
        });
+
        var selectStatus = $('#selectStatus', page);
        populateStatus(selectStatus);
        selectStatus.val(item.Status || "").selectmenu('refresh');
@ -652,7 +653,7 @@
        populatePeople(page, currentItem.People);
    }

-    function populateRatings(allParentalRatings, select) {
+    function populateRatings(allParentalRatings, select, currentValue) {

        var html = "";

@ -661,11 +662,21 @@
        var ratings = [];
        var i, length, rating;

+        var currentValueFound = false;
+
        for (i = 0, length = allParentalRatings.length; i < length; i++) {

            rating = allParentalRatings[i];

            ratings.push({ Name: rating.Name, Value: rating.Name });
+
+            if (rating.Name == currentValue) {
+                currentValueFound = true;
+            }
+        }
+
+        if (currentValue && !currentValueFound) {
+            ratings.push({ Name: currentValue, Value: currentValue });
        }

        for (i = 0, length = ratings.length; i < length; i++) {
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@ -11,7 +11,7 @@
    return {
        getDefaultPageSize: function () {

-            var saved = store.getItem('pagesize_');
+            var saved = store.getItem('pagesize__');

            if (saved) {
                return parseInt(saved);
@ -1522,7 +1522,7 @@

            if (limit && options.updatePageSizeSetting !== false) {
                try {
-                    store.setItem('pagesize_', limit);
+                    store.setItem('pagesize__', limit);
                } catch (e) {

                }
@ -1598,7 +1598,7 @@

            if (query.Limit && updatePageSizeSetting !== false) {
                try {
-                    store.setItem('pagesize_', query.Limit);
+                    store.setItem('pagesize__', query.Limit);
                } catch (e) {

                }
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@ -9,11 +9,19 @@
        //html += '</a>';

        html += '<button type="button" data-role="none" title="Menu" class="headerButton dashboardMenuButton barsMenuButton headerButtonLeft">';
-        html += '<img src="css/images/menu.png" />';
+        html += '<div class="barMenuInner">';
+        html += '<span class="icon-bar"></span>';
+        html += '<span class="icon-bar"></span>';
+        html += '<span class="icon-bar"></span>';
+        html += '</div>';
        html += '</button>';

        html += '<button type="button" data-role="none" title="Menu" class="headerButton libraryMenuButton barsMenuButton headerButtonLeft">';
-        html += '<img src="css/images/menu.png" />';
+        html += '<div class="barMenuInner">';
+        html += '<span class="icon-bar"></span>';
+        html += '<span class="icon-bar"></span>';
+        html += '<span class="icon-bar"></span>';
+        html += '</div>';
        html += '</button>';
        
        html += '<div class="libraryMenuButtonText headerButton"><span>MEDIA</span><span class="mediaBrowserAccent">BROWSER</span></div>';
--- a/dashboard-ui/scripts/livetvsettings.js
+++ b/dashboard-ui/scripts/livetvsettings.js
@ -12,13 +12,13 @@
            $('.noLiveTvServices', page).show();
        }

-        $('#selectGuideDays', page).val(config.LiveTvOptions.GuideDays || '').selectmenu('refresh');
+        $('#selectGuideDays', page).val(config.GuideDays || '').selectmenu('refresh');

        var serviceOptions = liveTvInfo.Services.map(function (s) {
            return '<option value="' + s.Name + '">' + s.Name + '</option>';
        });

-        $('#selectActiveService', page).html(serviceOptions).val(config.LiveTvOptions.ActiveService || '').selectmenu('refresh');
+        $('#selectActiveService', page).html(serviceOptions).val(config.ActiveService || '').selectmenu('refresh');

        Dashboard.hideLoadingMsg();
    }
@ -29,7 +29,7 @@

        var page = this;

-        var promise1 = ApiClient.getServerConfiguration();
+        var promise1 = ApiClient.getNamedConfiguration("livetv");

        var promise2 = ApiClient.getLiveTvInfo();

@ -49,13 +49,13 @@

            var form = this;

-            ApiClient.getServerConfiguration().done(function (config) {
+            ApiClient.getNamedConfiguration("livetv").done(function (config) {


-                config.LiveTvOptions.GuideDays = $('#selectGuideDays', form).val() || null;
-                config.LiveTvOptions.ActiveService = $('#selectActiveService', form).val() || null;
+                config.GuideDays = $('#selectGuideDays', form).val() || null;
+                config.ActiveService = $('#selectActiveService', form).val() || null;

-                ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
+                ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult);
            });

            // Disable default form submission