From f6b4d0d57a8b67f9ceb74ffad04c1b7f0a8f4235 Mon Sep 17 00:00:00 2001 From: tms Date: Sat, 9 Feb 2013 22:33:07 -0500 Subject: [PATCH 1/3] Swap name / title in activity stream, link post number --- .../discourse/templates/user/stream.js.handlebars | 5 +++-- app/assets/stylesheets/application/user.css.scss | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars index fb280f331f8..36deec71ec6 100644 --- a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars @@ -4,9 +4,10 @@
{{avatar this imageSize="large" extraClasses="actor" avatarTemplatePath="avatar_template"}}
 {{date path="created_at" leaveAgo="true"}} - {{unbound name}}
+ {{unbound title}}
+ {{unbound name}} {{unbound description}} - #{{unbound post_number}} {{unbound title}} + #{{unbound post_number}}

{{{unbound excerpt}}} diff --git a/app/assets/stylesheets/application/user.css.scss b/app/assets/stylesheets/application/user.css.scss index f0320623b85..8a91c8377ec 100644 --- a/app/assets/stylesheets/application/user.css.scss +++ b/app/assets/stylesheets/application/user.css.scss @@ -241,10 +241,6 @@ color: lighten($black, 30%); } .item { - .post-number { - color: lighten($black, 40%); - margin-right: 4px; - } padding: 10px 8px; background-color: white; border: 1px solid #b9b9b9; @@ -266,7 +262,7 @@ float: left; margin-right: 10px; } - .name { + .title { display: inline-block; margin-bottom: 4px; font-size: 14px; From 9e653ad3700f435edc6852e4d8cfb114bcd26063 Mon Sep 17 00:00:00 2001 From: tms Date: Sat, 9 Feb 2013 23:44:03 -0500 Subject: [PATCH 2/3] Show "You" to same-user on activity stream items --- .../discourse/helpers/application_helpers.js.coffee | 7 ++++++- .../discourse/templates/user/stream.js.handlebars | 2 +- config/locales/en.yml | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee b/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee index 340285fccaa..3fa058a0a42 100644 --- a/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee +++ b/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee @@ -125,4 +125,9 @@ Handlebars.registerHelper 'date', (property, options) -> new Handlebars.SafeString("#{displayDate}") - +Handlebars.registerHelper 'personalizedName', (property, options) -> + name = Ember.Handlebars.get(this, property, options); + username = Ember.Handlebars.get(this, options.hash.usernamePath, options) if options.hash.usernamePath + + return name unless username == Discourse.get('currentUser.username') + return Em.String.i18n('you') diff --git a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars index 36deec71ec6..2b944292fa7 100644 --- a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars @@ -5,7 +5,7 @@

{{avatar this imageSize="large" extraClasses="actor" avatarTemplatePath="avatar_template"}}
{{date path="created_at" leaveAgo="true"}} {{unbound title}}
- {{unbound name}} + {{personalizedName name usernamePath="username"}} {{unbound description}} #{{unbound post_number}} diff --git a/config/locales/en.yml b/config/locales/en.yml index 372c3ca2eb7..51510682d4f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -435,6 +435,7 @@ en: show_more: "show more" links: Links faq: "FAQ" + you: "You" suggested_topics: title: "Suggested Topics" From 86d8326e307fe63c10487f32a7d40ec1ffeb438c Mon Sep 17 00:00:00 2001 From: tms Date: Sun, 10 Feb 2013 00:12:27 -0500 Subject: [PATCH 3/3] Allow forcing username as image title when generating avatar --- .../discourse/helpers/application_helpers.js.coffee | 3 ++- .../javascripts/discourse/templates/user/stream.js.handlebars | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee b/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee index 3fa058a0a42..269278afaeb 100644 --- a/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee +++ b/app/assets/javascripts/discourse/helpers/application_helpers.js.coffee @@ -60,12 +60,13 @@ Handlebars.registerHelper 'avatar', (user, options) -> user = Ember.Handlebars.get(this, user, options) if typeof user is 'string' username = Em.get(user, 'username') username ||= Em.get(user, options.hash.usernamePath) + title = Em.get(user, 'title') || Em.get(user, 'description') unless options.hash.ignoreTitle new Handlebars.SafeString Discourse.Utilities.avatarImg( size: options.hash.imageSize extraClasses: Em.get(user, 'extras') || options.hash.extraClasses username: username - title: Em.get(user, 'title') || Em.get(user, 'description') || username + title: title || username avatarTemplate: Ember.get(user, 'avatar_template') || options.hash.avatarTemplate ) diff --git a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars index 2b944292fa7..6fa60aa59b7 100644 --- a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars @@ -2,7 +2,7 @@ {{#collection contentBinding="stream" itemClass="item"}} {{#with view.content}}
-
{{avatar this imageSize="large" extraClasses="actor" avatarTemplatePath="avatar_template"}}
 +
{{avatar this imageSize="large" extraClasses="actor" avatarTemplatePath="avatar_template" ignoreTitle="true"}}
 {{date path="created_at" leaveAgo="true"}} {{unbound title}}
{{personalizedName name usernamePath="username"}}