From 24e4be77d80f0101013ec6b935ba5ee7123a65ef Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Wed, 18 Sep 2013 16:01:54 -0400 Subject: [PATCH] closes #304 --- public/src/app.js | 2 +- public/src/forum/account.js | 2 +- public/src/forum/accountheader.js | 10 ++--- public/src/forum/category.js | 2 +- public/src/forum/footer.js | 4 +- public/templates/account.tpl | 2 +- public/templates/accountedit.tpl | 6 +-- public/templates/accountsettings.tpl | 4 +- public/templates/admin/users.tpl | 4 +- public/templates/category.tpl | 4 +- public/templates/config.json | 22 +++++----- public/templates/favourites.tpl | 2 +- public/templates/followers.tpl | 8 ++-- public/templates/following.tpl | 8 ++-- public/templates/topic.tpl | 16 +++---- public/templates/users.tpl | 12 +++--- src/posts.js | 2 +- src/routes/user.js | 62 ++++++++++++++-------------- src/topics.js | 2 +- src/webserver.js | 2 +- src/websockets.js | 2 +- 21 files changed, 89 insertions(+), 89 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 9782df78c4..7c0849faac 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -275,7 +275,7 @@ var socket, if (active) { jQuery('#main-nav li a').each(function() { var href = this.getAttribute('href'); - if (active.match(/^users/)) + if (active == "sort-posts" || active == "sort-reputation" || active == "search" || active== "latest") active = 'users'; if (href && href.match(active)) { jQuery(this.parentNode).addClass('active'); diff --git a/public/src/forum/account.js b/public/src/forum/account.js index 6d8beaf79e..45d5813ae6 100644 --- a/public/src/forum/account.js +++ b/public/src/forum/account.js @@ -5,7 +5,7 @@ $(document).ready(function() { var username = $('.account-username a').html(); - app.enter_room('users/' + theirid); + app.enter_room('user/' + theirid); app.addCommasToNumbers(); diff --git a/public/src/forum/accountheader.js b/public/src/forum/accountheader.js index 0bd3d22300..15bb2db614 100644 --- a/public/src/forum/accountheader.js +++ b/public/src/forum/accountheader.js @@ -6,11 +6,11 @@ function createMenu() { var userslug = $('.account-username-box').attr('data-userslug'); var links = $('
\ - settings\ - favourites\ - followers\ - following\ - edit\ + settings\ + favourites\ + followers\ + following\ + edit\
'); $('.account-username-box').append(links); diff --git a/public/src/forum/category.js b/public/src/forum/category.js index 03eea0ac47..24a059ae42 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -85,7 +85,7 @@ li.setAttribute('data-pid', posts[i].pid); - li.innerHTML = '' + + li.innerHTML = '' + '' + '

' + posts[i].content + diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index f58633d898..254da9a2ce 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -53,14 +53,14 @@ var userLabel = rightMenu.find('#user_label'); if (userLabel.length) { if (data['userslug']) - userLabel.attr('href', '/users/' + data['userslug']); + userLabel.attr('href', '/user/' + data['userslug']); if (data['picture']) userLabel.find('img').attr('src', data['picture']); if (data['username']) userLabel.find('span').html(data['username']); } else { var userli = $('

  • \ - \ + \ \ ' + data['username'] + ' \ \ diff --git a/public/templates/account.tpl b/public/templates/account.tpl index aa9bfd8ccb..b052bf7b49 100644 --- a/public/templates/account.tpl +++ b/public/templates/account.tpl @@ -3,7 +3,7 @@ diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl index c551109092..bb0c303bbd 100644 --- a/public/templates/accountedit.tpl +++ b/public/templates/accountedit.tpl @@ -39,7 +39,7 @@

    Upload Picture

    -
    +
    @@ -66,8 +66,8 @@ diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl index 5cc28d198d..cb200cb79e 100644 --- a/public/templates/accountsettings.tpl +++ b/public/templates/accountsettings.tpl @@ -3,8 +3,8 @@ diff --git a/public/templates/admin/users.tpl b/public/templates/admin/users.tpl index 87b636af38..a5fa6d3f11 100644 --- a/public/templates/admin/users.tpl +++ b/public/templates/admin/users.tpl @@ -17,11 +17,11 @@
      - +
      - {users.username} + {users.username}
      {users.reputation} diff --git a/public/templates/category.tpl b/public/templates/category.tpl index a3e39de1b6..e12b3898bc 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -69,7 +69,7 @@
      - +
      @@ -79,7 +79,7 @@
    - +
    diff --git a/public/templates/config.json b/public/templates/config.json index 0414e4da4c..3d8af7fa59 100644 --- a/public/templates/config.json +++ b/public/templates/config.json @@ -18,16 +18,16 @@ "install/mail/?": "install/mail", "install/social/?": "install/social", "install/privileges/?": "install/privileges", - "users-sort-posts": "users", - "users-latest": "users", - "users-sort-reputation": "users", - "users-search": "users", - "users[^]*edit": "accountedit", - "users[^]*following": "following", - "users[^]*followers": "followers", - "users[^]*settings": "accountsettings", - "users[^]*favourites": "favourites", - "users/[^]*": "account", + "users/sort-posts": "users", + "users/latest": "users", + "users/sort-reputation": "users", + "users/search": "users", + "user[^]*edit": "accountedit", + "user[^]*following": "following", + "user[^]*followers": "followers", + "user[^]*settings": "accountsettings", + "user[^]*favourites": "favourites", + "user/[^]*": "account", "recent": "recent", "unread": "unread", @@ -36,7 +36,7 @@ "search": "search", "reset/[^]*": "reset_code", "reset": "reset" - + }, "force_refresh": { "logout": true diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl index 0b541b9074..7bd01e7556 100644 --- a/public/templates/favourites.tpl +++ b/public/templates/favourites.tpl @@ -1,7 +1,7 @@
    diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl index 205355aef8..5093d40713 100644 --- a/public/templates/followers.tpl +++ b/public/templates/followers.tpl @@ -3,19 +3,19 @@
    - +
    - {followers.username} + {followers.username}
    {followers.reputation} diff --git a/public/templates/following.tpl b/public/templates/following.tpl index af115cb6b8..8215d9be31 100644 --- a/public/templates/following.tpl +++ b/public/templates/following.tpl @@ -3,19 +3,19 @@
    - +
    - {following.username} + {following.username}
    {following.reputation} diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 6eff22f5ee..b569dbf4d2 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -18,7 +18,7 @@
  • - +

    @@ -28,11 +28,11 @@
    @@ -60,7 +60,7 @@
    posted {main_posts.relativeTime} ago - | last edited by {main_posts.editorname} {main_posts.relativeEditTime} ago + | last edited by {main_posts.editorname} {main_posts.relativeEditTime} ago
    @@ -73,7 +73,7 @@