From c3821c2070251a344a47c79322cf62ef0470d247 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 2 Sep 2015 11:21:25 -0400
Subject: [PATCH] Close #3540
---
public/src/admin/settings/general.js | 16 ++++++++++++++++
src/socket.io/admin.js | 4 ++++
src/views/admin/settings/general.tpl | 1 +
3 files changed, 21 insertions(+)
create mode 100644 public/src/admin/settings/general.js
diff --git a/public/src/admin/settings/general.js b/public/src/admin/settings/general.js
new file mode 100644
index 0000000000..6f3faeb8c7
--- /dev/null
+++ b/public/src/admin/settings/general.js
@@ -0,0 +1,16 @@
+"use strict";
+/* global define, socket */
+
+define('admin/settings/general', ['admin/settings'], function(Settings) {
+ var Module = {}
+
+ Module.init = function() {
+ $('button[data-action="removeLogo"]').on('click', function() {
+ socket.emit('admin.settings.removeLogo', function() {
+ app.alertSuccess('Logo removed');
+ });
+ });
+ };
+
+ return Module;
+});
diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js
index 00fea0c730..88ccde7224 100644
--- a/src/socket.io/admin.js
+++ b/src/socket.io/admin.js
@@ -207,6 +207,10 @@ SocketAdmin.settings.clearSitemapCache = function(socket, data, callback) {
callback();
};
+SocketAdmin.settings.removeLogo = function(socket, data, callback) {
+ db.setObjectField('config', 'brand:logo', '', callback);
+};
+
SocketAdmin.email.test = function(socket, data, callback) {
if (plugins.hasListeners('action:email.send')) {
emailer.send('test', socket.uid, {
diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl
index dec77abf77..2d04a9ad89 100644
--- a/src/views/admin/settings/general.tpl
+++ b/src/views/admin/settings/general.tpl
@@ -40,6 +40,7 @@
<input id="logoUrl" type="text" class="form-control" placeholder="Path to a logo to display on forum header" data-field="brand:logo" data-action="upload" data-target="logoUrl" data-route="{config.relative_path}/api/admin/uploadlogo" readonly />
<span class="input-group-btn">
<input data-action="upload" data-target="logoUrl" data-route="{config.relative_path}/api/admin/uploadlogo" type="button" class="btn btn-default" value="Upload"></input>
+ <button data-action="removeLogo" type="button" class="btn btn-default btn-danger"><i class="fa fa-times"></i></button>
</span>
</div>
</div>