Revert "Where is your data?"

3 files changed, 5 insertions, 195 deletions

diff --git a/settings/templates/settings/admin/server-info.php b/settings/templates/settings/admin/server-info.php
deleted file mode 100644
index ac6cf48ee80..00000000000
--- a/settings/templates/settings/admin/server-info.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Michael Weimann <mail@michael-weimann.eu>
- *
- * @author Michael Weimann <mail@michael-weimann.eu>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * This file contains the server info settings template.
- */
-
-/** @var array $_ */
-
-?>
-
-<div class="section server-info-settings">
-	<h2><?php p($l->t('Server info')); ?></h2>
-	<p class="settings-hint">
-		<?php p($l->t('Enter common info about your Nextcloud instance here. These info are visible to all users.')) ?>
-	</p>
-	<form id="server-info-form" name="server-info-form">
-		<div class="margin-bottom">
-			<label class="label" for="location"><?php p($l->t('Server location')); ?></label>
-			<input
-				class="form-input"
-				id="location"
-				name="location"
-				type="text"
-				maxlength="100"
-				value="<?php p($_['location']); ?>"
-				placeholder="<?php p($l->t('country')); ?>">
-		</div>
-		<div>
-			<label class="label" for="provider"><?php p($l->t('Service provider')); ?></label>
-			<input
-				class="form-input"
-				id="provider"
-				name="provider"
-				type="text"
-				maxlength="100"
-				value="<?php p($_['provider']); ?>"
-				placeholder="<?php p($l->t('company or person')); ?>">
-		</div>
-		<div>
-			<label class="label" for="providerWebsite"><?php p($l->t('Provider website')); ?></label>
-			<input
-				class="form-input"
-				id="providerWebsite"
-				name="providerWebsite"
-				type="url"
-				maxlength="200"
-				value="<?php p($_['providerWebsite']); ?>"
-				placeholder="<?php p($l->t('link to website')); ?>">
-		</div>
-		<div class="margin-bottom">
-			<label class="label" for="providerPrivacyLink"><?php p($l->t('Link to privacy policy')); ?></label>
-			<input
-				class="form-input"
-				id="providerPrivacyLink"
-				name="providerPrivacyLink"
-				type="url"
-				maxlength="200"
-				value="<?php p($_['providerPrivacyLink']); ?>"
-				placeholder="<?php p($l->t('link to privacy policy')); ?>">
-		</div>
-		<div class="margin-bottom">
-			<label class="label" for="adminContact"><?php p($l->t('Admin contact')); ?></label>
-			<select class="form-input" name="adminContact" id="adminContact">
-				<option value=""><?php p($l->t('choose admin contact')); ?></option>
-				<?php foreach($_['adminUsers'] as $adminUser): ?>
-					<option
-						value="<?php p($adminUser['id']); ?>"
-						<?php if ($adminUser['id'] === $_['adminContact']): ?>selected="selected"<?php endif; ?>>
-						<?php p($adminUser['displayName']); ?>
-					</option>
-				<?php endforeach; ?>
-			</select>
-		</div>
-		<div class="form-actions">
-			<button id="server-info-submit-button" class="button">
-				<span class="default-label">
-					<?php p($l->t('save')); ?>
-				</span>
-				<span class="working-label">
-					<span class="icon-loading-small-dark"></span>
-					<?php p($l->t('saving')); ?>
-				</span>
-				<span class="success-label">
-					<span class="icon-checkmark-white"></span>
-					<?php p($l->t('saved')); ?>
-				</span>
-				<span class="error-label">
-					<span class="icon-error-white"></span>
-					<?php p($l->t('error saving settings')); ?>
-				</span>
-			</button>
-		</div>
-	</form>
-</div>
diff --git a/settings/templates/settings/personal/partials/where-is-your-data.php b/settings/templates/settings/personal/partials/where-is-your-data.php
deleted file mode 100644
index 56f261f9c00..00000000000
--- a/settings/templates/settings/personal/partials/where-is-your-data.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<div class="personal-settings-setting-box personal-settings-group-box section where-is-your-data">
-	<h3>
-		<?php p($l->t('Where is your data?')); ?>
-		<a
-			target="_blank"
-			rel="noreferrer noopener"
-			class="icon-info"
-			title=""
-			href="https://nextcloud.com/yourdata/"
-			data-original-title="Open documentation"></a>
-	</h3>
-	<?php if (empty($_['dataLocation']) === false): ?>
-	<div class="personal-info icon-address">
-		<p>
-			<?php echo $l->t('Your data is located in <b>%s</b>.', [$_['dataLocation']]); ?>
-		</p>
-	</div>
-	<?php endif; ?>
-
-	<?php if (empty($_['provider']) === false): ?>
-	<div class="personal-info icon-home">
-		<p>
-			<?php
-				if (empty($_['providerLink']) === false) {
-					echo $l->t('Your provider is %s%s%s.', [
-						'<a href="' . $_['providerLink'] . '" target="_blank" title="" rel="noreferrer noopener">',
-						$_['provider'],
-						'</a>'
-					]);
-				} else {
-					echo $l->t('Your provider is %s.', [$_['provider']]);
-				}
-			?>
-			<?php
-				if (empty($_['providerPrivacyLink']) === false) {
-					echo $l->t('Read the %sprivacy policy%s now.', [
-						'<a href="' . $_['providerPrivacyLink'] . '" target="_blank" title="" rel="noreferrer noopener">',
-						'</a>'
-					]);
-				}
-			?>
-		</p>
-	</div>
-	<?php endif; ?>
-
-	<?php if ($_['encryptionEnabled'] === true): ?>
-		<div class="personal-info icon-password">
-			<p>
-				<?php echo $l->t(
-					'Your files are encrypted with %sserver side encryption%s.',
-					[
-						'<a href="https://nextcloud.com/blog/encryption-in-nextcloud/" target="_blank" title="" rel="noreferrer noopener">',
-						'</a>'
-					]
-				); ?>
-			</p>
-		</div>
-	<?php endif; ?>
-
-	<?php if (empty($_['adminName']) === false): ?>
-	<div class="personal-info icon-user-admin">
-		<p>
-			<?php echo $l->t(
-				'%s%s%s is your admin. If you have any issues, %scontact them%s.',
-				[
-					'<a href="mailto:' . $_['adminMail'] . '" target="_blank" title="" rel="noreferrer noopener">',
-					$_['adminName'],
-					'</a>',
-					'<a href="mailto:' . $_['adminMail'] . '" target="_blank" title="" rel="noreferrer noopener">',
-					'</a>'
-				]
-			); ?>
-		</p>
-	</div>
-	<?php endif; ?>
-</div>
diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php
index a6e3eaf345b..d873f6821b8 100644
--- a/settings/templates/settings/personal/personal.info.php
+++ b/settings/templates/settings/personal/personal.info.php
@@ -95,11 +95,6 @@ script('settings', [
 				<progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
 			</div>
 		</div>
-		<?php
-			if ($_['show_where_is_your_data_section']) {
-				include __DIR__ . '/partials/where-is-your-data.php';
-			}
-		?>
 	</div>
 
 	<div class="personal-settings-container">
@@ -380,4 +375,9 @@ script('settings', [
 		</div>
 		<span class="msg"></span>
 	</div>
+
+	<div id="personal-settings-group-container">
+
+	</div>
+
 </div>