From e66a2c5c14e0f0e992cda4226115b4bd51e2e597 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 21 Aug 2014 22:24:38 -0400
Subject: [PATCH] 3.0.5346.38509

---
 dashboard-ui/itembynamedetails.html          |  2 +-
 dashboard-ui/mypreferenceslanguages.html     |  8 +++----
 dashboard-ui/scripts/chromecast.js           |  6 ++++-
 dashboard-ui/scripts/itembynamedetailpage.js | 23 ++++++++++++++------
 dashboard-ui/scripts/librarylist.js          | 20 ++++++++---------
 dashboard-ui/scripts/playlistmanager.js      |  5 +++--
 6 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index a2da0036ad..8ca08c5b36 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -135,7 +135,7 @@
                         <p id="itemLinks"></p>
                         <div class="detailButtonsContainer desktopDetailButtons" style="text-align: left;">
                             <button class="btnPlay hide" type="button" data-icon="play" data-inline="true" data-mini="true">${ButtonPlay}</button>
-                            <a class="btnEdit hide" data-role="button" data-icon="edit" data-inline="true" data-mini="true" href="#">${ButtonEdit}</a>
+                            <button class="btnMoreCommands hide" type="button" data-icon="ellipsis-v" data-inline="true" data-mini="true">${ButtonMore}</button>
                         </div>
                     </td>
                 </tr>
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index 6f0b6db7a5..fd7b0932cc 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -17,19 +17,19 @@
             <ul data-role="listview" class="ulForm">
                 <li>
                     <label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label>
-                    <select id="selectAudioLanguage" data-mini="true"></select>
+                    <select id="selectAudioLanguage"></select>
                 </li>
                 <li>
-                    <input type="checkbox" id="chkPlayDefaultAudioTrack" data-mini="true" />
+                    <input type="checkbox" id="chkPlayDefaultAudioTrack" />
                     <label for="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</label>
                 </li>
                 <li>
                     <label for="selectSubtitleLanguage">${LabelSubtitleLanguagePreference}</label>
-                    <select id="selectSubtitleLanguage" data-mini="true"></select>
+                    <select id="selectSubtitleLanguage"></select>
                 </li>
                 <li>
                     <label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
-                    <select id="selectSubtitlePlaybackMode" data-mini="true">
+                    <select id="selectSubtitlePlaybackMode">
                         <option value="Default">${OptionDefaultSubtitles}</option>
                         <option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
                         <option value="Always">${OptionAlwaysPlaySubtitles}</option>
diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js
index a9a4132ff6..84610a3961 100644
--- a/dashboard-ui/scripts/chromecast.js
+++ b/dashboard-ui/scripts/chromecast.js
@@ -313,11 +313,15 @@
 
         var player = this;
 
+        var bitrateSetting = MediaPlayer.getBitrateSetting();
+        bitrateSetting = Math.min(bitrateSetting, 10000000);
+
         message = $.extend(message, {
             userId: Dashboard.getCurrentUserId(),
             deviceId: ApiClient.deviceId(),
             accessToken: ApiClient.accessToken(),
-            serverAddress: ApiClient.serverAddress()
+            serverAddress: ApiClient.serverAddress(),
+            maxBitrate: bitrateSetting
         });
 
         getEndpointInfo().done(function (endpoint) {
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 4965ceea49..ea21352f5b 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -43,7 +43,6 @@
     function reload(page) {
 
         Dashboard.showLoadingMsg();
-        $('.btnEdit', page).attr('href', '#');
 
         getPromise().done(function (item) {
 
@@ -53,7 +52,6 @@
             if (context) {
                 editQuery += '&context=' + context;
             }
-            $('.btnEdit', page).attr('href', 'edititemmetadata.html' + editQuery);
 
             currentItem = item;
 
@@ -88,10 +86,10 @@
 
                 $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, editImagesHref, true));
 
-                if (user.Configuration.IsAdministrator && item.LocationType !== "Offline") {
-                    $('.btnEdit', page).show();
+                if (LibraryBrowser.getMoreCommands(item, user).length) {
+                    $('.btnMoreCommands', page).show();
                 } else {
-                    $('.btnEdit', page).hide();
+                    $('.btnMoreCommands', page).show();
                 }
 
             });
@@ -464,9 +462,10 @@
             }
             else if (query.IncludeItemTypes == "MusicAlbum") {
 
-                html = LibraryBrowser.getListViewHtml({
+                html = LibraryBrowser.getPosterViewHtml({
                     items: result.Items,
-                    smallIcon: true,
+                    shape: "square",
+                    context: 'music',
                     playFromHere: true
                 });
 
@@ -524,6 +523,16 @@
 
         });
 
+        $('.btnMoreCommands', page).on('click', function () {
+
+            var button = this;
+
+            Dashboard.getCurrentUser().done(function (user) {
+
+                LibraryBrowser.showMoreCommands(button, currentItem.Id, LibraryBrowser.getMoreCommands(currentItem, user));
+            });
+        });
+
     }).on('pageshow', "#itemByNameDetailPage", function () {
 
         var page = this;
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index b2a18c2b66..3009c526a5 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -319,13 +319,21 @@
 
             var href = card.getAttribute('data-href') || card.href;
 
-            html += '<li><a href="' + href + '">' + Globalize.translate('ButtonOpen') + '</a></li>';
-            html += '<li><a href="' + href + '" target="_blank">' + Globalize.translate('ButtonOpenInNewTab') + '</a></li>';
+            if (commands.indexOf('playlist') != -1) {
+                html += '<li data-icon="plus"><a href="#" class="btnAddToPlaylist" data-itemid="' + itemId + '">' + Globalize.translate('ButtonAddToPlaylist') + '</a></li>';
+            }
 
             if (user.Configuration.IsAdministrator && commands.indexOf('edit') != -1) {
                 html += '<li data-icon="edit"><a href="edititemmetadata.html?id=' + itemId + '">' + Globalize.translate('ButtonEdit') + '</a></li>';
             }
 
+            if (commands.indexOf('instantmix') != -1) {
+                html += '<li data-icon="recycle"><a href="#" class="btnInstantMix" data-itemid="' + itemId + '">' + Globalize.translate('ButtonInstantMix') + '</a></li>';
+            }
+
+            html += '<li><a href="' + href + '">' + Globalize.translate('ButtonOpen') + '</a></li>';
+            html += '<li><a href="' + href + '" target="_blank">' + Globalize.translate('ButtonOpenInNewTab') + '</a></li>';
+
             if (options.showPlayOptions !== false) {
 
                 if (MediaController.canPlayByAttributes(itemType, mediaType, playAccess, locationType, isPlaceHolder)) {
@@ -353,18 +361,10 @@
                 }
             }
 
-            if (commands.indexOf('instantmix') != -1) {
-                html += '<li data-icon="recycle"><a href="#" class="btnInstantMix" data-itemid="' + itemId + '">' + Globalize.translate('ButtonInstantMix') + '</a></li>';
-            }
-
             if (commands.indexOf('shuffle') != -1) {
                 html += '<li data-icon="recycle"><a href="#" class="btnShuffle" data-itemid="' + itemId + '">' + Globalize.translate('ButtonShuffle') + '</a></li>';
             }
 
-            if (commands.indexOf('playlist') != -1) {
-                html += '<li data-icon="plus"><a href="#" class="btnAddToPlaylist" data-itemid="' + itemId + '">' + Globalize.translate('ButtonAddToPlaylist') + '</a></li>';
-            }
-
             if (commands.indexOf('removefromplaylist') != -1) {
                 html += '<li data-icon="delete"><a href="#" class="btnRemoveFromPlaylist" data-playlistitemid="' + playlistItemId + '">' + Globalize.translate('ButtonRemoveFromPlaylist') + '</a></li>';
             }
diff --git a/dashboard-ui/scripts/playlistmanager.js b/dashboard-ui/scripts/playlistmanager.js
index 19b5292447..f9fbd1219d 100644
--- a/dashboard-ui/scripts/playlistmanager.js
+++ b/dashboard-ui/scripts/playlistmanager.js
@@ -102,7 +102,7 @@
             }).join('');
 
             select.html(selectHtml).selectmenu('refresh');
-            
+
             select.val(lastPlaylistId || '').selectmenu('refresh').trigger('change');
             Dashboard.hideLoadingMsg();
         });
@@ -210,7 +210,8 @@
 
         var url = ApiClient.getUrl("Playlists/" + id + "/Items", {
 
-            Ids: $('.fldSelectedItemIds', panel).val() || ''
+            Ids: $('.fldSelectedItemIds', panel).val() || '',
+            userId: Dashboard.getCurrentUserId()
         });
 
         ApiClient.ajax({