diff --git a/public/css/admin.less b/public/css/admin.less index caaf3a1881..c44abae0ef 100644 --- a/public/css/admin.less +++ b/public/css/admin.less @@ -1,109 +1,146 @@ @import "mixins"; -.entry-row { - border-radius: 10px; - margin-bottom: 10px; - padding: 10px; - cursor: move; - width: 800px; -} -.admin-categories { - form { - margin: 0 0 0px; +.admin { + .entry-row { + border-radius: 10px; + margin-bottom: 10px; + padding: 10px; + cursor: move; + width: 800px; } - input { - height: 20px; - padding: 5px; - margin-left: 10px; - width: 150px; - border: 0; - border-radius: 5px; - margin-top: -8px; - } - input.description { - width: 400px; + .admin-categories { + form { + margin: 0 0 0px; + } } - select { - border: 0; - margin-left: 10px; - padding: 5px; - margin-top: -8px; + .entry-row { + border-radius: 10px; + margin-bottom: 10px; + padding: 10px; + cursor: move; + width: 555px; } - button { - margin-top: -7px; + input.description { + width: 400px; } - .icon{ - width: 30px; - height: 30px; - text-align: center; - line-height: 35px; - display: inline-block; - } -} - -.themes { - margin: 0; - padding: 0; - - li { - padding: 10px 16px; - margin: 0.25em 1em; - list-style-type: none; - .pointer; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; - -webkit-transition: background-color 250ms linear; - -moz-transition: background-color 250ms linear; - -ms-transition: background-color 250ms linear; - -o-transition: background-color 250ms linear; - transition: background-color 250ms linear; - - img { - max-width: 150px; - float: left; + .admin-categories { + form { + margin: 0 0 0px; + } + + input { + height: 20px; + padding: 5px; + margin-left: 10px; + width: 150px; + border: 0; + border-radius: 5px; + margin-top: -8px; } - h4, p { - margin-left: 170px; + select { + border: 0; + margin-left: 10px; + padding: 5px; + margin-top: -8px; } - p { - font-size: 0.9em; + button { + margin-top: -7px; } - &:hover { - background-color: rgba(128, 128, 128, 0.2); + .icon{ + width: 30px; + height: 30px; + text-align: center; + line-height: 35px; + display: inline-block; } } -} -.motd textarea { - width: 100%; -} + .themes { + margin: 0; + padding: 0; + + li { + padding: 10px 16px; + margin: 0.25em 1em; + list-style-type: none; + .pointer; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border-radius: 10px; + -webkit-transition: background-color 250ms linear; + -moz-transition: background-color 250ms linear; + -ms-transition: background-color 250ms linear; + -o-transition: background-color 250ms linear; + transition: background-color 250ms linear; + + img { + max-width: 150px; + float: left; + } + + h4, p { + margin-left: 170px; + } + p { + font-size: 0.9em; + } -.icon-container { - .row { + &:hover { + background-color: rgba(128, 128, 128, 0.2); + } + } + } + + .motd textarea { + width: 100%; + } + + .topics { margin: 0; - .span3 { - width: 20px; - height: 20px; - margin: 1px; - cursor: pointer; - line-height: 20px; - text-align: center; + padding: 0; + + > li { + .zebra; + list-style-type: none; + padding: 1em; + margin-bottom: 1em; - &:hover, &.selected { - background: black; - color: white; + ul { + margin: 0.5em 0; + + li { + list-style-type: none; + } } + } + } + + .icon-container { + .row { + margin: 0; + .span3 { + width: 20px; + height: 20px; + margin: 1px; + cursor: pointer; + line-height: 20px; + text-align: center; + &:hover, &.selected { + background: black; + color: white; + } + + } } } } \ No newline at end of file diff --git a/public/css/mixins.less b/public/css/mixins.less index fec0b45add..fbf97b2503 100644 --- a/public/css/mixins.less +++ b/public/css/mixins.less @@ -20,4 +20,14 @@ .clear { clear: both; +} + +.zebra { + &:nth-child(even) { + background: rgba(191,191,191,0.2); + } + + &:nth-child(odd) { + background: rgba(223,223,223,0.2); + } } \ No newline at end of file diff --git a/public/css/noscript.less b/public/css/noscript.less index 3e5508e560..76f15d2325 100644 --- a/public/css/noscript.less +++ b/public/css/noscript.less @@ -5,14 +5,7 @@ noscript { list-style-type: none; padding: 1em; margin-bottom: 1em; - - &:nth-child(even) { - background: rgba(191,191,191,0.2); - } - - &:nth-child(odd) { - background: rgba(223,223,223,0.2); - } + .zebra; } .categories { diff --git a/public/src/forum/admin/topics.js b/public/src/forum/admin/topics.js new file mode 100644 index 0000000000..4294f140a4 --- /dev/null +++ b/public/src/forum/admin/topics.js @@ -0,0 +1,84 @@ +$(document).ready(function() { + var topicsListEl = document.querySelector('.topics'); + + $(topicsListEl).on('click', '[data-action]', function() { + var $this = $(this), + action = this.getAttribute('data-action'), + tid = $this.parents('[data-tid]').attr('data-tid'); + + switch(action) { + case 'pin': + if (!$this.hasClass('active')) socket.emit('api:topic.pin', { tid: tid }); + else socket.emit('api:topic.unpin', { tid: tid }); + break; + case 'lock': + if (!$this.hasClass('active')) socket.emit('api:topic.lock', { tid: tid }); + else socket.emit('api:topic.unlock', { tid: tid }); + break; + case 'delete': + if (!$this.hasClass('active')) socket.emit('api:topic.delete', { tid: tid }); + else socket.emit('api:topic.restore', { tid: tid }); + break; + } + }); + + // Resolve proper button state for all topics + var topicEls = topicsListEl.querySelectorAll('li'), + numTopics = topicEls.length; + for(var x=0;x - +
diff --git a/public/templates/admin/themes.tpl b/public/templates/admin/themes.tpl index 76994f6453..b145fc35e0 100644 --- a/public/templates/admin/themes.tpl +++ b/public/templates/admin/themes.tpl @@ -15,4 +15,4 @@ This will remove any custom theme applied to your NodeBB, and restore the base theme.

- \ 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 a70805a02c..d3fef7b6b5 100644 --- a/public/templates/admin/topics.tpl +++ b/public/templates/admin/topics.tpl @@ -1,55 +1,22 @@

Topics

- - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/routes/admin.js b/src/routes/admin.js index da238ea80b..76bd9d8fb9 100644 --- a/src/routes/admin.js +++ b/src/routes/admin.js @@ -56,9 +56,14 @@ var user = require('./../user.js'), }); } break; - case 'topics' : - categories.getCategoryById(0, 0, function(data) { - res.json(data); + case 'topics': + topics.getAllTopics(function(topics) { + topics.sort(function(a, b) { + return b.timestamp - a.timestamp; + }); + res.json({ + topics: topics + }); }); break; case 'redis': diff --git a/src/routes/user.js b/src/routes/user.js index 276566e47a..59d5096a56 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -133,7 +133,7 @@ var user = require('./../user.js'), var filename = uid + '-profileimg' + extension; var uploadPath = path.join(global.configuration['ROOT_DIRECTORY'], config.upload_path, filename); - console.log('trying to upload to : '+ uploadPath); + console.log('Info: Attempting upload to: '+ uploadPath); var is = fs.createReadStream(tempPath); var os = fs.createWriteStream(uploadPath); diff --git a/src/threadTools.js b/src/threadTools.js index 2eabde1db5..fd2aeaddb0 100644 --- a/src/threadTools.js +++ b/src/threadTools.js @@ -46,6 +46,11 @@ var RDB = require('./redis.js'), tid: tid, status: 'ok' }); + + socket.emit('api:topic.lock', { + status: 'ok', + tid: tid + }); } } }); @@ -62,6 +67,11 @@ var RDB = require('./redis.js'), tid: tid, status: 'ok' }); + + socket.emit('api:topic.unlock', { + status: 'ok', + tid: tid + }); } } }); @@ -79,6 +89,11 @@ var RDB = require('./redis.js'), tid: tid, status: 'ok' }); + + socket.emit('api:topic.delete', { + status: 'ok', + tid: tid + }); } } }); @@ -96,6 +111,11 @@ var RDB = require('./redis.js'), tid: tid, status: 'ok' }); + + socket.emit('api:topic.restore', { + status: 'ok', + tid: tid + }); } } }); @@ -112,6 +132,11 @@ var RDB = require('./redis.js'), tid: tid, status: 'ok' }); + + socket.emit('api:topic.pin', { + status: 'ok', + tid: tid + }); } } }); @@ -128,6 +153,11 @@ var RDB = require('./redis.js'), tid: tid, status: 'ok' }); + + socket.emit('api:topic.unpin', { + status: 'ok', + tid: tid + }); } } }); diff --git a/src/topics.js b/src/topics.js index 4b9a2127e2..c14bd425f2 100644 --- a/src/topics.js +++ b/src/topics.js @@ -179,10 +179,25 @@ marked.setOptions({ throw new Error(err); } + topicData.tid = tid; callback(topicData); }); } + Topics.getAllTopics = function(callback) { + RDB.smembers('topics:tid', function(err, tids) { + var topics = []; + async.each(tids, function(tid, next) { + Topics.get_topic(tid, 0, function(topicData) { + topics.push(topicData); + next(); + }); + }, function(err) { + callback(topics); + }); + }); + } + Topics.get_cid_by_tid = function(tid, callback) { RDB.get(schema.topics(tid).cid, function(err, cid) { if (cid && parseInt(cid) > 0) { @@ -195,7 +210,6 @@ marked.setOptions({ Topics.getTitle = function(tid, callback) { RDB.get('tid:' + tid + ':title', function(err, title) { - console.log(tid, title); callback(title); }); } diff --git a/src/webserver.js b/src/webserver.js index 29a3d71c4b..66eb93ae9a 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -159,7 +159,6 @@ var express = require('express'), var category_url = cid + (req.params.slug ? '/' + req.params.slug : ''); categories.getCategoryById(cid, 0, function(returnData) { - console.log(returnData); res.send( app.build_header(res) + '\n\t' + @@ -294,8 +293,6 @@ var express = require('express'), app.all('/test', function(req, res) { res.send(); - // console.log('CSRF is: ', res.locals.token); - // res.send('
'); });