-
-
+
diff --git a/dashboard-ui/scripts/edituserpage.js b/dashboard-ui/scripts/edituserpage.js
index 12568b380c..80a9ddeb46 100644
--- a/dashboard-ui/scripts/edituserpage.js
+++ b/dashboard-ui/scripts/edituserpage.js
@@ -152,7 +152,7 @@
if (userId) {
Dashboard.alert("Settings saved.");
} else {
- Dashboard.navigate("userProfiles.html");
+ Dashboard.navigate("userprofiles.html");
}
},
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index 2538796381..9b76b0e8a3 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -7,23 +7,32 @@
reload: function () {
- var userId = Dashboard.getCurrentUserId();
-
var parentId = getParameterByName('parentId');
var query = {
- SortBy: "SortName",
-
- Fields: "PrimaryImageAspectRatio"
+ Fields: "PrimaryImageAspectRatio",
+ SortBy: "SortName"
};
if (parentId) {
query.parentId = parentId;
- ApiClient.getItem(userId, parentId).done(ItemListPage.renderTitle);
+ ApiClient.getItem(Dashboard.getCurrentUserId(), parentId).done(ItemListPage.renderTitle);
}
- ApiClient.getItems(userId, query).done(ItemListPage.renderItems);
+ ItemListPage.refreshItems(query);
+ },
+
+ refreshItems: function (query) {
+
+
+ var page = $.mobile.activePage;
+
+ page.itemQuery = query;
+
+ $('#btnSort', page).html(query.SortBy).button("refresh");
+
+ ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(ItemListPage.renderItems);
},
renderItems: function (result) {
@@ -45,6 +54,20 @@
$('#itemName', $.mobile.activePage).html(item.Name);
+ },
+
+ sortBy: function (sortBy) {
+
+ var query = $.mobile.activePage.itemQuery;
+ query.SortBy = sortBy;
+ ItemListPage.refreshItems(query);
+ },
+
+ sortOrder: function (order) {
+
+ var query = $.mobile.activePage.itemQuery;
+ query.SortOrder = order;
+ ItemListPage.refreshItems(query);
}
};
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 5ad07ed367..7b5436b674 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -434,7 +434,7 @@ var Dashboard = {
var hasPrimaryImage = item.ImageTags && item.ImageTags.Primary;
- var href = item.IsFolder ? (item.Id ? "itemList.html?parentId=" + item.Id : "#") : "itemDetails.html?id=" + item.Id;
+ var href = item.IsFolder ? (item.Id ? "itemList.html?parentId=" + item.Id : "#") : "itemdetails.html?id=" + item.Id;
var showText = options.showTitle || !hasPrimaryImage || (item.Type !== 'Movie' && item.Type !== 'Series' && item.Type !== 'Season' && item.Type !== 'Trailer');
@@ -539,7 +539,7 @@ var Dashboard = {
html += '
';
html += '';
- html += '';
+ html += '';
html += '';
html += '';
@@ -859,11 +859,11 @@ var Dashboard = {
selected: page.hasClass("pluginConfigurationPage")
}, {
name: "User Profiles",
- href: "userProfiles.html",
+ href: "userprofiles.html",
selected: page.hasClass("userProfilesConfigurationPage")
}, {
name: "Display Settings",
- href: "uiSettings.html",
+ href: "uisettings.html",
selected: pageElem.id == "displaySettingsPage"
}, {
name: "Advanced",
@@ -871,7 +871,7 @@ var Dashboard = {
selected: pageElem.id == "advancedConfigurationPage"
}, {
name: "Scheduled Tasks",
- href: "scheduledTasks.html",
+ href: "scheduledtasks.html",
selected: pageElem.id == "scheduledTasksPage" || pageElem.id == "scheduledTaskPage"
}, {
name: "Help",
@@ -17,6 +15,7 @@
+
diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html
index 4be44b8215..d07db25881 100644
--- a/dashboard-ui/itemlist.html
+++ b/dashboard-ui/itemlist.html
@@ -6,17 +6,62 @@
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
Panel content
+
+
+
+