diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js index fa7b5aee16..e50bc1c532 100644 --- a/src/components/favoriteitems.js +++ b/src/components/favoriteitems.js @@ -111,7 +111,7 @@ define(["loading", "libraryBrowser", "cardBuilder", "dom", "apphost", "imageLoad var html = ""; if (result.Items.length) { if (html += '
', !layoutManager.tv && options.Limit && result.Items.length >= options.Limit) { - html += '', html += '

', html += globalize.translate(section.name), html += "

", html += '', html += "" + html += '', html += '

', html += globalize.translate(section.name), html += "

", html += '', html += "" } else html += '

' + globalize.translate(section.name) + "

"; if (html += "
", enableScrollX()) { var scrollXClass = "scrollX hiddenScrollX"; diff --git a/src/list/list.html b/src/list.html similarity index 98% rename from src/list/list.html rename to src/list.html index 929c1596fb..5161704249 100644 --- a/src/list/list.html +++ b/src/list.html @@ -1,10 +1,7 @@
- -
- - +
+
-
-
diff --git a/src/livetv.html b/src/livetv.html index b4ef35d9bd..2bc99b2b80 100644 --- a/src/livetv.html +++ b/src/livetv.html @@ -5,7 +5,7 @@
- +

${HeaderOnNow}

 @@ -14,7 +14,7 @@
- +

${TabShows}

 @@ -23,7 +23,7 @@
- +

${HeaderMovies}

 @@ -32,7 +32,7 @@
- +

${Sports}

 @@ -41,7 +41,7 @@
- +

${HeaderForKids}

 @@ -50,7 +50,7 @@
- +

${News}

 diff --git a/src/scripts/itembynamedetailpage.js b/src/scripts/itembynamedetailpage.js index 727532a386..a80792d175 100644 --- a/src/scripts/itembynamedetailpage.js +++ b/src/scripts/itembynamedetailpage.js @@ -210,7 +210,7 @@ define(["connectionManager", "listView", "cardBuilder", "imageLoader", "libraryB } function getMoreItemsHref(item, type) { - return "Genre" == item.Type ? "list/list.html?type=" + type + "&genreId=" + item.Id + "&serverId=" + item.ServerId : "MusicGenre" == item.Type ? "list/list.html?type=" + type + "&musicGenreId=" + item.Id + "&serverId=" + item.ServerId : "Studio" == item.Type ? "list/list.html?type=" + type + "&studioId=" + item.Id + "&serverId=" + item.ServerId : "MusicArtist" == item.Type ? "list/list.html?type=" + type + "&artistId=" + item.Id + "&serverId=" + item.ServerId : "Person" == item.Type ? "list/list.html?type=" + type + "&personId=" + item.Id + "&serverId=" + item.ServerId : "list/list.html?type=" + type + "&parentId=" + item.Id + "&serverId=" + item.ServerId + return "Genre" == item.Type ? "list.html?type=" + type + "&genreId=" + item.Id + "&serverId=" + item.ServerId : "MusicGenre" == item.Type ? "list.html?type=" + type + "&musicGenreId=" + item.Id + "&serverId=" + item.ServerId : "Studio" == item.Type ? "list.html?type=" + type + "&studioId=" + item.Id + "&serverId=" + item.ServerId : "MusicArtist" == item.Type ? "list.html?type=" + type + "&artistId=" + item.Id + "&serverId=" + item.ServerId : "Person" == item.Type ? "list.html?type=" + type + "&personId=" + item.Id + "&serverId=" + item.ServerId : "list.html?type=" + type + "&parentId=" + item.Id + "&serverId=" + item.ServerId } function addCurrentItemToQuery(query, item) { diff --git a/src/scripts/livetvrecordings.js b/src/scripts/livetvrecordings.js index c56956314d..aac880ebda 100644 --- a/src/scripts/livetvrecordings.js +++ b/src/scripts/livetvrecordings.js @@ -45,7 +45,7 @@ define(["layoutManager", "loading", "cardBuilder", "apphost", "imageLoader", "sc serverId = ApiClient.serverId(); switch (type) { case "latest": - Dashboard.navigate("list/list.html?type=Recordings&serverId=" + serverId) + Dashboard.navigate("list.html?type=Recordings&serverId=" + serverId) } } return function(view, params, tabContent) { diff --git a/src/scripts/routes.js b/src/scripts/routes.js index f2f66ad264..9d98e8a937 100644 --- a/src/scripts/routes.js +++ b/src/scripts/routes.js @@ -119,7 +119,7 @@ define([ type: "home" }); defineRoute({ - path: "/list/list.html", + path: "/list.html", autoFocus: false, controller: "list", transition: "fade" diff --git a/src/scripts/site.js b/src/scripts/site.js index f984f20ebb..d60666b3a5 100644 --- a/src/scripts/site.js +++ b/src/scripts/site.js @@ -992,11 +992,11 @@ var AppInfo = {}; } if ("nextup" === item) { - return "list/list.html?type=nextup&serverId=" + options.serverId; + return "list.html?type=nextup&serverId=" + options.serverId; } if ("list" === item) { - var url = "list/list.html?serverId=" + options.serverId + "&type=" + options.itemTypes; + var url = "list.html?serverId=" + options.serverId + "&type=" + options.itemTypes; if (options.isFavorite) { url += "&IsFavorite=true"; @@ -1011,27 +1011,27 @@ var AppInfo = {}; } if ("movies" === options.section) { - return "list/list.html?type=Programs&IsMovie=true&serverId=" + options.serverId; + return "list.html?type=Programs&IsMovie=true&serverId=" + options.serverId; } if ("shows" === options.section) { - return "list/list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=" + options.serverId; + return "list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false&serverId=" + options.serverId; } if ("sports" === options.section) { - return "list/list.html?type=Programs&IsSports=true&serverId=" + options.serverId; + return "list.html?type=Programs&IsSports=true&serverId=" + options.serverId; } if ("kids" === options.section) { - return "list/list.html?type=Programs&IsKids=true&serverId=" + options.serverId; + return "list.html?type=Programs&IsKids=true&serverId=" + options.serverId; } if ("news" === options.section) { - return "list/list.html?type=Programs&IsNews=true&serverId=" + options.serverId; + return "list.html?type=Programs&IsNews=true&serverId=" + options.serverId; } if ("onnow" === options.section) { - return "list/list.html?type=Programs&IsAiring=true&serverId=" + options.serverId; + return "list.html?type=Programs&IsAiring=true&serverId=" + options.serverId; } if ("dvrschedule" === options.section) { @@ -1050,7 +1050,7 @@ var AppInfo = {}; } if ("Genre" === item.Type) { - url = "list/list.html?genreId=" + item.Id + "&serverId=" + serverId; + url = "list.html?genreId=" + item.Id + "&serverId=" + serverId; if ("livetv" === context) { url += "&type=Programs"; @@ -1064,7 +1064,7 @@ var AppInfo = {}; } if ("MusicGenre" === item.Type) { - url = "list/list.html?musicGenreId=" + item.Id + "&serverId=" + serverId; + url = "list.html?musicGenreId=" + item.Id + "&serverId=" + serverId; if (options.parentId) { url += "&parentId=" + options.parentId; @@ -1074,7 +1074,7 @@ var AppInfo = {}; } if ("Studio" === item.Type) { - url = "list/list.html?studioId=" + item.Id + "&serverId=" + serverId; + url = "list.html?studioId=" + item.Id + "&serverId=" + serverId; if (options.parentId) { url += "&parentId=" + options.parentId; @@ -1123,7 +1123,7 @@ var AppInfo = {}; if (item.IsFolder) { if (id) { - return "list/list.html?parentId=" + id + "&serverId=" + serverId; + return "list.html?parentId=" + id + "&serverId=" + serverId; } return "#";