-
Last Played
+Last Watched
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index 6786b307..9a025348 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -171,10 +171,10 @@ DOCUMENTATION :: END
% endif
% if data['media_type'] == 'movie' or data['media_type'] == 'episode' or data['media_type'] == 'track':
- % if data['video_codec']:
+ % if data['media_type'] != 'track' and data['video_codec']:
% endif
- % if data['video_resolution']:
+ % if data['media_type'] != 'track' and data['video_resolution']:
% endif
% if data['audio_codec']:
diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index 5d82f90c..5eac0f22 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -54,7 +54,7 @@ function showMsg(msg,loader,timeout,ms,error) {
}
}
-function doAjaxCall(url,elem,reload,form) {
+function doAjaxCall(url, elem, reload, form, callback) {
// Set Message
feedback = $("#ajaxMsg");
update = $("#updatebar");
@@ -157,6 +157,9 @@ function doAjaxCall(url,elem,reload,form) {
complete: function(jqXHR, textStatus) {
// Remove loaders and stuff, ajax request is complete!
loader.remove();
+ if (typeof callback === "function") {
+ callback();
+ }
}
});
}
@@ -252,13 +255,13 @@ function isPrivateIP(ip_address) {
function humanTime(seconds) {
if (seconds >= 86400) {
- text = '' + Math.floor(moment.duration(seconds, 'seconds').asDays()) +
- '
days
' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) +
- '
hrs
' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
';
+ text = '' + Math.floor(moment.duration(seconds, 'seconds').asDays()) + '
days
' +
+ '' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + '
hrs
' +
+ '' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
';
return text;
} else if (seconds >= 3600) {
- text = '' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) +
- '
hrs
' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
';
+ text = '' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + '
hrs
' +
+ '' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
';
return text;
} else if (seconds >= 60) {
text = '' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
';
@@ -269,6 +272,25 @@ function humanTime(seconds) {
}
}
+function humanTimeClean(seconds) {
+ if (seconds >= 86400) {
+ text = Math.floor(moment.duration(seconds, 'seconds').asDays()) + ' days ' +
+ Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + ' hrs ' +
+ Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins';
+ return text;
+ } else if (seconds >= 3600) {
+ text = Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + ' hrs ' +
+ Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins';
+ return text;
+ } else if (seconds >= 60) {
+ text = Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins';
+ return text;
+ } else {
+ text = '0';
+ return text;
+ }
+}
+
String.prototype.toProperCase = function () {
return this.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
};
@@ -372,3 +394,16 @@ function clearSearchButton(tableName, table) {
table.search('').draw();
});
}
+
+// Taken from https://github.com/Hellowlol/HTPC-Manager
+window.onerror = function (message, file, line) {
+ var e = {
+ 'page': window.location.href,
+ 'message': message,
+ 'file': file,
+ 'line': line
+ };
+
+ $.post("log_js_errors", e, function (data) {
+ });
+};
\ No newline at end of file
diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js
index 377295ae..46844506 100644
--- a/data/interfaces/default/js/tables/libraries.js
+++ b/data/interfaces/default/js/tables/libraries.js
@@ -161,12 +161,28 @@ libraries_list_table_options = {
$(td).html('n/a');
}
},
- "width": "25%",
+ "width": "18%",
"className": "hidden-sm hidden-xs"
},
{
"targets": [9],
"data": "plays",
+ "createdCell": function (td, cellData, rowData, row, col) {
+ if (cellData !== null && cellData !== '') {
+ $(td).html(cellData);
+ }
+ },
+ "searchable": false,
+ "width": "7%"
+ },
+ {
+ "targets": [10],
+ "data": "duration",
+ "createdCell": function (td, cellData, rowData, row, col) {
+ if (cellData !== null && cellData !== '') {
+ $(td).html(humanTimeClean(cellData));
+ }
+ },
"searchable": false,
"width": "10%"
}
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index f7147a17..d1abb6c9 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -165,12 +165,28 @@ users_list_table_options = {
$(td).html('n/a');
}
},
- "width": "30%",
+ "width": "23%",
"className": "hidden-sm hidden-xs"
},
{
"targets": [8],
"data": "plays",
+ "createdCell": function (td, cellData, rowData, row, col) {
+ if (cellData !== null && cellData !== '') {
+ $(td).html(cellData);
+ }
+ },
+ "searchable": false,
+ "width": "7%"
+ },
+ {
+ "targets": [9],
+ "data": "duration",
+ "createdCell": function (td, cellData, rowData, row, col) {
+ if (cellData !== null && cellData !== '') {
+ $(td).html(humanTimeClean(cellData));
+ }
+ },
"searchable": false,
"width": "10%"
}
diff --git a/data/interfaces/default/libraries.html b/data/interfaces/default/libraries.html
index 1e99697c..41fc9825 100644
--- a/data/interfaces/default/libraries.html
+++ b/data/interfaces/default/libraries.html
@@ -2,6 +2,7 @@
<%def name="headIncludes()">
+
@@ -23,6 +24,7 @@
All Libraries
+
+
+
+
+ Timestamp
+ Level
+ Message
+
+
+
+
+
+
% endif
- % if data['video_resolution']:
+ % if data['media_type'] != 'track' and data['video_resolution']:
% endif
% if data['audio_codec']:
diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index 5d82f90c..5eac0f22 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -54,7 +54,7 @@ function showMsg(msg,loader,timeout,ms,error) {
}
}
-function doAjaxCall(url,elem,reload,form) {
+function doAjaxCall(url, elem, reload, form, callback) {
// Set Message
feedback = $("#ajaxMsg");
update = $("#updatebar");
@@ -157,6 +157,9 @@ function doAjaxCall(url,elem,reload,form) {
complete: function(jqXHR, textStatus) {
// Remove loaders and stuff, ajax request is complete!
loader.remove();
+ if (typeof callback === "function") {
+ callback();
+ }
}
});
}
@@ -252,13 +255,13 @@ function isPrivateIP(ip_address) {
function humanTime(seconds) {
if (seconds >= 86400) {
- text = '' + Math.floor(moment.duration(seconds, 'seconds').asDays()) + - '
days
' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + - '
hrs
' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
'; + text = '' + Math.floor(moment.duration(seconds, 'seconds').asDays()) + '
days
' + + '' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + '
hrs
' + + '' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
'; return text; } else if (seconds >= 3600) { - text = '' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + - '
hrs
' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
'; + text = '' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + '
hrs
' + + '' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
'; return text; } else if (seconds >= 60) { text = '' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '
mins
'; @@ -269,6 +272,25 @@ function humanTime(seconds) { } } +function humanTimeClean(seconds) { + if (seconds >= 86400) { + text = Math.floor(moment.duration(seconds, 'seconds').asDays()) + ' days ' + + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + ' hrs ' + + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins'; + return text; + } else if (seconds >= 3600) { + text = Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) + ' hrs ' + + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins'; + return text; + } else if (seconds >= 60) { + text = Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + ' mins'; + return text; + } else { + text = '0'; + return text; + } +} + String.prototype.toProperCase = function () { return this.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();}); }; @@ -372,3 +394,16 @@ function clearSearchButton(tableName, table) { table.search('').draw(); }); } + +// Taken from https://github.com/Hellowlol/HTPC-Manager +window.onerror = function (message, file, line) { + var e = { + 'page': window.location.href, + 'message': message, + 'file': file, + 'line': line + }; + + $.post("log_js_errors", e, function (data) { + }); +}; \ No newline at end of file diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js index 377295ae..46844506 100644 --- a/data/interfaces/default/js/tables/libraries.js +++ b/data/interfaces/default/js/tables/libraries.js @@ -161,12 +161,28 @@ libraries_list_table_options = { $(td).html('n/a'); } }, - "width": "25%", + "width": "18%", "className": "hidden-sm hidden-xs" }, { "targets": [9], "data": "plays", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + }, + "searchable": false, + "width": "7%" + }, + { + "targets": [10], + "data": "duration", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(humanTimeClean(cellData)); + } + }, "searchable": false, "width": "10%" } diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js index f7147a17..d1abb6c9 100644 --- a/data/interfaces/default/js/tables/users.js +++ b/data/interfaces/default/js/tables/users.js @@ -165,12 +165,28 @@ users_list_table_options = { $(td).html('n/a'); } }, - "width": "30%", + "width": "23%", "className": "hidden-sm hidden-xs" }, { "targets": [8], "data": "plays", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(cellData); + } + }, + "searchable": false, + "width": "7%" + }, + { + "targets": [9], + "data": "duration", + "createdCell": function (td, cellData, rowData, row, col) { + if (cellData !== null && cellData !== '') { + $(td).html(humanTimeClean(cellData)); + } + }, "searchable": false, "width": "10%" } diff --git a/data/interfaces/default/libraries.html b/data/interfaces/default/libraries.html index 1e99697c..41fc9825 100644 --- a/data/interfaces/default/libraries.html +++ b/data/interfaces/default/libraries.html @@ -2,6 +2,7 @@ <%def name="headIncludes()"> + @@ -23,6 +24,7 @@ All Libraries| Timestamp | +Level | +Message | +
|---|