From 878bad724a5454b5943564afdccc8a77c585bca4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 28 Nov 2013 13:27:29 -0500 Subject: [PATCH] add specialized get seasons method --- ApiClient.js | 11 +++++ .../css/images/userdata/playedoff.png | Bin 2196 -> 2949 bytes dashboard-ui/css/images/userdata/playedon.png | Bin 2237 -> 3028 bytes dashboard-ui/css/librarybrowser.css | 9 ++-- dashboard-ui/css/metadataeditor.css | 13 +++++ dashboard-ui/css/search.css | 4 +- dashboard-ui/css/site.css | 45 ++++++++++-------- dashboard-ui/edititemmetadata.html | 10 ++-- dashboard-ui/edititempeople.html | 2 +- dashboard-ui/itembynamedetails.html | 2 +- dashboard-ui/itemdetails.html | 2 +- dashboard-ui/library.html | 2 +- dashboard-ui/livetvchannel.html | 2 +- dashboard-ui/scripts/Itemdetailpage.js | 33 ++++++++----- dashboard-ui/scripts/edititemmetadata.js | 10 +--- dashboard-ui/scripts/edititempeople.js | 4 +- dashboard-ui/scripts/librarybrowser.js | 2 +- dashboard-ui/scripts/site.js | 20 ++++---- dashboard-ui/wizardlibrary.html | 2 +- packages.config | 2 +- 20 files changed, 103 insertions(+), 72 deletions(-) diff --git a/ApiClient.js b/ApiClient.js index 69f3f020cf..36476511ec 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -575,6 +575,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi }); }; + self.getSeasons = function (itemId, options) { + + var url = self.getUrl("Shows/" + itemId + "/Seasons", options); + + return self.ajax({ + type: "GET", + url: url, + dataType: "json" + }); + }; + self.getSimilarMovies = function (itemId, options) { var url = self.getUrl("Movies/" + itemId + "/Similar", options); diff --git a/dashboard-ui/css/images/userdata/playedoff.png b/dashboard-ui/css/images/userdata/playedoff.png index 250b979311854f27a57a1fe7d951d1241980b678..61925ee6f69b893706c9e5db07a90b456162b91c 100644 GIT binary patch delta 2893 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 delta 2134 zcmah~c{tR27yr(XG|06zUNzYYsifqFX_i-mnHF0k+2^J^mI;ZF?Ke~yTb3(|jIC&~ zUsOXVdzM6YaT$|B(U>vzckXllz0dQWzdq-j=bXeR8q25GE%nPsckd-T$_Z?=DE+WOcWVOjB?+9-M7K1=^3UmD|>uOEj*~qHXmx($_TBrijReOJl>|)A6LItxTF!RUhf$apCuesW4GQ@=B)AN zIKBC1d=f1A%3DRq~w2h9ooZqPkfpSNYQ{oXSeUs@ zZR6!KO2h+0zb7c0XapV%tX?cMe=u0;GOF2}VRZAEUBy)f$|ercAQum92zB)bYt4Kmm*O!|wgsB;6wRbDIhxp4Q}cb1MrYy5@Lt{55h`P3jw zm}JDArQdkpKBd{L#OA@>8{?422=O@A7D+wYz!7w;v_gYQ68qKlzandvhQE~BS9K&# z5q9W;c#D))H>UKvXz5d<)n3o_yXGPhIm*^8(FuD`QBif}`S3EL64aY#(tCAnBo{6~ zlBQGV?P`O{QO%IWPk7SF@E7gbxkP)A($YHXP<@SYVpvbU9YNRFZ9Yd-RKC7$6Tm&2 zTmXuunb@$`{uoF_G5blkhU|G@t#?idi{yo-(=Izw>hI0@e0)8@RAH`t?JJ~iZ*AV~ zuD69fz)-Pf)diPpyq)%J=qp&k79}{Aq8|M}ChE5XA(0lL<`*W4kXYmw?qii!oY%-n zw5P@uI0Z8^k8aIddxtXky}OO%w=km5ogdai|BSw!DO6HTK1WRrP|>K0Vk)xG)q|;X z<8ai0tbte1_8Ziy-nF5!YvcDYJwGC2KsOUNQGIH^G+i@jLr@-OE#<#hAx|>C=q8D( zgJgpwCWR;9e0pvhaPnl6c)E^L$Clu}y;IxDTFUkyyFImQ?3Ld_(Q42xy53@q_jrYR z;36Cwt?eifiYkDRIYUBJgzlUEcA!>tak5cl-N~2uP8LZtoiXeTqJ|HvI}~4L1$a$c z*DWl{0(~E*3-OI#lH`ZUjf`ANH4TqTC62?sCAd}xfIk>-D(=$Oqb&Re{YUo(N!P~s z4y0e9_9Jxg$fC)!hO;(Tc)w86J`B^ISDdZ^7l;H;mUopw6*`ySPPDO&jXD=*?YcF#gA@UvH;z6Ah+@k_e+mYQ*(li++8pv8x?v}Y3d_pdy=3Ea^7i@4KIn* z4-nJ=B}C)V!%q!9?s>AHl3ZbsAK?-rgp;s>;9dHQGz)(?V33Q&!o3NH03$N_A3zaH zuZy}Mf(y)307YzGm41Z!sa;1iW5n5GhVizT!F>%jkF&M89Y Y0y_(rhq@hHJb^GsCgy|^V@l-z05A9nIsgCw diff --git a/dashboard-ui/css/images/userdata/playedon.png b/dashboard-ui/css/images/userdata/playedon.png index 53f53536576b88d44b3a2d1428fe4743cd004967..24224004d820e977878b842c89d85ee052b6973b 100644 GIT binary patch delta 2973 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 TvSLiD00000NkvXXu0mjfz;?H+ delta 2175 zcmaJ?c|6qn0{zaIVKSDPvX#L!DzapW3>qV5NJ3n5=_({qQmJei{C>6?8q2hh&{!)Z z-KV-E(qy}$NJ3Kf$}Wv%EW`EwdH=l6d*{z{&gY!--}$Kc5}(F^FfMkq1FqqoQ#l@I z}m(V*wpol(#7fwERc=Z;6vcjN5u9(6ylWmg?z>k zw$BzsjJ(y;oYuo zr7`mp4CpenH_A&!XQjtJ!?mQ!gF1T+!v|OW-?>Cpg|<(IS-Q{ ziGJc)cU`AH?p|zM|3&ZQQrmnYiAWaKKXaz{U-bEN{f>@YjgRs8=l>m(785ez`nZUmyw7M< ziKHtPYGC&r8teQU{6R$~FHp|%@4N5+^vGl;GIvkPZyqBfO?%%=0P!M(#NO!7{*-cgtHL~+~EhdsaQ;E zT{n?`*2XQJ%QA_OQy~HIrVeWGL3st;4^Gtvf;x%YSC(B<^EZ-lO4RPpC6ZW$QH?&h z!mYdgzzRfQ0i^zZe;F0Q&rV2|JW)4>Rj;2=z{5`Z!v=zvs)8i`s9e9SLGurBJS_X9 z`()eV*+`wmo`ulnpAE?vzB*>Cws$eIk!$(=%@*U~VOvU)A|96TUR|C3+WO%8`pG)y z@`VO0B}okr+mqQ|9i8;osyA^69$Y8vq)xymEViJUUjJpaEQZ**!@xFp{RWptxK6Ji}Ou~ zY2YS2ySr)2K(=hj@(N?&^E3Cl>hl{;xJ5{03U)E(?xtWY>&~oxZgo6Kiu#5_kb}0V zy}tLh!au^-0_wuT9m4zK%=>i#h@frUSW0)f^47^rnX_n^l+s6GhO=kjQ`F`F&pnUi zz%SuaoP_9yKm$=%@NjQp{4Ve~vq3sqZ$xm-zpcwD_P~!Q|1qZzHB`s@RouIp4wM#Qa1WRxLK z%qd5g63ZYq6-k<~{VKFxLDX|j$B50>bi8)r4+62XU86JAar!z-Xtw7PnLKT}w}0k# znM-cI$(g*qOQ_Aj&pJ)kcXfn6mTNiyrC9v+B=<`wkKHw%-Tql025LqZB~yVRyF- z)g_79rF+AFM}_q8#}6>7-#Xj6E)@2^>?mlCql1I-AH#xw9t#PTVo|c6qhuk~$n~qz zla6YeDYswDDGuUcF=KP@$>12>ydQIC%ye&w$#^LxYUqgU9Orm34gek>RAPQT;x^UQ z_2*-co#~;EHnV7#;?}WyLR`%rA%P|vKG}5j@*&IE;vXY#c3^r5a6lRAWN2pCVbK~3(lfFM1os-LFs`V zuS-8^?S40r{vHkd--oA0`1(#tXKyN-l(rg0f~Ne2c1(|MW~<{wIU|e z=s4lcqr%OZK$GY5xxwy7SYGh+1bc|ngxc7BqS6>m)738Gb?9*qHw6heT!*=9&sS$7ygelNAqbJc-BT~yKr zmdQ#lx496gPD;99;F)|WIl52Z6C6~kJZG(*!VP090{#@qMDLiw-)-iJIH1{`^BaK* z?XUslZGOGI5AF>P372-6B7+Wwgq6OqO`RK6+aNTYkzmZNd~MOu;^Jy7hm3$H!>4+O zRo>LkVr@uhOIvGO)Q}LZ@l?Tp1Gk diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 365a0c78de..1825303123 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -27,7 +27,6 @@ .viewMenuBar { background: #444; background-image: linear-gradient(#444,#2d2d2d); - font-size: 13px; font-weight: bold; position: fixed; right: 0; @@ -35,6 +34,7 @@ z-index: 1000; top: 0; border-bottom: 1px solid #111; + font-size: 13px; } .viewSummary { @@ -47,6 +47,7 @@ padding: 7px .5em 6px; display: inline-block; vertical-align: middle; + font-family: Arial; } .viewMenuLink:hover { @@ -348,7 +349,6 @@ a.itemTag:hover { bottom: 0; left: 0; right: 0; - font-size: 13px; background-color: rgba(0,0,0,0.7); } @@ -421,7 +421,7 @@ a.itemTag:hover { color: #000!important; } -.itemName { +.inlineItemName { font-size: 22px; } @@ -782,8 +782,6 @@ a.itemTag:hover { .userDataIcons .itemProgressText { vertical-align: top; - position: relative; - top: 3px; margin-right: 1.5em; } @@ -794,7 +792,6 @@ a.itemTag:hover { } .itemProgressText { - font-size: 12px; color: #ddd; vertical-align: middle; } diff --git a/dashboard-ui/css/metadataeditor.css b/dashboard-ui/css/metadataeditor.css index 5735773bb4..1cbcc44305 100644 --- a/dashboard-ui/css/metadataeditor.css +++ b/dashboard-ui/css/metadataeditor.css @@ -72,6 +72,11 @@ height: 180px; } +/* Fixes button running outside of list */ +.btnRemoveFromEditorList .ui-btn-inner { + padding-right: 0!important; +} + @media all and (min-width: 500px) { .availableImagesList { @@ -132,6 +137,14 @@ margin: .5em 0; } +.editorTile .tileContent{ + color: #000; +} + +.editorTile .ui-field-contain{ + margin: 0 0 .5em; +} + @media all and (min-width: 700px) { .availableImagesList { diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css index 634221ded1..35e65c7817 100644 --- a/dashboard-ui/css/search.css +++ b/dashboard-ui/css/search.css @@ -6,7 +6,7 @@ .txtSearch { vertical-align: middle; - font: 13px arial,sans-serif; + font-size: 14px; margin: 0 .15em 0 0; width: 80px; padding: 0; @@ -96,7 +96,7 @@ } .searchHintSecondaryText { - font-size: 11px; + font-size: 12px; color: #999; margin-top: 3px; white-space: nowrap; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 6b7362f2c9..3601edd1e4 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -1,29 +1,29 @@ @font-face { - font-family: "Open Sans"; - font-style: normal; - font-weight: 700; - src: local("Open Sans Bold"), local("OpenSans-Bold"), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzJ1r3JsPcQLi8jytr04NNhU.woff) format('woff'); -} - -@font-face { - font-family: "Open Sans"; + font-family: 'Open Sans'; font-style: normal; font-weight: 300; - src: local("Open Sans Light"), local("OpenSans-Light"), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTZ1r3JsPcQLi8jytr04NNhU.woff) format('woff'); + src: local('Open Sans Light'), local('OpenSans-Light'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff) format('woff'); } @font-face { - font-family: "Open Sans"; - font-style: normal; - font-weight: 800; - src: local("Open Sans Extrabold"), local("OpenSans-Extrabold"), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hp1r3JsPcQLi8jytr04NNhU.woff) format('woff'); -} - -@font-face { - font-family: "Open Sans"; + font-family: 'Open Sans'; font-style: normal; font-weight: 400; - src: local("Open Sans"), local("OpenSans"), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/K88pR3goAWT7BTt32Z01mz8E0i7KZn-EPnyo3HZu7kw.woff) format('woff'); + src: local('Open Sans'), local('OpenSans'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff) format('woff'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 700; + src: local('Open Sans Bold'), local('OpenSans-Bold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/k3k702ZOKiLJc3WVjuplzHhCUOGz7vYGh680lGh-uXM.woff) format('woff'); +} + +@font-face { + font-family: 'Open Sans'; + font-style: normal; + font-weight: 800; + src: local('Open Sans Extrabold'), local('OpenSans-Extrabold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/EInbV5DfGHOiMmvb1Xr-hnhCUOGz7vYGh680lGh-uXM.woff) format('woff'); } * { @@ -68,9 +68,12 @@ h2 { font-size: 20pt; } -.libraryPage:not(.metadataEditorPage) h1 a { - font-weight: 200!important; +h1 a { + font-weight: 300!important; text-decoration: none; +} + +.libraryPage:not(.metadataEditorPage) h1 a { color: #fff!important; } @@ -1004,7 +1007,7 @@ input[type="range"]::-ms-fill-upper { } .mediaFlyoutOptionSecondaryText { - font-size: 11px; + font-size: 12px; color: #999; margin-top: 3px; white-space: nowrap; diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html index 3e4bac8eca..208e354d59 100644 --- a/dashboard-ui/edititemmetadata.html +++ b/dashboard-ui/edititemmetadata.html @@ -37,7 +37,7 @@
@@ -152,7 +152,7 @@ - Add + Add
    @@ -291,7 +291,7 @@
    - Add + Add
      @@ -301,7 +301,7 @@
      - Add + Add
        @@ -311,7 +311,7 @@
        - Add + Add
          diff --git a/dashboard-ui/edititempeople.html b/dashboard-ui/edititempeople.html index 56a98bc2f2..3605328946 100644 --- a/dashboard-ui/edititempeople.html +++ b/dashboard-ui/edititempeople.html @@ -21,7 +21,7 @@ Images
          diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index 0321c03bc5..57086c44a9 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -123,7 +123,7 @@
          -

          +

          diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 447eff25ee..1f353a065b 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -114,7 +114,7 @@ -

          +

          diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html index fff51b064a..7252e449d5 100644 --- a/dashboard-ui/library.html +++ b/dashboard-ui/library.html @@ -32,7 +32,7 @@

          -

          Read media library wiki.

          +

          Refer to media library wiki.

          Configure images and sort orders by browsing and editing.

          diff --git a/dashboard-ui/livetvchannel.html b/dashboard-ui/livetvchannel.html index a18f5af87f..366c0d7386 100644 --- a/dashboard-ui/livetvchannel.html +++ b/dashboard-ui/livetvchannel.html @@ -19,7 +19,7 @@
          -

          +

          diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js index 50511229af..c4d18a3be3 100644 --- a/dashboard-ui/scripts/Itemdetailpage.js +++ b/dashboard-ui/scripts/Itemdetailpage.js @@ -22,7 +22,7 @@ Dashboard.getCurrentUser().done(function (user) { var imageHref = user.Configuration.IsAdministrator ? "edititemimages.html?id=" + item.Id : ""; - + $('#itemImage', page).html(LibraryBrowser.getDetailImageHtml(item, imageHref)); setInitialCollapsibleState(page, item, context, user); @@ -509,21 +509,32 @@ var promise; - if (item.Type == "Season" && item.IndexNumber != null) { + if (item.Type == "Series") { - promise = ApiClient.getEpisodes(item.SeriesId, { + promise = ApiClient.getSeasons(item.Id, { - season: item.IndexNumber, userId: Dashboard.getCurrentUserId() }); } + else if (item.Type == "Season" && item.IndexNumber != null) { - else if (item.Type == "Series" || item.Type == "Season") { - if (!user.Configuration.DisplayMissingEpisodes) { - query.IsMissing = false; - } - if (!user.Configuration.DisplayUnairedEpisodes) { - query.IsVirtualUnaired = false; + if (item.IndexNumber == null) { + + // If there's no known season number, just use generic folder browsing + if (!user.Configuration.DisplayMissingEpisodes) { + query.IsMissing = false; + } + if (!user.Configuration.DisplayUnairedEpisodes) { + query.IsVirtualUnaired = false; + } + } else { + + // Use dedicated episodes endpoint + promise = ApiClient.getEpisodes(item.SeriesId, { + + season: item.IndexNumber, + userId: Dashboard.getCurrentUserId() + }); } } @@ -607,7 +618,7 @@ var html = ''; - var reviews = result.ItemReviews; + var reviews = result.Items; for (var i = 0, length = reviews.length; i < length; i++) { diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 26e4103b42..754bf0f9b7 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -151,18 +151,12 @@ if (node == '-1') { - callback({ attr: { id: 'root', rel: 'folder', itemtype: 'root' }, data: 'Root', state: 'open' }); + loadChildrenOfRootNode(callback); return; } var id = node.attr("id"); - if (id == 'root') { - - loadChildrenOfRootNode(callback); - return; - } - if (id == 'livetv') { loadLiveTvServices(openItems, callback); @@ -989,7 +983,7 @@ } var html = ''; for (var i = 0; i < items.length; i++) { - html += '

        • ' + items[i] + '
          • '; + html += '
        • ' + items[i] + '
          • '; } list.html(html).listview('refresh'); } diff --git a/dashboard-ui/scripts/edititempeople.js b/dashboard-ui/scripts/edititempeople.js index b1e44fbde7..6dc46d7f6f 100644 --- a/dashboard-ui/scripts/edititempeople.js +++ b/dashboard-ui/scripts/edititempeople.js @@ -47,7 +47,7 @@ } function constructPerson(item, person) { - var html = '
          '; + var html = '
          '; var imgUrl; var name = person.Name || ""; var role = person.Role || ""; @@ -94,7 +94,7 @@ if (item.LocationType !== "Offline") { html += ''; - html += ''; + html += ''; html += ''; } diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 7b44a6cea4..06e9322fbe 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -1504,7 +1504,7 @@ itemId = item.Name; } - if ((item.MediaType || item.IsFolder) && item.Type != "Channel") { + if ((item.MediaType || item.IsFolder) && item.Type != "Channel" && item.Type != "MusicArtist") { if (userData.Played) { html += 'Played'; } else { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index a2390cd736..d1ebb46b1a 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -255,7 +255,7 @@ var Dashboard = { showServerRestartWarning: function (systemInfo) { var html = 'Please restart Media Browser Server to finish updating.'; - + if (systemInfo.CanSelfRestart) { html += ''; } @@ -279,7 +279,7 @@ var Dashboard = { reloadPage: function () { var currentUrl = window.location.toString().toLowerCase(); - + // If they're on a plugin config page just go back to the dashboard // The plugin may not have been loaded yet, or could have been uninstalled if (currentUrl.indexOf('configurationpage') != -1) { @@ -644,6 +644,8 @@ var Dashboard = { } } + html += 'Metadata Manager'; + // collapsible html += '
          '; @@ -1121,8 +1123,8 @@ var Dashboard = { return parts.join(':'); }, - - ratePackage: function(link) { + + ratePackage: function (link) { var id = link.getAttribute('data-id'); var name = link.getAttribute('data-name'); var rating = link.getAttribute('data-rating'); @@ -1132,25 +1134,25 @@ var Dashboard = { header: "Rate and review " + name, id: id, rating: rating, - callback: function(review) { + callback: function (review) { console.log(review); dialog.close(); - ApiClient.createPackageReview(review).done(function() { + ApiClient.createPackageReview(review).done(function () { Dashboard.alert("Thank you for your review"); }); } }); }, - - getStoreRatingHtml: function(rating, id, name, noLinks) { + + getStoreRatingHtml: function (rating, id, name, noLinks) { var html = "
          "; if (!rating) rating = 0; for (var i = 1; i <= 5; i++) { var title = noLinks ? rating + " stars" : "Rate " + i + (i > 1 ? " stars" : " star"); - + html += noLinks ? "" : ""; if (rating <= i - 1) { html += "
          "; diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html index d578fa6760..871eab8b45 100644 --- a/dashboard-ui/wizardlibrary.html +++ b/dashboard-ui/wizardlibrary.html @@ -23,7 +23,7 @@

          -

          Read media library wiki.

          +

          Refer to media library wiki.