From 127f342be1f165850ec168acd11a4b5d2ef1ae25 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 11 Jan 2015 15:31:09 -0500 Subject: [PATCH] add options to identify function --- dashboard-ui/about.html | 12 +- dashboard-ui/css/card.css | 5 +- dashboard-ui/css/images/mblogotextblack.png | Bin 20141 -> 0 bytes dashboard-ui/css/images/mblogotextwhite.png | Bin 20248 -> 0 bytes dashboard-ui/css/librarymenu.css | 5 + dashboard-ui/css/site.css | 30 ++-- dashboard-ui/edititemmetadata.html | 22 ++- dashboard-ui/scripts/edititemmetadata.js | 184 ++++++++++++++------ dashboard-ui/scripts/librarybrowser.js | 2 +- dashboard-ui/scripts/selectserver.js | 4 +- dashboard-ui/scripts/site.js | 5 +- dashboard-ui/scripts/syncactivity.js | 1 - 12 files changed, 177 insertions(+), 93 deletions(-) delete mode 100644 dashboard-ui/css/images/mblogotextblack.png delete mode 100644 dashboard-ui/css/images/mblogotextwhite.png diff --git a/dashboard-ui/about.html b/dashboard-ui/about.html index a8f2f5a474..cf366b418f 100644 --- a/dashboard-ui/about.html +++ b/dashboard-ui/about.html @@ -16,12 +16,12 @@ ${TabSupporterKey} ${TabAbout} -

- -
-
- ${VersionNumber} -

+
+ MEDIABROWSER +
+
+
+
${VersionNumber}

${HeaderCredits}
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index a2a917910f..2864ab55b2 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -82,7 +82,7 @@ background: #fff; } -.visualCardBox-b { +.ui-page-theme-b .visualCardBox { background: rgb(51, 51, 51); border: 1px solid rgb(31, 31, 31); border-radius: 3px; @@ -148,9 +148,6 @@ width: 100%; }*/ -.cardFooter { -} - .cardContent .cardFooter { position: absolute; bottom: 0; diff --git a/dashboard-ui/css/images/mblogotextblack.png b/dashboard-ui/css/images/mblogotextblack.png deleted file mode 100644 index f5f06060b9a67018dbeae850f90540ae9896c23c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20141 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 NaGLd diff --git a/dashboard-ui/css/images/mblogotextwhite.png b/dashboard-ui/css/images/mblogotextwhite.png deleted file mode 100644 index 0cbf1209afbc8a530201ea7ddeb4e57a89c14ce8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20248 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 M!o(I@W#ozZ6Z7o2nE(I) diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 6cf47ed1fa..619f5e19fa 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -102,6 +102,11 @@ .logoLibraryMenuButtonText { font-family: MBLogo; font-weight: 200; + color: #000; +} + +.ui-page-theme-b .logoLibraryMenuButtonText, .ui-bar-b .logoLibraryMenuButtonText { + color: #fff; } .viewMenuBar { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index d2ad1b963d..f1d5702907 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -203,12 +203,12 @@ pre, textarea.pre { .imgLogoIcon { height: 45px; + vertical-align: middle; } -.imgLogoText { - height: 45px; - margin-left: 5px; -} + .imgLogoIcon + span { + margin-left: 10px; + } .ui-popup-container { z-index: 99999; @@ -446,10 +446,6 @@ h1 .imageLink { max-width: 600px; } - .imgLogoText { - height: 50px; - } - .header { padding-top: 15px; padding-bottom: 15px; @@ -782,17 +778,17 @@ progress { border: 0; } - .btnUserItemRatingOff { - color: #aaa !important; - } +.btnUserItemRatingOff { + color: #aaa !important; +} - .btnUserItemRating:last-child { - margin-right: 0; - } +.btnUserItemRating:last-child { + margin-right: 0; +} - .btnUserItemRating:hover { - opacity: .5; - } +.btnUserItemRating:hover { + opacity: .5; +} .imgUserItemRating { height: 16px; diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html index d4669c6f3e..a2e137ae8b 100644 --- a/dashboard-ui/edititemmetadata.html +++ b/dashboard-ui/edititemmetadata.html @@ -389,11 +389,10 @@
- ${ButtonClose}
- +

${HeaderIdentifyItem}

@@ -430,6 +429,24 @@
+ +
+ +

${HeaderIdentificationResult}

+
+

${HeaderOptions}

+
+ + +
+
+ + +
@@ -528,6 +545,7 @@ $('.popupIdentifyForm').off('submit', EditItemMetadataPage.onIdentificationFormSubmitted).on('submit', EditItemMetadataPage.onIdentificationFormSubmitted); $('.popupEditPersonForm').off('submit', EditItemMetadataPage.onPersonInfoFormSubmit).on('submit', EditItemMetadataPage.onPersonInfoFormSubmit); $('.popupAdvancedRefreshForm').off('submit', EditItemMetadataPage.onRefreshFormSubmit).on('submit', EditItemMetadataPage.onRefreshFormSubmit); + $('.identifyOptionsForm').off('submit', EditItemMetadataPage.onIdentificationOptionsSubmit).on('submit', EditItemMetadataPage.onIdentificationOptionsSubmit); diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 2f04cf0441..6ed6ffc3d3 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -1,6 +1,7 @@ (function ($, document, window) { var currentItem; + var currentSearchResult; var metadataEditorInfo; function updateTabs(page, item) { @@ -148,7 +149,7 @@ var buttonId = "btnOpen1" + idInfo.Key; var formatString = idInfo.UrlFormatString || ''; - html += '
'; + html += '
'; var idLabel = Globalize.translate('LabelDynamicExternalId').replace('{0}', idInfo.Name); html += ''; @@ -1008,6 +1009,14 @@ savePersonInfo(page); return false; }; + + self.onIdentificationOptionsSubmit = function () { + + var page = $(this).parents('.page'); + + submitIdentficationResult(page); + return false; + }; } window.EditItemMetadataPage = new editItemMetadataPage(); @@ -1058,7 +1067,8 @@ $('.popupIdentifyForm', page).show(); $('.identificationSearchResults', page).hide(); - $('.btnSearchAgain', page).hide(); + $('.identifyOptionsForm', page).hide(); + $('.btnIdentifyBack', page).hide(); $('.popupIdentify', page).popup('open'); }); @@ -1131,11 +1141,57 @@ return ApiClient.getUrl("Items/RemoteSearch/Image", { imageUrl: url, ProviderName: provider }); } + function getSearchResultHtml(result, index) { + + var html = ''; + var cssClass = "searchImageContainer remoteImageContainer"; + + if (currentItem.Type == "Episode") { + cssClass += " searchBackdropImageContainer"; + } + else if (currentItem.Type == "MusicAlbum" || currentItem.Type == "MusicArtist") { + cssClass += " searchDiscImageContainer"; + } + else { + cssClass += " searchPosterImageContainer"; + } + + html += '
'; + + if (result.ImageUrl) { + var displayUrl = getSearchImageDisplayUrl(result.ImageUrl, result.SearchProviderName); + + html += ''; + } else { + + html += ''; + } + html += ''; + + html += '
'; + html += result.Name; + html += '
'; + + html += '
'; + html += result.ProductionYear || ' '; + html += '
'; + + if (result.GameSystem) { + html += '
'; + html += result.GameSystem; + html += '
'; + } + + html += '
'; + return html; + } + function showIdentificationSearchResults(page, results) { $('.popupIdentifyForm', page).hide(); $('.identificationSearchResults', page).show(); - $('.btnSearchAgain', page).show(); + $('.identifyOptionsForm', page).hide(); + $('.btnIdentifyBack', page).show(); var html = ''; @@ -1143,71 +1199,74 @@ var result = results[i]; - var cssClass = "searchImageContainer remoteImageContainer"; - - if (currentItem.Type == "Episode") { - cssClass += " searchBackdropImageContainer"; - } - else if (currentItem.Type == "MusicAlbum" || currentItem.Type == "MusicArtist") { - cssClass += " searchDiscImageContainer"; - } - else { - cssClass += " searchPosterImageContainer"; - } - - html += '
'; - - if (result.ImageUrl) { - var displayUrl = getSearchImageDisplayUrl(result.ImageUrl, result.SearchProviderName); - - html += ''; - } else { - - html += ''; - } - html += ''; - - html += '
'; - html += result.Name; - html += '
'; - - html += '
'; - html += result.ProductionYear || ' '; - html += '
'; - - if (result.GameSystem) { - html += '
'; - html += result.GameSystem; - html += '
'; - } - - html += '
'; + html += getSearchResultHtml(result, i); } var elem = $('.identificationSearchResultList', page).html(html).trigger('create'); $('.searchImage', elem).on('click', function () { - Dashboard.showLoadingMsg(); - var index = parseInt(this.getAttribute('data-index')); var currentResult = results[index]; - ApiClient.ajax({ - type: "POST", - url: ApiClient.getUrl("Items/RemoteSearch/Apply/" + currentItem.Id), - data: JSON.stringify(currentResult), - contentType: "application/json" + showIdentifyOptions(page, currentResult); + }); + } - }).done(function () { + function showIdentifyOptions(page, identifyResult) { - Dashboard.hideLoadingMsg(); + $('.popupIdentifyForm', page).hide(); + $('.identificationSearchResults', page).hide(); + $('.identifyOptionsForm', page).show(); + $('.btnIdentifyBack', page).show(); + $('#chkIdentifyReplaceImages', page).checked(true).checkboxradio('refresh'); - $('.popupIdentify', page).popup('close'); + currentSearchResult = identifyResult; - reload(page); - }); + var lines = []; + lines.push(identifyResult.Name); + + if (identifyResult.ProductionYear) { + lines.push(identifyResult.ProductionYear); + } + + if (identifyResult.GameSystem) { + lines.push(identifyResult.GameSystem); + } + + var resultHtml = lines.join('
'); + + if (identifyResult.ImageUrl) { + var displayUrl = getSearchImageDisplayUrl(identifyResult.ImageUrl, identifyResult.SearchProviderName); + + resultHtml = '
' + resultHtml; + } + + $('.selectedSearchResult', page).html(resultHtml); + } + + function submitIdentficationResult(page) { + + Dashboard.showLoadingMsg(); + + var options = { + ReplaceAllImages: $('#chkIdentifyReplaceImages', page).checked() + }; + + ApiClient.ajax({ + type: "POST", + url: ApiClient.getUrl("Items/RemoteSearch/Apply/" + currentItem.Id, options), + data: JSON.stringify(currentSearchResult), + contentType: "application/json" + + }).done(function () { + + Dashboard.hideLoadingMsg(); + + $('.popupIdentify', page).popup('close'); + + reload(page); }); } @@ -1279,11 +1338,20 @@ showIdentificationForm(page); }); - $('.btnSearchAgain', page).on('click', function () { + $('.btnIdentifyBack', page).on('click', function () { - $('.popupIdentifyForm', page).show(); - $('.identificationSearchResults', page).hide(); - $('.btnSearchAgain', page).hide(); + if ($('.identifyOptionsForm', page).is(':visible')) { + + $('.identifyOptionsForm', page).hide(); + + $('.identificationSearchResults', page).show(); + $('.popupIdentifyForm', page).hide(); + } else { + + $('.identificationSearchResults', page).hide(); + $('.popupIdentifyForm', page).show(); + $(this).hide(); + } }); $('#btnDelete', this).on('click', function () { diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index b5286979d7..cf9d17a45c 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1250,7 +1250,7 @@ var cardboxCssClass = 'cardBox'; if (options.cardLayout) { - cardboxCssClass += ' visualCardBox visualCardBox-b'; + cardboxCssClass += ' visualCardBox'; } html += '
'; html += '
'; diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js index fd486a580c..bd77d4b065 100644 --- a/dashboard-ui/scripts/selectserver.js +++ b/dashboard-ui/scripts/selectserver.js @@ -47,7 +47,7 @@ html += "
"; - html += '
'; + html += '
'; html += '
'; html += '
'; @@ -264,7 +264,7 @@ html += "
"; - html += '
'; + html += '
'; html += '
'; html += '
'; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 20e4ed4f5d..7cccb157ca 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -640,11 +640,12 @@ var Dashboard = { headerHtml += '
'; - headerHtml += ''; diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js index ec03e293e7..180009da56 100644 --- a/dashboard-ui/scripts/syncactivity.js +++ b/dashboard-ui/scripts/syncactivity.js @@ -144,7 +144,6 @@ var barCssClass = 'ui-bar-a'; if ($(page).hasClass('libraryPage')) { - cardBoxCssClass += ' visualCardBox-b'; barCssClass = 'detailSectionHeader'; }