Merge branch 'master' of github.com:designcreateplay/NodeBB

This commit is contained in:
Julian Lam
2014-01-08 21:25:11 -05:00
6 changed files with 86 additions and 26 deletions

View File

@@ -15,6 +15,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
var userData = {
uid: $('#inputUID').val(),
username: $('#inputUsername').val(),
email: $('#inputEmail').val(),
fullname: $('#inputFullname').val(),
website: $('#inputWebsite').val(),

View File

@@ -53,7 +53,7 @@ define(['composer'], function(composer) {
li.setAttribute('data-pid', posts[i].pid);
li.innerHTML = '<a href="' + RELATIVE_PATH + '/user/' + posts[i].userslug + '"><img title="' + posts[i].username + '" style="width: 48px; height: 48px; /*temporary*/" class="img-rounded user-img" src="' + posts[i].picture + '"/></a>' +
li.innerHTML = '<a href="' + RELATIVE_PATH + '/user/' + posts[i].userslug + '"><img title="' + posts[i].username + '" class="img-rounded user-img" src="' + posts[i].picture + '"/></a>' +
'<a href="' + RELATIVE_PATH + '/topic/' + posts[i].topicSlug + '#' + posts[i].pid + '">' +
'<strong><span>'+ posts[i].username + '</span></strong>' +
'<p>' +