Add avatar removal, tweaks to partials (#33)

Author: bennothommo

components/Account.php

@@ -444,6 +444,36 @@ public function onUpdate()
         $this->prepareVars();
     }
 
+    /**
+     * Removes the user's avatar if available.
+     *
+     * This will remove the user's avatar and default back to the Gravatar attached to the user's
+     * email address.
+     *
+     * @return void
+     */
+    public function onRemoveAvatar()
+    {
+        if (!$user = $this->user()) {
+            return;
+        }
+
+        if (!$user->avatar) {
+            Flash::info(Lang::get(/*Settings successfully saved!*/'winter.user::lang.account.no_avatar'));
+            return;
+        }
+
+        $user->avatar()->remove($user->avatar);
+
+        Flash::success(Lang::get(/*Settings successfully saved!*/'winter.user::lang.account.avatar_removed'));
+
+        $this->prepareVars();
+
+        // Force the avatar relationship to be removed even if User::getAvatarThumb()
+        // has stale references
+        $this->page['user']->setRelation('avatar', null);
+    }
+
     /**
      * Deactivate user
      */

components/account/deactivate_link.htm

@@ -7,17 +7,17 @@
 
 <a
     href="javascript:;"
-    onclick="toggleAccountDeactivateForm()">
+    onclick="toggleAccountDeactivateForm()"
+    class="deactivate"
+>
     Deactivate account
 </a>
 
 <div id="accountDeactivateForm" style="display: none">
     {{ form_ajax('onDeactivate') }}
-        <hr />
         <h3>Deactivate your account?</h3>
         <p>
-            Your account will be disabled and your details removed from the site.
-            You can reactivate your account any time by signing back in.
+            Your account will be disabled and your details removed from the site. You can reactivate your account any time by signing back in.
         </p>
         <div class="form-group">
             <label for="accountDeletePassword">To continue, please enter your password:</label>

components/account/default.htm

@@ -3,7 +3,6 @@
     <div class="row">
 
         <div class="col-md-6">
-            <h3>Sign in</h3>
             {% partial __SELF__ ~ '::signin' %}
         </div>
 

components/account/signin.htm

@@ -1,5 +1,6 @@
-{{ form_ajax('onSignin') }}
+<h3>Sign in</h3>
 
+{{ form_ajax('onSignin') }}
     <div class="form-group">
         <label for="userSigninLogin">{{ loginAttributeLabel }}</label>
         <input

components/account/update.htm

@@ -1,4 +1,6 @@
-{{ form_ajax('onUpdate') }}
+<h3>Profile</h3>
+
+{{ form_ajax('onUpdate', { flash: 1 }) }}
 
     <div class="form-group">
         <label for="accountName">Full Name</label>
@@ -20,6 +22,24 @@
         <input name="password_confirmation" type="password" class="form-control" id="accountPasswordConfirm">
     </div>
 
+    <div class="form-group">
+        <label for="accountAvatar">Display Picture</label>
+        <input
+            name="avatar"
+            type="file"
+            class="form-control"
+            id="accountAvatar"
+            accept="image/jpg, image/jpeg, image/png, image/gif, image/webp"
+            capture="user"
+        >
+
+        {% if user.avatar %}
+            <a href="javascript:;" data-request="onRemoveAvatar" data-request-flash class="remove-avatar">
+                Remove current display picture
+            </a>
+        {% endif %}
+    </div>
+
     {% if updateRequiresPassword %}
         <p>To change these details, please confirm your current password.</p>
         <div class="form-group">

lang/en/lang.php

@@ -197,7 +197,9 @@
         'new_password' => 'New Password',
         'new_password_confirm' => 'Confirm New Password',
         'update_requires_password' => 'Confirm password on update',
-        'update_requires_password_comment' => 'Require the current password of the user when changing their profile.'
+        'update_requires_password_comment' => 'Require the current password of the user when changing their profile.',
+        'no_avatar' => 'Your account has no display picture to remove.',
+        'avatar_removed' => 'Your display picture has been successfully removed.',
     ],
     'reset_password' => [
         'reset_password' => 'Reset Password',