From ca0d6382e67f338bfc6473ac3c892882d9da8abe Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 12 Jun 2019 22:38:37 -0600 Subject: [PATCH] Update settings, move disable/delete to Security Settings --- resources/views/settings/home.blade.php | 24 +++-------------- resources/views/settings/security.blade.php | 26 +++++++++++++++++++ .../views/site/help/your-profile.blade.php | 8 ++++-- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/resources/views/settings/home.blade.php b/resources/views/settings/home.blade.php index 181f21c46..6c13dc5a3 100644 --- a/resources/views/settings/home.blade.php +++ b/resources/views/settings/home.blade.php @@ -63,7 +63,7 @@

-
+

Private Information

@@ -79,7 +79,7 @@

-
+

Storage Usage

@@ -98,30 +98,12 @@
-
-

Layout

-
-
Experimental features have been moved to the Labs settings page.
- @if(config('pixelfed.account_deletion') == true) -
-
- Temporarily Disable Account - -
-
-
-

- Delete Account -

- @else
-
- Temporarily Disable Account +
- @endif @endsection diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php index 5ebc6786c..00ce15689 100644 --- a/resources/views/settings/security.blade.php +++ b/resources/views/settings/security.blade.php @@ -26,6 +26,32 @@ @include('settings.security.log-panel') @include('settings.security.device-panel') + + @if(config('pixelfed.account_deletion') == true) +

Danger Zone

+
+
    +
  • +
    +

    Temporarily Disable Account

    +

    Disable your account to hide your posts until next log in.

    +
    +
    + Disable +
    +
    • +
  • +
    +

    Delete this Account

    +

    Once you delete your account, there is no going back. Please be certain.

    +
    +
    + Delete +
    +
    • +
+
+ @endif @endsection \ No newline at end of file diff --git a/resources/views/site/help/your-profile.blade.php b/resources/views/site/help/your-profile.blade.php index 85bda6b32..76f1e7ebd 100644 --- a/resources/views/site/help/your-profile.blade.php +++ b/resources/views/site/help/your-profile.blade.php @@ -153,7 +153,9 @@
  1. Log into {{config('pixelfed.domain.app')}}
  2. Tap or click the menu and select Settings
    3. -
  3. Scroll down and click on the Temporarily Disable Account link.
    4. +
  4. Navigate to the Security Settings
    5. +
  5. Confirm your account password.
    6. +
  6. Scroll down to the Danger Zone section and click on the Disable button.
  7. Follow the instructions on the next page.
@@ -180,8 +182,10 @@

To permanently delete your account:

  1. Go to the Delete Your Account page. If you're not logged into pixelfed on the web, you'll be asked to log in first. You can't delete your account from within a mobile app.
    2. +
  2. Navigate to the Security Settings
  3. Confirm your account password.
    4. -
  4. On the Delete Your Account page click or tap on the Permanently Delete My Account button.
    5. +
  5. Scroll down to the Danger Zone section and click on the Delete button.
    6. +
  6. Follow the instructions on the next page.