Combine the admin settings into one JS file so we watch less resources

Signed-off-by: Joas Schilling <coding@schilljs.com>

7 files changed, 58 insertions, 85 deletions

diff --git a/templates/settings/admin-settings.php b/templates/settings/admin-settings.php
new file mode 100644
index 000000000..f0a1d997b
--- /dev/null
+++ b/templates/settings/admin-settings.php
@@ -0,0 +1,58 @@
+<?php
+/** @var array $_ */
+/** @var \OCP\IL10N $l */
+script('spreed', ['admin-settings']);
+style('spreed', ['settings-admin']);
+?>
+
+<div id="admin_settings">
+	<div class="videocalls section" id="general_settings">
+		<h2><?php p($l->t('General settings')) ?></h2>
+	</div>
+
+	<div class="videocalls section" id="allowed_groups">
+		<h2><?php p($l->t('Limit to groups')) ?></h2>
+		<p class="settings-hint"><?php p($l->t('When at least one group is selected, only people of the listed groups can be part of conversations.')); ?></p>
+		<p class="settings-hint"><?php p($l->t('Guests can still join public conversations.')); ?></p>
+		<p class="settings-hint"><?php p($l->t('Users that can not use Talk anymore will still be listed as participants in their previous conversations and also their chat messages will be kept.')); ?></p>
+	</div>
+
+	<div class="videocalls section" id="chat_commands">
+		<h2><?php p($l->t('Commands')) ?></h2>
+		<p class="settings-hint"><?php p($l->t('Specify commands the users can use in chats')); ?></p>
+
+		<div class="commands">
+		</div>
+	</div>
+
+	<div id="stun_server" class="videocalls section">
+		<h2><?php p($l->t('STUN servers')) ?></h2>
+		<p class="settings-hint"><?php p($l->t('A STUN server is used to determine the public IP address of participants behind a router.')); ?></p>
+
+		<div class="stun-servers">
+		</div>
+	</div>
+
+	<div id="turn_server" class="videocalls section">
+		<h2><?php p($l->t('TURN server')) ?></h2>
+		<p class="settings-hint"><?php p($l->t('The TURN server is used to proxy the traffic from participants behind a firewall.')); ?></p>
+
+		<div class="turn-servers">
+		</div>
+	</div>
+
+	<div id="signaling_server" class="videocalls section">
+		<h2><?php p($l->t('Signaling servers')) ?></h2>
+		<p class="settings-hint"><?php p($l->t('An external signaling server can optionally be used for larger installations. Leave empty to use the internal signaling server.')) ?></p>
+
+		<div class="signaling-servers">
+		</div>
+
+		<div class="signaling-secret">
+			<h4><?php p($l->t('Shared secret')) ?></h4>
+			<input type="text" id="signaling_secret"
+				   name="signaling_secret" placeholder="<?php p($l->t('Shared secret')) ?>" aria-label="<?php p($l->t('Shared secret')) ?>"/>
+		</div>
+	</div>
+
+</div>
diff --git a/templates/settings/admin/allowed-groups.php b/templates/settings/admin/allowed-groups.php
deleted file mode 100644
index 1a50a918f..000000000
--- a/templates/settings/admin/allowed-groups.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-/** @var array $_ */
-/** @var \OCP\IL10N $l */
-script('spreed', ['admin/allowed-groups']);
-style('spreed', ['settings-admin']);
-?>
-
-<div class="videocalls section" id="allowed_groups">
-	<h2><?php p($l->t('Limit to groups')) ?></h2>
-	<p class="settings-hint"><?php p($l->t('When at least one group is selected, only people of the listed groups can be part of conversations.')); ?></p>
-	<p class="settings-hint"><?php p($l->t('Guests can still join public conversations.')); ?></p>
-	<p class="settings-hint"><?php p($l->t('Users that can not use Talk anymore will still be listed as participants in their previous conversations and also their chat messages will be kept.')); ?></p>
-</div>
diff --git a/templates/settings/admin/commands.php b/templates/settings/admin/commands.php
deleted file mode 100644
index 0b4814a98..000000000
--- a/templates/settings/admin/commands.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/** @var array $_ */
-/** @var \OCP\IL10N $l */
-script('spreed', ['admin/commands']);
-style('spreed', ['settings-admin']);
-?>
-
-<div class="videocalls section" id="chat_commands">
-	<h2><?php p($l->t('Commands')) ?></h2>
-	<p class="settings-hint"><?php p($l->t('Specify commands the users can use in chats')); ?></p>
-
-	<div class="commands">
-	</div>
-</div>
diff --git a/templates/settings/admin/general-settings.php b/templates/settings/admin/general-settings.php
deleted file mode 100644
index e135f2341..000000000
--- a/templates/settings/admin/general-settings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-/** @var array $_ */
-/** @var \OCP\IL10N $l */
-script('spreed', ['admin/general-settings']);
-style('spreed', ['settings-admin']);
-?>
-
-<div class="videocalls section" id="general_settings">
-	<h2><?php p($l->t('General settings')) ?></h2>
-</div>
diff --git a/templates/settings/admin/signaling-server.php b/templates/settings/admin/signaling-server.php
deleted file mode 100644
index a15938203..000000000
--- a/templates/settings/admin/signaling-server.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/** @var array $_ */
-/** @var \OCP\IL10N $l */
-script('spreed', ['admin/signaling-server']);
-style('spreed', ['settings-admin']);
-?>
-
-<div id="signaling_server" class="videocalls section">
-	<h2><?php p($l->t('Signaling servers')) ?></h2>
-	<p class="settings-hint"><?php p($l->t('An external signaling server can optionally be used for larger installations. Leave empty to use the internal signaling server.')) ?></p>
-
-	<div class="signaling-servers">
-	</div>
-
-	<div class="signaling-secret">
-		<h4><?php p($l->t('Shared secret')) ?></h4>
-		<input type="text" id="signaling_secret"
-			   name="signaling_secret" placeholder="<?php p($l->t('Shared secret')) ?>" aria-label="<?php p($l->t('Shared secret')) ?>"/>
-	</div>
-</div>
diff --git a/templates/settings/admin/stun-server.php b/templates/settings/admin/stun-server.php
deleted file mode 100644
index e21780352..000000000
--- a/templates/settings/admin/stun-server.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/** @var array $_ */
-/** @var \OCP\IL10N $l */
-script('spreed', ['admin/stun-server']);
-style('spreed', ['settings-admin']);
-?>
-
-<div id="stun_server" class="videocalls section">
-	<h2><?php p($l->t('STUN servers')) ?></h2>
-	<p class="settings-hint"><?php p($l->t('A STUN server is used to determine the public IP address of participants behind a router.')); ?></p>
-
-	<div class="stun-servers">
-	</div>
-</div>
diff --git a/templates/settings/admin/turn-server.php b/templates/settings/admin/turn-server.php
deleted file mode 100644
index 183a4d1fc..000000000
--- a/templates/settings/admin/turn-server.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/** @var array $_ */
-/** @var \OCP\IL10N $l */
-script('spreed', ['admin/turn-server']);
-style('spreed', ['settings-admin']);
-?>
-
-<div id="turn_server" class="videocalls section">
-	<h2><?php p($l->t('TURN server')) ?></h2>
-	<p class="settings-hint"><?php p($l->t('The TURN server is used to proxy the traffic from participants behind a firewall.')); ?></p>
-
-	<div class="turn-servers">
-	</div>
-</div>