style: Fixed User panel avatar icon when OpenId account

roadiz · May 14, 2024 · 5829df7 · 5829df7
1 parent e9dc229
commit 5829df7
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 14 deletions.
diff --git a/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less b/lib/Rozier/src/Resources/app/less/panels/user_panel/user_panel.less
@@ -216,7 +216,7 @@
 }
 
 #user-picture {
-    display: block;
+    display: flex;
     width: @user-picture-size;
     height: @user-picture-size;
     border-radius: 50%;
@@ -239,7 +239,11 @@
             padding: 0px;
         }
     }
+    .uk-icon {
+        color: rgba(255, 255, 255, 0.5);
+    }
     &:hover  {
+        text-decoration: none;
         border: 3px solid #333;
     }
 }

diff --git a/lib/Rozier/src/Resources/app/less/responsive/less-768.less b/lib/Rozier/src/Resources/app/less/responsive/less-768.less
@@ -88,7 +88,7 @@
                 top:0;
                 right:0;
                 width:60px;
-                height:@mobile-admin-menu-height;
+                height: @mobile-admin-menu-height;
                 background: var(--user-panel-color);
                 border-radius: 0;
                 border:0;
@@ -98,7 +98,7 @@
                     background: #3a3a3a;
                 }
 
-                img{
+                img {
                     position: absolute;
                     width:38px;
                     height:38px;
@@ -107,6 +107,10 @@
                     border-radius: (@user-picture-size / 2)+5px;
                     border: 3px solid var(--user-panel-color);
                 }
+
+                .uk-icon {
+                    color: rgba(255, 255, 255, 0.5);
+                }
             }
 
             .uk-icon-button{

diff --git a/lib/Rozier/src/Resources/views/panels/user_panel.html.twig b/lib/Rozier/src/Resources/views/panels/user_panel.html.twig
@@ -12,20 +12,26 @@
         {% if app.user and app.user.id %}
             <a id="user-picture"
                data-uk-tooltip="{animation:true}"
+               class="user-image"
                title="{{ app.user.identifier }}"
                href="{{ path('usersEditPage', {'id':app.user.id }) }}"
             >
-                <img width="200"
-                     height="200"
-                     class="uk-thumbnail"
-                     src="{{ app.user.pictureUrl }}"
-                     alt="{{ app.user.identifier }}" />
+                {% if app.user.pictureUrl and app.user.pictureUrl != '#' %}
+                    <img width="200"
+                         height="200"
+                         class="uk-thumbnail"
+                         src="{{ app.user.pictureUrl }}"
+                         alt="{{ app.user.identifier }}" />
+                {% else %}
+                    <i class="uk-icon uk-icon-rz-user"></i>
+                {% endif %}
             </a>
         {% elseif app.user %}
             {% set displayName = app.user.nickname|default(app.user.givenName|default(app.user.name)) %}
             {% if app.user.picture %}
                 <span
                     id="user-picture"
+                    class="user-image"
                     title="{{ displayName }}"
                     data-uk-tooltip="{animation:true}"
                 >
@@ -35,6 +41,14 @@
                          src="{{ app.user.picture }}"
                          alt="{{ displayName }}" />
                 </span>
+            {% else %}
+                <span
+                    id="user-picture"
+                    title="{{ displayName }}"
+                    class="user-image uk-thumbnail"
+                    data-uk-tooltip="{animation:true}">
+                    <i class="uk-icon uk-icon-rz-user"></i>
+                </span>
             {% endif %}
         {% endif %}
         <nav class="user-actions">

diff --git a/lib/Rozier/src/Resources/views/partials/js-inject.html.twig b/lib/Rozier/src/Resources/views/partials/js-inject.html.twig
@@ -1,5 +1,5 @@
 
-<script src="{{ asset('js/vendor.72bd4c36693d4d803a4f.js', 'Rozier') }}" defer type="text/javascript"></script>
+<script src="{{ asset('js/vendor.7684c7e9756056051651.js', 'Rozier') }}" defer type="text/javascript"></script>
 
-<script src="{{ asset('js/app.72bd4c36693d4d803a4f.js', 'Rozier') }}" defer type="text/javascript"></script>
+<script src="{{ asset('js/app.7684c7e9756056051651.js', 'Rozier') }}" defer type="text/javascript"></script>
 
diff --git a/lib/Rozier/src/Resources/views/partials/simple-js-inject.html.twig b/lib/Rozier/src/Resources/views/partials/simple-js-inject.html.twig
@@ -1,3 +1,3 @@
 
-<script src="{{ asset('js/simple.72bd4c36693d4d803a4f.js', 'Rozier') }}" defer type="text/javascript"></script>
+<script src="{{ asset('js/simple.7684c7e9756056051651.js', 'Rozier') }}" defer type="text/javascript"></script>
 
diff --git a/lib/Rozier/src/static/css/app.892de7354f4b82eed554.css b/lib/Rozier/src/static/css/app.892de7354f4b82eed554.css
diff --git a/lib/Rozier/src/static/css/app.892de7354f4b82eed554.css.map b/lib/Rozier/src/static/css/app.892de7354f4b82eed554.css.map
diff --git a/lib/Rozier/src/static/css/vendor.9b59501e29a05f532c3c.css.map b/lib/Rozier/src/static/css/vendor.9b59501e29a05f532c3c.css.map
diff --git a/...src/static/js/app.72bd4c36693d4d803a4f.js → ...src/static/js/app.7684c7e9756056051651.js b/...src/static/js/app.72bd4c36693d4d803a4f.js → ...src/static/js/app.7684c7e9756056051651.js
diff --git a/.../static/js/simple.72bd4c36693d4d803a4f.js → .../static/js/simple.7684c7e9756056051651.js b/.../static/js/simple.72bd4c36693d4d803a4f.js → .../static/js/simple.7684c7e9756056051651.js
diff --git a/.../static/js/vendor.72bd4c36693d4d803a4f.js → .../static/js/vendor.7684c7e9756056051651.js b/.../static/js/vendor.72bd4c36693d4d803a4f.js → .../static/js/vendor.7684c7e9756056051651.js
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,3 @@

		<script src="{{ asset('js/simple.72bd4c36693d4d803a4f.js', 'Rozier') }}" defer type="text/javascript"></script>
		<script src="{{ asset('js/simple.7684c7e9756056051651.js', 'Rozier') }}" defer type="text/javascript"></script>