From c8d903ec01ec8c0a961ddf491d39f187970678c4 Mon Sep 17 00:00:00 2001 From: Akash Manohar J Date: Mon, 19 May 2014 11:39:38 +0530 Subject: [PATCH 1/3] On users list page, seperate karma from user's name with parens --- app/views/users/_user.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user.html.haml b/app/views/users/_user.html.haml index 94dd0bb..b8f10e8 100644 --- a/app/views/users/_user.html.haml +++ b/app/views/users/_user.html.haml @@ -29,8 +29,9 @@ = user.first_name - if show_karma %span.karma - = number_with_delimiter user.karma - = user_karma_symbol + = surround '(', ')' do + = number_with_delimiter user.karma + = user_karma_symbol - if link_target = link_to link_target, link_options do = body From 3863583a8357dd5f0ab76a6d50dbe2e90c98e7fe Mon Sep 17 00:00:00 2001 From: Akash Manohar J Date: Mon, 19 May 2014 12:07:15 +0530 Subject: [PATCH 2/3] Seperate user's name from karma with parens, in header --- app/views/application/_header.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/application/_header.html.haml b/app/views/application/_header.html.haml index 8a7bd6c..344762a 100644 --- a/app/views/application/_header.html.haml +++ b/app/views/application/_header.html.haml @@ -53,8 +53,9 @@ = link_to path, title: s_('Tooltip|This is you!
Click here to see or edit your profile.
The number next to your name shows the "karma" points you can spend to vote on ideas. Gain more points as you participate!'), :'data-placement' => 'bottom' do %span.first-name= current_login.first_name %span.karma - %span.figure= number_with_delimiter current_user.karma - = user_karma_symbol + = surround '(', ')' do + %span.figure= number_with_delimiter current_user.karma + = user_karma_symbol = content_tag_with_path_checking(:li, controller: 'notifications', action: 'index', html: { class:'inbox', title: s_('Tooltip|Your number of unread notifications. Click to view them'), :'data-placement' => 'left' }) do |path| = link_to path, class: 'notifications' do - count = current_user.notifications.unread.count From edcc123f5543c934d79be0c36ec961a924625757 Mon Sep 17 00:00:00 2001 From: Akash Manohar J Date: Mon, 19 May 2014 12:14:47 +0530 Subject: [PATCH 3/3] Update version number of users/user partial to 9 --- app/views/users/_user.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_user.html.haml b/app/views/users/_user.html.haml index b8f10e8..f447159 100644 --- a/app/views/users/_user.html.haml +++ b/app/views/users/_user.html.haml @@ -4,7 +4,7 @@ -# link (boolean, default true) -# avatar (boolean or integer, default false) -# classes (string, default none) -= cached_fragment(disabled:false, resource:User, id:user.id, v:8, key:[user.login.updated_at, user.updated_at, *local_assigns.values_at(:name, :avatar, :karma, :classes, :link), can?(:read, user)]) do += cached_fragment(disabled:false, resource:User, id:user.id, v:9, key:[user.login.updated_at, user.updated_at, *local_assigns.values_at(:name, :avatar, :karma, :classes, :link), can?(:read, user)]) do :ruby show_avatar = !!local_assigns.fetch(:avatar, true)