diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index 031b285464..cb6e0e6c44 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -23,14 +23,14 @@ "web-component-tester": "*" }, "private": true, - "homepage": "https://github.com/Polymer/polymer", + "homepage": "https://github.com/polymer/polymer", "_release": "1.0.7", "_resolution": { "type": "version", "tag": "v1.0.7", "commit": "b39d0015ce5428232409eb3aca7ddefea899f894" }, - "_source": "git://github.com/Polymer/polymer.git", + "_source": "git://github.com/polymer/polymer.git", "_target": "^1.0.0", - "_originalSource": "Polymer/polymer" + "_originalSource": "polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html index 87d8a023e8..58304b35b6 100644 --- a/dashboard-ui/channels.html +++ b/dashboard-ui/channels.html @@ -20,7 +20,7 @@
-
+
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 6605120a8b..28494b8c6d 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -358,7 +358,7 @@ width: 42%; } -@media all and (max-width: 480px) { +@media all and (max-width: 420px) { .backdropCard { width: 100% !important; @@ -573,7 +573,7 @@ } } -@media all and (max-width: 480px) { +@media all and (max-width: 420px) { .detailPage169Card { width: 100% !important; diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html index 6d9c0d54d5..41ac75fc1b 100644 --- a/dashboard-ui/itembynamedetails.html +++ b/dashboard-ui/itembynamedetails.html @@ -5,117 +5,7 @@ -
- - - - - - - - - - - +
diff --git a/dashboard-ui/scripts/channels.js b/dashboard-ui/scripts/channels.js index 2db195c572..84bd351f8f 100644 --- a/dashboard-ui/scripts/channels.js +++ b/dashboard-ui/scripts/channels.js @@ -77,7 +77,7 @@ var tabs = page.querySelector('paper-tabs'); var pages = page.querySelector('neon-animated-pages'); - LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages, 1); + LibraryBrowser.configurePaperLibraryTabs(page, tabs, pages); $(tabs).on('iron-select', function () { var selected = this.selected; diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index f514551bde..52e69ff043 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -1534,9 +1534,7 @@ tabs.hideScrollButtons = true; - $(ownerpage).on('pagebeforeshowready', function() { - LibraryBrowser.onTabbedPageBeforeShowReady(this); - }); + $(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady); $(pages).on('iron-select', function () { diff --git a/dashboard-ui/scripts/editorsidebar.js b/dashboard-ui/scripts/editorsidebar.js index cba9d6d0c9..52cb373d8a 100644 --- a/dashboard-ui/scripts/editorsidebar.js +++ b/dashboard-ui/scripts/editorsidebar.js @@ -479,12 +479,6 @@ var query = "id=" + item.Id; - var context = getParameterByName('context'); - - if (context) { - query += "&context=" + context; - } - return query; }; diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index 366a78c352..73e986d5d6 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -49,16 +49,12 @@ var context = getParameterByName('context'); var editQuery = '?id=' + item.Id; - if (context) { - editQuery += '&context=' + context; - } currentItem = item; + LibraryMenu.setTitle(item.Name); Backdrops.setBackdrops(page, [item]); - renderHeader(page, item, context); - var name = item.Name; Dashboard.setPageTitle(name); @@ -104,48 +100,6 @@ }); } - function renderHeader(page, item, context) { - - $('.itemTabs', page).hide(); - - if (context == "movies" && item.Type == "Genre") { - $('#movieGenreTabs', page).show(); - } - - if (context == "movies" && item.Type == "Person") { - $('#moviePeopleTabs', page).show(); - } - - if (context == "movies" && item.Type == "Studio") { - $('#movieStudioTabs', page).show(); - } - - if (context == "tv" && item.Type == "Studio") { - $('#tvStudioTabs', page).show(); - } - - if (context == "tv" && item.Type == "Genre") { - $('#tvGenreTabs', page).show(); - } - - if (context == "tv" && item.Type == "Person") { - $('#tvPeopleTabs', page).show(); - } - - if (context == "music" && item.Type == "MusicGenre") { - $('#musicGenreTabs', page).show(); - } - if (context == "music" && item.Type == "MusicArtist") { - $('#artistTabs', page).show(); - } - if (context == "games" && item.Type == "GameGenre") { - $('#gameGenreTabs', page).show(); - } - if (context == "games" && item.Type == "Studio") { - $('#gameStudioTabs', page).show(); - } - } - function renderTabs(page, item, context) { var html = '
'; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index bbbbc477e2..7c2c1ce8df 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -235,9 +235,7 @@ $('.libraryViewNav', ownerpage).removeClass('libraryViewNavWithMinHeight'); } - $(ownerpage).on('pagebeforeshowready', function () { - LibraryBrowser.onTabbedPageBeforeShowReady(ownerpage, defaultTabIndex); - }); + $(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady); $(pages).on('iron-select', function () { @@ -251,8 +249,9 @@ }); }, - onTabbedPageBeforeShowReady: function (page, defaultTabIndex) { + onTabbedPageBeforeShowReady: function () { + var page = this; var tabs = page.querySelector('paper-tabs'); var selected = tabs.selected; @@ -260,12 +259,7 @@ Logger.log('selected tab is null, checking query string'); - if (!LibraryBrowser.enableFullPaperTabs()) { - // Currently not supported in this mode - defaultTabIndex = null; - } - - selected = parseInt(getParameterByName('tab')) || defaultTabIndex || 0; + selected = parseInt(getParameterByName('tab') || '0'); Logger.log('selected tab will be ' + selected); diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js index 1895030f0e..528bd44531 100644 --- a/dashboard-ui/scripts/sections.js +++ b/dashboard-ui/scripts/sections.js @@ -390,26 +390,28 @@ if (result.Items.length) { - var cssClass = index !== 0 ? 'listHeader' : 'listHeader'; + html += '
'; html += '
'; var text = Globalize.translate('HeaderLatestFromChannel').replace('{0}', channel.Name); - html += '

' + text + '

'; + html += '

' + text + '

'; html += '' + Globalize.translate('ButtonMore') + ''; html += '
'; + + html += '
'; + html += LibraryBrowser.getPosterViewHtml({ + items: result.Items, + shape: 'autohome', + defaultShape: 'square', + showTitle: true, + centerText: true, + context: 'channels', + lazy: true, + showDetailsMenu: true + }); + html += '
'; + html += '
'; } - html += '
'; - html += LibraryBrowser.getPosterViewHtml({ - items: result.Items, - shape: 'autohome', - defaultShape: 'square', - showTitle: true, - centerText: true, - context: 'channels', - lazy: true, - showDetailsMenu: true - }); - html += '
'; var elem = page.querySelector('#channel' + channel.Id + ''); elem.innerHTML = html; diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css index 1bb9f1a266..e546c476dd 100644 --- a/dashboard-ui/themes/ios.css +++ b/dashboard-ui/themes/ios.css @@ -62,7 +62,7 @@ html, body, .ui-btn, .pageTitle { color: #FF2D55 !important; } -.viewMenuBar paper-icon-button { +.viewMenuBar .headerButtonLeft { color: #FF2D55 !important; }