Update settings, move disable/delete to Security Settings

resources/views/settings/home.blade.php

@@ -63,7 +63,7 @@
         </p>
       </div>
     </div>
-    <div class="pt-5">
+    <div class="pt-3">
       <p class="font-weight-bold text-muted text-center">Private Information</p>
     </div>
     <div class="form-group row">
@@ -79,7 +79,7 @@
         </p>
       </div>
     </div>
-    <div class="pt-5">
+    <div class="pt-3">
       <p class="font-weight-bold text-muted text-center">Storage Usage</p>
     </div>
     <div class="form-group row">
@@ -98,30 +98,12 @@
         </div>
       </div>
     </div>
-    <div class="pt-5">
-      <p class="font-weight-bold text-muted text-center">Layout</p>
-    </div>
-    <div class="alert alert-primary font-weight-bold text-center">Experimental features have been moved to the <a href="/settings/labs">Labs</a> settings page.</div>
     <hr>
-    @if(config('pixelfed.account_deletion') == true)
-    <div class="form-group row py-3">
-      <div class="col-12 d-flex align-items-center justify-content-between">
-        <a class="font-weight-bold" href="{{route('settings.remove.temporary')}}">Temporarily Disable Account</a>
-        <button type="submit" class="btn btn-primary font-weight-bold float-right">Submit</button>
-      </div>
-    </div>
-    <hr>
-    <p class="mb-0 text-center pt-4">
-      <a class="font-weight-bold text-danger" href="{{route('settings.remove.permanent')}}">Delete Account</a>
-    </p>
-    @else
     <div class="form-group row">
-      <div class="col-12 d-flex align-items-center justify-content-between">
+      <div class="col-12 text-right">
-        <a class="font-weight-bold" href="{{route('settings.remove.temporary')}}">Temporarily Disable Account</a>
         <button type="submit" class="btn btn-primary font-weight-bold float-right">Submit</button>
       </div>
     </div>
-    @endif
   </form>
 
 @endsection

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)
+    <h4 class="font-weight-bold pt-3">Danger Zone</h4>
+    <div class="mb-4 border rounded border-danger">
+      <ul class="list-group mb-0 pb-0">
+        <li class="list-group-item border-left-0 border-right-0 py-3 d-flex justify-content-between">
+          <div>
+            <p class="font-weight-bold mb-1">Temporarily Disable Account</p>
+            <p class="mb-0 small">Disable your account to hide your posts until next log in.</p>
+          </div>
+          <div>
+            <a class="btn btn-outline-danger font-weight-bold py-1" href="{{route('settings.remove.temporary')}}">Disable</a>
+          </div>
+        </li>
+        <li class="list-group-item border-left-0 border-right-0 py-3 d-flex justify-content-between">
+          <div>
+            <p class="font-weight-bold mb-1">Delete this Account</p>
+            <p class="mb-0 small">Once you delete your account, there is no going back. Please be certain.</p>
+          </div>
+          <div>
+            <a class="btn btn-outline-danger font-weight-bold py-1" href="{{route('settings.remove.permanent')}}">Delete</a>
+          </div>
+        </li>
+      </ul>
+    </div>
+    @endif
   </section>
 
 @endsection

resources/views/site/help/your-profile.blade.php

@@ -153,7 +153,9 @@
         <ol class="">
           <li>Log into <a href="{{config('app.url')}}">{{config('pixelfed.domain.app')}}</a></li>
           <li>Tap or click the <i class="far fa-user text-dark"></i> menu and select <span class="font-weight-bold text-dark"><i class="fas fa-cog pr-1"></i> Settings</span></li>
-          <li>Scroll down and click on the <span class="font-weight-bold">Temporarily Disable Account</span> link.</li>
+          <li>Navigate to the <a href="{{route('settings.security')}}">Security Settings</a></li>
+          <li>Confirm your account password.</li>
+          <li>Scroll down to the Danger Zone section and click on the <span class="btn btn-sm btn-outline-danger py-1 font-weight-bold">Disable</span> button.</li>
           <li>Follow the instructions on the next page.</li>
         </ol>
       </div>
@@ -180,8 +182,10 @@
         <p>To permanently delete your account:</p>
         <ol class="">
           <li>Go to <a href="{{route('settings.remove.permanent')}}">the <span class="font-weight-bold">Delete Your Account</span> page</a>.  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.</li>
+          <li>Navigate to the <a href="{{route('settings.security')}}">Security Settings</a></li>
           <li>Confirm your account password.</li>
-          <li>On the <span class="font-weight-bold">Delete Your Account</span> page click or tap on the <span>Permanently Delete My Account</span> button.</li>
+          <li>Scroll down to the Danger Zone section and click on the <span class="btn btn-sm btn-outline-danger py-1 font-weight-bold">Delete</span> button.</li>
+          <li>Follow the instructions on the next page.</li>
         </ol>
       </div>
     </div>