From 2c5e9d47ad5d88df2be326ce8fc72cea077490b0 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Thu, 11 Jul 2013 14:32:50 -0400 Subject: [PATCH] admin routes and fixes --- public/src/app.js | 3 +- public/src/forum/footer.js | 2 + public/templates/admin/categories.tpl | 2 +- public/templates/admin/header.tpl | 66 +++++++++---------- public/templates/admin/index.tpl | 1 + public/templates/admin/testing/categories.tpl | 1 + public/templates/admin/themes.tpl | 2 +- public/templates/admin/topics.tpl | 4 +- public/templates/admin/users.tpl | 2 +- public/templates/footer.tpl | 4 ++ src/routes/admin.js | 17 +++-- 11 files changed, 60 insertions(+), 44 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 7007784a12..f6b6b59d0a 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -246,8 +246,7 @@ var socket, } }, false); - $.getScript(RELATIVE_PATH + '/src/forum/footer.js'); - + addTouchEvents(); }); diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index abfd1af094..12f0dfda4f 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -28,11 +28,13 @@ socket.emit('api:user.active.get'); socket.on('api:user.active.get', function(data) { + var plural_users = parseInt(data.users) !== 1, plural_anon = parseInt(data.anon) !== 1; active_users.innerHTML = 'There ' + (plural_users ? 'are' : 'is') + ' ' + data.users + ' user' + (plural_users ? 's' : '') + ' and ' + data.anon + ' guest' + (plural_anon ? 's' : '') + ' online'; }); + socket.emit('api:user.active.get_record'); socket.on('api:user.active.get_record', function(data) { active_record.innerHTML = "most users ever online was " + data.record + " on " + (new Date(parseInt(data.timestamp,10))).toUTCString() + ""; diff --git a/public/templates/admin/categories.tpl b/public/templates/admin/categories.tpl index ed5930d1d1..fac56816a2 100644 --- a/public/templates/admin/categories.tpl +++ b/public/templates/admin/categories.tpl @@ -43,4 +43,4 @@
- \ No newline at end of file + \ No newline at end of file diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl index 07107f1527..cd3d9c5e6f 100644 --- a/public/templates/admin/header.tpl +++ b/public/templates/admin/header.tpl @@ -3,29 +3,29 @@ NodeBB Administration Panel - - - + + + - + - - - - - - + + + + + + - - + + @@ -66,32 +66,32 @@
diff --git a/public/templates/admin/index.tpl b/public/templates/admin/index.tpl index 788ae1746b..a3a4211f3e 100644 --- a/public/templates/admin/index.tpl +++ b/public/templates/admin/index.tpl @@ -24,6 +24,7 @@ ajaxify.register_events(['api:get_all_rooms']); socket.on('api:get_all_rooms', function(data) { + var active_users = document.getElementById('active_users'), total = 0; active_users.innerHTML = ''; diff --git a/public/templates/admin/testing/categories.tpl b/public/templates/admin/testing/categories.tpl index 5fd8b9f101..5bab8d5857 100644 --- a/public/templates/admin/testing/categories.tpl +++ b/public/templates/admin/testing/categories.tpl @@ -6,6 +6,7 @@ \ No newline at end of file + \ No newline at end of file diff --git a/public/templates/admin/topics.tpl b/public/templates/admin/topics.tpl index e0d0a79343..f1a5c61087 100644 --- a/public/templates/admin/topics.tpl +++ b/public/templates/admin/topics.tpl @@ -9,7 +9,7 @@ - {topics.title} + {topics.title}