From f34ff67f587d2219d72f10ee155be0237c694e98 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Tue, 15 Dec 2020 15:43:19 +0100
Subject: [PATCH] Move label for VPN at beginning

---
 .../htdocs/luci-static/resources/view/services/dsvpn.js    | 6 +++---
 .../luci-static/resources/view/services/glorytun-tcp.js    | 6 +++---
 .../luci-static/resources/view/services/glorytun-udp.js    | 7 ++++---
 .../htdocs/luci-static/resources/view/services/mlvpn.js    | 6 +++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/luci-app-dsvpn/htdocs/luci-static/resources/view/services/dsvpn.js b/luci-app-dsvpn/htdocs/luci-static/resources/view/services/dsvpn.js
index 2f737b571..453a13836 100644
--- a/luci-app-dsvpn/htdocs/luci-static/resources/view/services/dsvpn.js
+++ b/luci-app-dsvpn/htdocs/luci-static/resources/view/services/dsvpn.js
@@ -31,6 +31,9 @@ return L.view.extend({
 		o = s.option(form.Flag, 'enable', _('Enabled'));
 		o.default = o.enabled;
 
+		o = s.option(form.Value, 'label', _('Label'));
+		o.rmempty = true;
+
 		o = s.option(form.ListValue, 'mode', _('Mode'));
 		o.value('client',_('Client'));
 		o.value('server',_('Server'));
@@ -58,9 +61,6 @@ return L.view.extend({
 		o.datatype = 'or(ip4addr,ip6addr)';
 		o.rmempty = false;
 
-		o = s.option(form.Value, 'label', _('Label'));
-		o.rmempty = true;
-
 		return m.render();
 	}
 });
diff --git a/luci-app-glorytun-tcp/htdocs/luci-static/resources/view/services/glorytun-tcp.js b/luci-app-glorytun-tcp/htdocs/luci-static/resources/view/services/glorytun-tcp.js
index e4045f267..c8929e0fb 100644
--- a/luci-app-glorytun-tcp/htdocs/luci-static/resources/view/services/glorytun-tcp.js
+++ b/luci-app-glorytun-tcp/htdocs/luci-static/resources/view/services/glorytun-tcp.js
@@ -34,6 +34,9 @@ return L.view.extend({
 		o = s.taboption('general', form.Flag, 'enable', _('Enabled'));
 		o.default = o.enabled;
 
+		o = s.taboption('general',form.Value, 'label', _('Label'));
+		o.rmempty = true;
+
 		o = s.taboption('general', form.ListValue, 'mode', _('Mode'));
 		o.value('',_('Client'));
 		o.value('listener',_('Server'));
@@ -79,9 +82,6 @@ return L.view.extend({
 		o.rmempty = false;
 		o.modalonly = true;
 
-		o = s.taboption('general',form.Value, 'label', _('Label'));
-		o.rmempty = true;
-
 		return m.render();
 	}
 });
diff --git a/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js b/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js
index 2975af525..73ecb401e 100644
--- a/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js
+++ b/luci-app-glorytun-udp/htdocs/luci-static/resources/view/services/glorytun-udp.js
@@ -42,6 +42,10 @@ return L.view.extend({
 		o = s.taboption('general', form.Flag, 'enable', _('Enabled'));
 		o.default = o.enabled;
 
+		o = s.taboption('general',form.Value, 'label', _('Label'));
+		o.rmempty = true;
+
+
 		o = s.taboption('general', form.ListValue, 'mode', _('Mode'));
 		o.value('to',_('Client'));
 		o.value('from',_('Server'));
@@ -96,9 +100,6 @@ return L.view.extend({
 		o.rmempty = false;
 		o.modalonly = true;
 
-		o = s.taboption('general',form.Value, 'label', _('Label'));
-		o.rmempty = true;
-
 		return m.render();
 	}
 });
diff --git a/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js b/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js
index 8dcfb422b..2d5258047 100644
--- a/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js
+++ b/luci-app-mlvpn/htdocs/luci-static/resources/view/services/mlvpn.js
@@ -34,6 +34,9 @@ return L.view.extend({
 		o = s.taboption('general', form.Flag, 'enable', _('Enabled'));
 		o.default = o.enabled;
 
+		o = s.taboption('general',form.Value, 'label', _('Label'));
+		o.rmempty = true;
+
 		o = s.taboption('general', form.ListValue, 'mode', _('Mode'));
 		o.value('client',_('Client'));
 		o.value('server',_('Server'));
@@ -75,9 +78,6 @@ return L.view.extend({
 		o.rmempty   = false;
 		o.modalonly = true;
 
-		o = s.taboption('general',form.Value, 'label', _('Label'));
-		o.rmempty = true;
-
 		return m.render();
 	}
 });