Skip to content

Commit

Permalink
developed during a merge... I am going to hell for this.
Browse files Browse the repository at this point in the history 
- also new topics tab in admin panel
  • Loading branch information
@julianlam
julianlam committed Jun 20, 2013
1 parent cef77c2 commit 32eba62
Show file tree
Hide file tree
Showing 9 changed files with 175 additions and 130 deletions.
159 changes: 92 additions & 67 deletions public/css/admin.less
View file
@@ -1,84 +1,109 @@
@import "mixins";

.entry-row {
border-radius: 10px;
margin-bottom: 10px;
padding: 10px;
cursor: move;
width: 555px;
}
.admin-categories {
form {
margin: 0 0 0px;
}
.admin {

input {
height: 20px;
padding: 5px;
margin-left: 10px;
width: 150px;
border: 0;
border-radius: 5px;
margin-top: -8px;
.entry-row {
border-radius: 10px;
margin-bottom: 10px;
padding: 10px;
cursor: move;
width: 555px;
}

select {
border: 0;
margin-left: 10px;
padding: 5px;
margin-top: -8px;
}
.admin-categories {
form {
margin: 0 0 0px;
}

button {
margin-top: -7px;
}
input {
height: 20px;
padding: 5px;
margin-left: 10px;
width: 150px;
border: 0;
border-radius: 5px;
margin-top: -8px;
}

.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;
select {
border: 0;
margin-left: 10px;
padding: 5px;
margin-top: -8px;
}

h4, p {
margin-left: 170px;
button {
margin-top: -7px;
}

p {
font-size: 0.9em;
.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;
}

h4, p {
margin-left: 170px;
}

p {
font-size: 0.9em;
}

&:hover {
background-color: rgba(128, 128, 128, 0.2);
}
}
}

.motd textarea {
width: 100%;
}

.topics {
margin: 0;
padding: 0;

> li {
.zebra;
list-style-type: none;
padding: 1em;
margin-bottom: 1em;

ul {
margin: 0.5em 0;

&:hover {
background-color: rgba(128, 128, 128, 0.2);
li {
list-style-type: none;
}
}
}
}
}

.motd textarea {
width: 100%;
}
10 changes: 10 additions & 0 deletions public/css/mixins.less
View file
Expand Up @@ -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);
}
}
9 changes: 1 addition & 8 deletions public/css/noscript.less
View file
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion public/templates/admin/header.tpl
View file
Expand Up @@ -26,7 +26,7 @@
<link rel="stylesheet" type="text/css" href="/css/admin.css" />
</head>

<body>
<body class="admin">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container-fluid">
Expand Down
2 changes: 1 addition & 1 deletion public/templates/admin/themes.tpl
View file
Expand Up @@ -15,4 +15,4 @@
<button class="btn btn-warning" id="revert_theme">Revert</button> This will remove any custom theme applied to your NodeBB, and restore the base theme.
</p>

<script type="text/javascript" src="/src/forum/admin/themes.js"></script>
<script type="text/javascript" src="../../src/forum/admin/themes.js"></script>
65 changes: 16 additions & 49 deletions public/templates/admin/topics.tpl
View file
@@ -1,55 +1,22 @@
<h1>Topics</h1>
<hr />

<ul class="nav nav-pills">
<li class='active'><a href='/admin/topics'>All</a></li>
<li class=''><a href='/admin/topics/latest'>Latest</a></li>
<li class=''><a href='/admin/topics/active'>Active</a></li>
</ul>


<ul class="topic-container">
<!-- BEGIN topics -->
<a href="../../topic/{topics.slug}"><li class="topic-row">
<div class="row" style="margin: 0">
<div class="span1 topic-row-icon">
<i class="icon-lock icon-4x"></i>
<i class="{topics.pin-icon}"></i><i class="{topics.lock-icon}"></i>
<ul class="topics">
<!-- BEGIN topics -->
<li data-tid="{topics.tid}" data-locked="{topics.locked}" data-pinned="{topics.pinned}" data-deleted="{topics.deleted}">
<div class="btn-group pull-right">
<button data-action="pin" class="btn"><i class="icon-pushpin"></i></button>
<button data-action="lock" class="btn"><i class="icon-lock"></i></button>
<button data-action="delete" class="btn"><i class="icon-trash"></i></button>
</div>
<div class="span11 topic-row-content">
<div class="top-posters">
<img src="http://www.gravatar.com/avatar/fd37ce111f863c6665045c2d72d199bf?s=60&default=identicon" class="img-polaroid" />
<img src="http://www.gravatar.com/avatar/07c9c7170c3ac676c2561e3eeaee063c?s=60&default=identicon" class="img-polaroid" />
<img src="http://www.gravatar.com/avatar/91050ce0072697b53380c6a03a1bc12a?s=60&default=identicon" class="img-polaroid" />
</div>
<div>
<h3><span class="badge badge-important">3</span> {topics.title} <small>24<i class="icon-star"></i></small></h3>
<p> Posted {topics.relativeTime} ago by
<span class="username">{topics.username}</span>. {topics.post_count} posts.</p>
</div>
</div>
</div>
</li></a>
<!-- END topics -->
<a target="_blank" href="../../topic/{topics.slug}">{topics.title}</a>
<ul>
<li><i class="icon-time"></i> Posted {topics.relativeTime} ago by {topics.username}</li>
<li><i class="icon-comments"></i> {topics.post_count} post(s)</li>
</ul>
<div class="clear"></div>
</li>
<!-- END topics -->
</ul>

<script type="text/javascript">
//DRY Failure. this needs to go into an ajaxify onready style fn. Currently is copy pasted into every single function so after ACP is off the ground fix asap
(function() {
jQuery('document').ready(function() {
var url = window.location.href,
parts = url.split('/'),
active = parts[parts.length-1];
jQuery('.nav-pills li').removeClass('active');
jQuery('.nav-pills li a').each(function() {
if (this.getAttribute('href').match(active)) {
jQuery(this.parentNode).addClass('active');
return false;
}
})
});
}());
</script>
<script type="text/javascript" src="../../src/forum/admin/topics.js"></script>
11 changes: 8 additions & 3 deletions src/routes/admin.js
View file
Expand Up @@ -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':
Expand Down
30 changes: 30 additions & 0 deletions src/threadTools.js
View file
Expand Up @@ -46,6 +46,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});

socket.emit('api:topic.lock', {
status: 'ok',
tid: tid
});
}
}
});
Expand All @@ -62,6 +67,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});

socket.emit('api:topic.unlock', {
status: 'ok',
tid: tid
});
}
}
});
Expand All @@ -79,6 +89,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});

socket.emit('api:topic.delete', {
status: 'ok',
tid: tid
});
}
}
});
Expand All @@ -96,6 +111,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});

socket.emit('api:topic.restore', {
status: 'ok',
tid: tid
});
}
}
});
Expand All @@ -112,6 +132,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});

socket.emit('api:topic.pin', {
status: 'ok',
tid: tid
});
}
}
});
Expand All @@ -128,6 +153,11 @@ var RDB = require('./redis.js'),
tid: tid,
status: 'ok'
});

socket.emit('api:topic.unpin', {
status: 'ok',
tid: tid
});
}
}
});
Expand Down

0 comments on commit 32eba62

Please sign in to comment.