From 91c20ceca53747e8d1ea623b65460195322278c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Sat, 5 Dec 2020 14:45:58 -0500
Subject: [PATCH] fix: #9065, settings v2/v3 conflict

---
 public/src/admin/settings/api.js | 2 --
 src/views/admin/settings/api.tpl | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/public/src/admin/settings/api.js b/public/src/admin/settings/api.js
index d015d48679..e2a755ee6c 100644
--- a/public/src/admin/settings/api.js
+++ b/public/src/admin/settings/api.js
@@ -4,9 +4,7 @@ define('admin/settings/api', ['settings'], function (settings) {
 	var ACP = {};
 
 	ACP.init = function () {
-		const saveEl = $('#save');
 		settings.load('core.api', $('.core-api-settings'));
-		saveEl.off('click');	// override settingsv1 handling
 		$('#save').on('click', saveSettings);
 
 		$(window).on('action:settings.sorted-list.loaded', (ev, { element }) => {
diff --git a/src/views/admin/settings/api.tpl b/src/views/admin/settings/api.tpl
index 0f40fe9f2d..0a6a989054 100644
--- a/src/views/admin/settings/api.tpl
+++ b/src/views/admin/settings/api.tpl
@@ -1,5 +1,3 @@
-<!-- IMPORT admin/partials/settings/header.tpl -->
-
 <form role="form" class="core-api-settings">
 	<p class="lead">[[admin/settings/api:lead-text]]</p>
 	<p>[[admin/settings/api:intro]]</p>
@@ -37,4 +35,6 @@
 	</div>
 </form>
 
-<!-- IMPORT admin/partials/settings/footer.tpl -->
\ No newline at end of file
+<button id="save" class="floating-button mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
+	<i class="material-icons">save</i>
+</button>