[allura] 01/02: [#8304] Use higher resolution for user card avatar icon

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shalithasuranga pushed a commit to branch ss/8304
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 6006fb2621ace39ccc89ea61061b29bd5ce5ff53
Author: Shalitha Suranga <sh...@gmail.com>
AuthorDate: Wed Jun 19 22:21:53 2019 +0530

    [#8304] Use higher resolution for user card avatar icon
---
 Allura/allura/ext/user_profile/templates/user_card.html | 5 +++--
 Allura/allura/ext/user_profile/user_main.py             | 4 +---
 Allura/allura/tests/functional/test_user_profile.py     | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Allura/allura/ext/user_profile/templates/user_card.html b/Allura/allura/ext/user_profile/templates/user_card.html
index e862c37..3a3f924 100644
--- a/Allura/allura/ext/user_profile/templates/user_card.html
+++ b/Allura/allura/ext/user_profile/templates/user_card.html
@@ -16,12 +16,13 @@
        specific language governing permissions and limitations
        under the License.
 -#}
+{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
 <div class="user-card">
   <div class="card-left">
-    <img src="{{ img }}">
+    {{lib.gravatar(user, size=96)}}
   </div>
   <div class="card-right">
-    <div class="name">{{ name }}</div>
+    <div class="name">{{ user.display_name }}</div>
     {% if location %}
       <span class="subitem subitem-loc"><i class="fa fa-map-marker fa-fw"></i> {{ location }}</span><br/>
     {% endif %}
diff --git a/Allura/allura/ext/user_profile/user_main.py b/Allura/allura/ext/user_profile/user_main.py
index 7a80a2e..4a30276 100644
--- a/Allura/allura/ext/user_profile/user_main.py
+++ b/Allura/allura/ext/user_profile/user_main.py
@@ -221,9 +221,7 @@ class UserProfileController(BaseController, FeedController):
             website = webpages[0]
 
         return dict(
-            username=u.username,
-            img=u.icon_url(),
-            name=u.display_name,
+            user=u,
             location=location,
             website=website)
 
diff --git a/Allura/allura/tests/functional/test_user_profile.py b/Allura/allura/tests/functional/test_user_profile.py
index fb98de5..007ba3a 100644
--- a/Allura/allura/tests/functional/test_user_profile.py
+++ b/Allura/allura/tests/functional/test_user_profile.py
@@ -55,7 +55,7 @@ class TestUserProfile(TestController):
         user.set_pref('webpages', webpages)
         r = self.app.get('/u/test-admin/profile/user_card')
 
-        assert user.icon_url() == r.html.find('img').attrs['src']
+        assert user.icon_url() in r.html.find('img').attrs['src']
         assert user.display_name == r.html.find('div', attrs={'class': 'name'}).getText()
         assert user.get_pref('localization')['city'] in r.html.find('span', attrs={'class': 'subitem-loc'}).getText()
         assert user.get_pref('localization')['country'] in r.html.find('span', attrs={'class': 'subitem-loc'}).getText()