Alternative Multiavatar Approach (#2246)

* multiavatar support

* Update lang strings

* more generic description

blueprints.yaml

@@ -15,7 +15,7 @@ docs: https://github.com/getgrav/grav-plugin-admin/blob/develop/README.md
 license: MIT
 
 dependencies:
-    - { name: grav, version: '>=1.7.30' }
+    - { name: grav, version: '>=1.7.31' }
     - { name: form, version: '>=5.1.0' }
     - { name: login, version: '>=3.6.2' }
     - { name: email, version: '>=3.1.0' }

languages/en.yaml

@@ -1137,3 +1137,6 @@ PLUGIN_ADMIN:
   ACTIVATION_REQUIRED: "Activation required to configure"
   SESSION_SECURE_HTTPS: "Secure (HTTPS)"
   SESSION_SECURE_HTTPS_HELP: "Set session secure on HTTPS but not on HTTP. Has no effect if you have above Secure setting set to true. Set to false if your site jumps between HTTP and HTTPS."
+  AVATAR: "Avatar Generator"
+  AVATAR_HELP: "Multiavatar is a locally generated avatar.  Gravatar is an external service that uses your email address to pull a preconfigured Avatar remotely"
+  AVATAR_HASH: "NOTE: Optional Avatar custom 'hash' string"

themes/grav/css-compiled/template.css

@@ -2743,7 +2743,7 @@ table.noflex {
     font-size: 1.1rem;
     margin: 0;
     linep-height: 1.2; }
-  .user-details .gravatar {
+  .user-details .avatar {
     font-size: 0.9rem;
     padding: 0; }
   @media only all and (max-width: 47.938em) {

themes/grav/scss/template/_admin.scss

@@ -1114,7 +1114,7 @@ body.sidebar-quickopen #admin-main {
         linep-height: 1.2;
     }
 
-    .gravatar {
+    .avatar {
         font-size: 0.9rem;
         padding: 0;
     }

themes/grav/templates/partials/nav-user-avatar.html.twig

@@ -1,2 +1,2 @@
 {% set user_avatar = admin.user.getAvatarUrl() %}
-<img src="{{ ('?' not in user_avatar) and (not user_avatar starts with 'data:') ? user_avatar ~ '?s=80' : user_avatar }}" />
+<img src="{{ user_avatar ~ '?s=80' }}" />

themes/grav/templates/partials/userinfo-avatar-credit.html.twig

@@ -1 +1,10 @@
-<p class="gravatar">{{ "PLUGIN_ADMIN.AVATAR_BY"|t }} <a href="https://gravatar.com" target="_blank" rel="noopener noreferrer">gravatar.com</a>. {{ "PLUGIN_ADMIN.AVATAR_UPLOAD_OWN"|t }}</p>
+<p class="avatar">
+{{ "PLUGIN_ADMIN.AVATAR_BY"|t }}
+
+{% if config.system.accounts.avatar == 'gravatar '%}
+<a href="https://gravatar.com" target="_blank" rel="noopener noreferrer">gravatar.com</a>.
+{% else  %}
+<a href="https://multiavatar.com/" target="_blank" rel="noopener noreferrer">Multiavatar</a>.
+{% endif %}
+
+{{ "PLUGIN_ADMIN.AVATAR_UPLOAD_OWN"|t }}</p>

themes/grav/templates/partials/userinfo-avatar.html.twig

@@ -1,5 +1,2 @@
-{% if data.avatar %}
-    <label><img src="{{ data.getAvatarUrl() }}" /></label>
-{% else %}
-    <label><img referrerpolicy="no-referrer" src="https://www.gravatar.com/avatar/{{ data.email|md5 }}?s=200" /></label>
-{% endif %}
+{% set user_avatar = data.getAvatarUrl() %}
+<label><img referrerpolicy="no-referrer" src="{{ user_avatar ~ '?s=200' }}" /></label>