missing bits from user page rediscovered
This commit is contained in:
parent
28d111d370
commit
4bd4e4e1c7
|
@ -34,9 +34,13 @@ Discourse.User = Discourse.Model.extend({
|
|||
@property websiteName
|
||||
@type {String}
|
||||
**/
|
||||
websiteName: (function() {
|
||||
websiteName: function() {
|
||||
return this.get('website').split("/")[2];
|
||||
}).property('website'),
|
||||
}.property('website'),
|
||||
|
||||
hasWebsite: function() {
|
||||
return this.present('website');
|
||||
}.property('website'),
|
||||
|
||||
/**
|
||||
Path to this user.
|
||||
|
@ -334,6 +338,7 @@ Discourse.User = Discourse.Model.extend({
|
|||
|
||||
onDetailsLoaded: function(callback){
|
||||
var _this = this;
|
||||
this.set("loading",false);
|
||||
|
||||
if(callback){
|
||||
this.onDetailsLoadedCallbacks = this.onDetailsLoadedCallbacks || [];
|
||||
|
@ -353,6 +358,7 @@ Discourse.User = Discourse.Model.extend({
|
|||
**/
|
||||
loadDetails: function() {
|
||||
|
||||
this.set("loading",true);
|
||||
// Check the preload store first
|
||||
var user = this;
|
||||
var username = this.get('username');
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
</ul>
|
||||
<div class='show'>
|
||||
<dl>
|
||||
{{#if content.website}}
|
||||
{{#if content.hasWebsite}}
|
||||
<dt>{{i18n user.website}}:</dt><dd><a {{bindAttr href="content.website"}} target="_blank">{{content.websiteName}}</a></dd>
|
||||
{{/if}}
|
||||
<dt>{{i18n user.created}}:</dt><dd>{{date content.created_at}}</dd>
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
{{#unless content.loading}}
|
||||
<div class="user-heading">
|
||||
<div class="container">
|
||||
<div class="full-width" id='user-menu'>
|
||||
|
@ -43,4 +44,4 @@
|
|||
<div class="container">
|
||||
{{outlet userOutlet}}
|
||||
</div>
|
||||
|
||||
{{/unless}}
|
||||
|
|
Loading…
Reference in New Issue