diff --git a/init/init.go b/init/init.go index e3fb945..30fb6e2 100644 --- a/init/init.go +++ b/init/init.go @@ -50,6 +50,7 @@ maintenance_mode = false // Init initializes the Pixeldrain Web UI controllers func Init(r *httprouter.Router, prefix string, setLogLevel bool) { + log.Colours = true log.Info("Starting web UI server (PID %v)", os.Getpid()) // Seed the RNG diff --git a/res/include/script/file_viewer/viewer_scripts/AudioViewer.js b/res/include/script/file_viewer/viewer_scripts/AudioViewer.js index 0e24492..4512d59 100644 --- a/res/include/script/file_viewer/viewer_scripts/AudioViewer.js +++ b/res/include/script/file_viewer/viewer_scripts/AudioViewer.js @@ -1,7 +1,7 @@ function AudioViewer(viewer, file, next) { this.viewer = viewer - this.file = file - this.next = next + this.file = file + this.next = next this.container = document.createElement("div") this.container.classList = "image-container" @@ -17,10 +17,12 @@ function AudioViewer(viewer, file, next) { this.container.appendChild(document.createElement("br")) this.element = document.createElement("audio") - this.element.autoplay = "autoplay" this.element.controls = "controls" this.element.style.width = "90%" this.element.addEventListener("ended", () => { this.next() }, false) + if (!embeddedViewer) { + this.element.autoplay = "autoplay" + } this.source = document.createElement("source") this.source.src = this.file.get_href @@ -28,6 +30,6 @@ function AudioViewer(viewer, file, next) { this.container.appendChild(this.element) } -AudioViewer.prototype.render = function(parent) { +AudioViewer.prototype.render = function (parent) { parent.appendChild(this.container) } diff --git a/res/include/script/file_viewer/viewer_scripts/VideoViewer.js b/res/include/script/file_viewer/viewer_scripts/VideoViewer.js index c5ecf18..7a0e3f7 100644 --- a/res/include/script/file_viewer/viewer_scripts/VideoViewer.js +++ b/res/include/script/file_viewer/viewer_scripts/VideoViewer.js @@ -1,16 +1,18 @@ function VideoViewer(viewer, file, next) { this.viewer = viewer - this.file = file - this.next = next + this.file = file + this.next = next this.vidContainer = document.createElement("div") this.vidContainer.classList = "image-container" this.vidElement = document.createElement("video") - this.vidElement.autoplay = "autoplay" this.vidElement.controls = "controls" this.vidElement.classList = "center drop_shadow" this.vidElement.addEventListener("ended", () => { this.next() }, false) + if (!embeddedViewer) { + this.vidElement.autoplay = "autoplay" + } this.videoSource = document.createElement("source") this.videoSource.src = this.file.get_href @@ -19,6 +21,6 @@ function VideoViewer(viewer, file, next) { this.vidContainer.appendChild(this.vidElement) } -VideoViewer.prototype.render = function(parent) { +VideoViewer.prototype.render = function (parent) { parent.appendChild(this.vidContainer) } diff --git a/webcontroller/user_account.go b/webcontroller/user_account.go index 0799ee9..8d6a5c0 100644 --- a/webcontroller/user_account.go +++ b/webcontroller/user_account.go @@ -152,7 +152,7 @@ func (wc *WebController) loginForm(td *TemplateData, r *http.Request) (f Form) { f.FieldVal("username"), f.FieldVal("password"), ); err != nil { - log.Error("Error while logging in: %s", err) + log.Debug("Login failed: %s", err) formAPIError(err, &f) } else { // Request was a success