diff --git a/ApiClient.js b/ApiClient.js
index 3200f25c48..0ef566fbf6 100644
--- a/ApiClient.js
+++ b/ApiClient.js
@@ -700,6 +700,19 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
});
};
+ /**
+ * Instructs the server to perform a shutdown.
+ */
+ self.shutdownServer = function () {
+
+ var url = self.getUrl("System/Shutdown");
+
+ return self.ajax({
+ type: "POST",
+ url: url
+ });
+ };
+
/**
* Gets information about an installable package
*/
diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html
index 58f7fd23b9..cd6adb64b3 100644
--- a/dashboard-ui/advanced.html
+++ b/dashboard-ui/advanced.html
@@ -15,7 +15,7 @@
- This will start the tray icon on windows startup. If you'd prefer to start the windows service instead, disable this and configure the service from the control panel.
+ This will start the tray icon on windows startup. If you'd prefer to start the windows service instead, disable this and configure the service from the windows control panel.
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 37334b4414..d5705a6c43 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -514,9 +514,23 @@
if (result) {
$('#btnRestartServer').button('disable');
+ $('#btnShutdown').button('disable');
Dashboard.restartServer();
}
+ });
+ },
+
+ shutdown: function () {
+
+ Dashboard.confirm("Are you sure you wish to shutdown Media Browser Server?", "Shutdown", function (result) {
+
+ if (result) {
+ $('#btnRestartServer').button('disable');
+ $('#btnShutdown').button('disable');
+ ApiClient.shutdownServer();
+ }
+
});
}
};
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 446c86feca..f02972aa09 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -203,7 +203,7 @@
}
else if (item.Type == "Game") {
- html += '
';
}
else if (item.Type == "Episode") {
diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js
index fc09baa084..6c89f2a360 100644
--- a/dashboard-ui/scripts/search.js
+++ b/dashboard-ui/scripts/search.js
@@ -177,7 +177,7 @@
}
else {
- html += '
' + (hint.DisplayMediaType || hint.Type) + '
';
+ html += '
' + (hint.Type) + '
';
}
var text;
diff --git a/packages.config b/packages.config
index 3c44133450..3e9d964521 100644
--- a/packages.config
+++ b/packages.config
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file