From 9cf730429ff58c2318a8e9eca7e0a25e5670a46e Mon Sep 17 00:00:00 2001
From: TimZ99 <TimZ99@users.noreply.github.com>
Date: Wed, 12 Aug 2020 20:42:06 +0200
Subject: [PATCH] Moved discord below Jabber

---
 src/templates/default/module/config/config.tpl.html | 10 +++++-----
 src/templates/default/module/user/profile.tpl.html  | 11 +++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/templates/default/module/config/config.tpl.html b/src/templates/default/module/config/config.tpl.html
index fa903af6..ffb36a54 100644
--- a/src/templates/default/module/config/config.tpl.html
+++ b/src/templates/default/module/config/config.tpl.html
@@ -17,11 +17,6 @@
                 aria-controls="config-sms" aria-selected="{% if sms_active %}true{% else %}false{% endif %}">{{
                 label_tab_sms }}</a>
         </li>
-        <li class="nav-item">
-            <a class="nav-link {{ discord_active }}" id="config-discord-tab" data-toggle="tab" href="#config-discord"
-               role="tab" aria-controls="config-discord" aria-selected="{% if discord_active %}true{% else %}false{% endif %}">{{
-                label_tab_discord }}</a>
-        </li>
         <li class="nav-item">
             <a class="nav-link {{ pushover_active }}" id="config-pushover-tab" data-toggle="tab" href="#config-pushover"
                 role="tab" aria-controls="config-pushover" aria-selected="{% if pushover_active %}true{% else %}false{% endif %}">{{
@@ -37,6 +32,11 @@
                role="tab" aria-controls="config-jabber" aria-selected="{% if jabber_active %}true{% else %}false{% endif %}">{{
             label_tab_jabber }}</a>
         </li>
+        <li class="nav-item">
+            <a class="nav-link {{ discord_active }}" id="config-discord-tab" data-toggle="tab" href="#config-discord" role="tab"
+                aria-controls="config-discord" aria-selected="{% if discord_active %}true{% else %}false{% endif %}">{{
+                        label_tab_discord }}</a>
+        </li>
         <li class="nav-item">
             <a class="nav-link {{ webhook_active }}" id="config-webhook-tab" data-toggle="tab" href="#config-webhook" role="tab"
                 aria-controls="config-webhook" aria-selected="{% if webhook_active %}true{% else %}false{% endif %}">{{
diff --git a/src/templates/default/module/user/profile.tpl.html b/src/templates/default/module/user/profile.tpl.html
index 9e8f1ddd..3cb8f315 100644
--- a/src/templates/default/module/user/profile.tpl.html
+++ b/src/templates/default/module/user/profile.tpl.html
@@ -28,12 +28,6 @@
 		<!-- pushover device -->
 		{{ macro.input_field("text", "pushover_device", null, "pushover_device", label_pushover_device, pushover_device, label_pushover_device, "255", "pushover_device_help", label_pushover_device_description) }}
 	</fieldset>
-    <!-- Discord settings -->
-    <fieldset>
-        <legend>{{ label_discord }}</legend>
-        <p>{{ label_discord_description|raw }}</p>
-		{{ macro.input_field("text", "discord", null, "discord", label_discord, discord, label_discord, "255", "discord_help", discord_description) }}
-    </fieldset>
 	<!-- Telegram settings -->
 	<fieldset>
         <legend>{{ label_telegram }}</legend>
@@ -52,6 +46,11 @@
 		<!-- jabber -->
 		{{ macro.input_field("text", "jabber", null, "jabber", label_jabber, jabber, label_jabber, "255", "jabber_help", label_jabber_description) }}
     </fieldset>
+    <!-- Discord settings -->
+    <fieldset>
+        <legend>{{ label_discord }}</legend>
+        {{ macro.input_field("text", "discord", null, "discord", label_discord, discord, "https://discordapp.com/api/webhooks/xxxxx", "255", "discord_help", label_discord_description) }}
+    </fieldset>
     <!-- Webhook settings -->
     <fieldset>
         <legend>{{ label_webhook }}</legend>