api update

res/static/res/script/DetailsWindow.js

@@ -22,11 +22,11 @@ var DetailsWindow = {
 				success: function(data){
 					$("#info_file_details").html(
 						"<table>"
-						+ "<tr><td>Name<td><td>" + escapeHTML(data.file_name) + "</td></tr>"
+						+ "<tr><td>Name<td><td>" + escapeHTML(data.name) + "</td></tr>"
 						+ "<tr><td>Url<td><td><a href=\"/u/" + data.id + "\">/u/" + data.id + "</a></td></tr>"
 						+ "<tr><td>Mime Type<td><td>" + escapeHTML(data.mime_type) + "</td></tr>"
 						+ "<tr><td>Id<td><td>" + data.id + "</td></tr>"
-						+ "<tr><td>Size<td><td class=\"bytecounter\">" + data.file_size + "</td></tr>"
+						+ "<tr><td>Size<td><td class=\"bytecounter\">" + data.size + "</td></tr>"
 						+ "<tr><td>Upload Date<td><td>" + data.date_upload + "</td></tr>"
 						+ "<tr><td>Description<td><td>" + escapeHTML(file.description) + "</td></tr>"
 						+ "</table>"
@@ -36,10 +36,10 @@ var DetailsWindow = {
 		} else {
 			$("#info_file_details").html(
 				"<table>"
-				+ "<tr><td>Name<td><td>" + escapeHTML(file.file_name) + "</td></tr>"
+				+ "<tr><td>Name<td><td>" + escapeHTML(file.name) + "</td></tr>"
 				+ "<tr><td>Mime Type<td><td>" + escapeHTML(file.mime_type) + "</td></tr>"
 				+ "<tr><td>Id<td><td>" + file.id + "</td></tr>"
-				+ "<tr><td>Size<td><td class=\"bytecounter\">" + file.file_size + "</td></tr>"
+				+ "<tr><td>Size<td><td class=\"bytecounter\">" + file.size + "</td></tr>"
 				+ "<tr><td>Upload Date<td><td>" + file.date_upload + "</td></tr>"
 				+ "</table>"
 			);

res/static/res/script/ListNavigator.js

@@ -127,7 +127,7 @@ var ListNavigator = {
 
 		for (i = startPos; i <= endPos; i++){
 			var thumb = "/api/file/" + this.data[i].id + "/thumbnail";
-			var name = this.data[i].file_name;
+			var name = this.data[i].name;
 
 			var itemHtml = escapeHTML(name) + "<br>"
 				+ "<img src=\"" + thumb + "\" "
@@ -144,8 +144,8 @@ var ListNavigator = {
 
 		$.each(data, function(i, item){
 			var filename;
-			if(item.file_name !== "null"){
-				filename = item.file_name;
+			if(item.name !== "null"){
+				filename = item.name;
 			}else{
 				filename = "Removed File";
 			}

res/static/res/script/Viewer.js

@@ -6,19 +6,19 @@ var Viewer = {
 	isList: false,
 	isFile: false,
 	initialized: false,
-	
+
 	init: function(type, data){
 		if(this.initialized){
 			return;
 		}
-		
+
 		// On small screens the toolbar takes too much space, so it collapses automatically
 		if($("#filepreview").width() < 400 && Toolbar.visible){
 			window.setTimeout(function(){
 				Toolbar.toggle();
 			}, 800);
 		}
-		
+
 		if(type === "file"){
 			this.isFile = true;
 			this.currentFile = data.id;
@@ -28,17 +28,17 @@ var Viewer = {
 			this.listId = data.id;
 			ListNavigator.init(data.data);
 		}
-		
+
 		this.initialized = true;
 	},
 	setFile: function(file){
 		this.currentFile = file.id;
-		document.title = file.file_name + " ~ PixelDrain";
-		
+		document.title = file.name + " ~ PixelDrain";
+
 		$.get("/u/" + file.id + "/preview", function(response){
 			$("#filepreview").html(response);
 		});
-		
+
 		DetailsWindow.setDetails(file);
 		Toolbar.setViews(file.views);
 	}
@@ -51,4 +51,4 @@ function escapeHTML(str) {
 		.replace(/</g, '&lt;')
 		.replace(/>/g, '&gt;')
 		.replace(/"/g, '&quot;');
-}
+}

res/static/res/script/history.js

@@ -50,8 +50,8 @@ function historyAddItem(json) {
 
 	var uploadItem =  '<a href="/u/'+ json.id +'" target="_blank" class="file_button">'
 		+ '<img src="'+ apiEndpoint + json.thumbnail_href + '"'
-		+ "alt=\"" + json.file_name + "\" />"
-		+ '<span style="color: var(--highlight_color);">'+json.file_name+'</span>'
+		+ "alt=\"" + json.name + "\" />"
+		+ '<span style="color: var(--highlight_color);">'+json.name+'</span>'
 		+ "<br/>"
 		+ date.getFullYear() + "-"
 		+ ("00" + (date.getMonth() + 1)).slice(-2) + "-"

res/static/res/style/layout.css

@@ -250,7 +250,7 @@ select{
 	border: none;
 	margin: 2px;
 	background: linear-gradient(var(--input_color), var(--input_color_dark));
-	padding: 6px 10px 6px 10px;
+	padding: 6px 8px 6px 8px;
 	box-shadow: 2px 2px 8px var(--shadow_color);
 	font-weight: bold;
 	font-size: 0.85em;