diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index bc266de3c..a08df9c02 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -32,7 +32,6 @@
-Program data path:
@@ -74,7 +73,7 @@ -Logs:
+Images by name:
++ Log path: +
- +
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 79780cf06..c22ffcb79 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -326,7 +326,8 @@
$('#ports', page).html('Running on ports ' + port + ' and ' + dashboardInfo.SystemInfo.WebSocketPortNumber + '');
}
- $('#programDataPath', page).html(dashboardInfo.SystemInfo.ProgramDataPath);
+ $('#logPath', page).html(dashboardInfo.SystemInfo.LogPath);
+ $('#imagesByNamePath', page).html(dashboardInfo.SystemInfo.ItemsByNamePath);
var host = ApiClient.serverHostName();
diff --git a/dashboard-ui/scripts/logpage.js b/dashboard-ui/scripts/logpage.js
index bed60ac1f..e9e581932 100644
--- a/dashboard-ui/scripts/logpage.js
+++ b/dashboard-ui/scripts/logpage.js
@@ -2,9 +2,11 @@
onPageShow: function () {
+ var page = this;
+
LogPage.startLine = 0;
- $('#logContents', this).html('');
+ $('#logContents', page).html('');
$(ApiClient).on("websocketmessage", LogPage.onWebSocketMessage).on("websocketopen", LogPage.onWebSocketConnectionChange).on("websocketerror", LogPage.onWebSocketConnectionChange).on("websocketclose", LogPage.onWebSocketConnectionChange);
@@ -18,6 +20,12 @@
else if (autoScroll == "false") {
LogPage.updateAutoScroll(false);
}
+
+ ApiClient.getSystemInfo().done(function(systemInfo) {
+
+ $('#logPath', page).html(systemInfo.LogPath);
+
+ });
},
onPageHide: function () {
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 537f35874..a12a9d36e 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -503,20 +503,6 @@
var h264Codec = 'h264';
var h264AudioCodec = 'aac';
- if (videoStream && videoStream.Width && videoStream.Width <= baseParams.maxWidth) {
-
- var videoCodec = (videoStream.Codec || '').toLowerCase();
-
- if (videoCodec.indexOf('h264') != -1 &&
- videoStream.Width &&
- videoStream.Width <= 1280 &&
- videoStream.BitRate &&
- videoStream.BitRate <= 2000000) {
-
- //h264Codec = 'copy';
- }
- }
-
if (startPosition) {
baseParams.StartTimeTicks = startPosition;
}
@@ -541,12 +527,6 @@
timeStampOffsetMs: 0
}));
- var ogvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ogv', $.extend({}, baseParams, {
- videoCodec: 'theora',
- audioCodec: 'Vorbis'
- }));
-
-
var html = '';
var requiresControls = $.browser.msie || $.browser.android || ($.browser.webkit && !$.browser.chrome);
@@ -570,7 +550,6 @@
html += '