Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-27 09:49:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

inbetween some changes but asked to pull so I'll comment better later

Browse Source
This commit is contained in:
psychobunny
2013-04-24 21:16:10 +00:00
parent 78d753b8f9
commit e50e136d83
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/app.js
View File

@@ -11,7 +11,7 @@ var socket,
config = data;
socket = io.connect('http://' + config.socket.address + config.socket.port? ':' + config.socket.port : '');
socket.on('connect', function(data) {
socket.on('event:connect', function(data) {
console.log('connected to socket.io: ', data);
});
@@ -77,8 +77,8 @@ var socket,
var post_window = null;
app.open_post_window = function() {
post_window = post_window || document.getElementById('post_window');
jQuery(post_window).slideToggle(250);
document.getElementById('post_title').focus();
};
@@ -100,7 +100,7 @@ var socket,
return;
}
socket.emit('topics.post', {
socket.emit('api:topics.post', {
'title' : title,
'content' : content
});

12
public/templates/header.tpl
View File

@@ -10,7 +10,6 @@
<script type="text/javascript" src="/src/app.js"></script>
<script type="text/javascript" src="/src/templates.js"></script>
<script type="text/javascript" src="/src/ajaxify.js"></script>
<script type="text/javascript" src="/vendor/ckeditor/ckeditor.js"></script>
<style type="text/css">
body {
padding-top: 60px;
@@ -60,9 +59,10 @@
border: 1px solid #111;
font-size: 16px;
color: #bebebe;
outline: 0;
}
#post_window textarea:focus {
outline: none;
outline: 0;
border:none !important;
box-shadow:none !important;
}
@@ -105,10 +105,10 @@
<div class="btn-toolbar">
<div class="btn-group">
<a class="btn btn-link" href="#"><i class="icon-bold"></i></a>
<a class="btn btn-link" href="#"><i class="icon-italic"></i></a>
<a class="btn btn-link" href="#"><i class="icon-font"></i></a>
<a class="btn btn-link" href="#"><i class="icon-list"></i></a>
<a class="btn btn-link" href="#" tabindex="-1"><i class="icon-bold"></i></a>
<a class="btn btn-link" href="#" tabindex="-1"><i class="icon-italic"></i></a>
<a class="btn btn-link" href="#" tabindex="-1"><i class="icon-font"></i></a>
<a class="btn btn-link" href="#" tabindex="-1"><i class="icon-list"></i></a>
</div>
<div class="btn-group" style="float: right; margin-right: -12px">
<a class="btn" onclick="app.post_topic()"><i class="icon-ok"></i> Submit</a>

3
public/templates/home.tpl
View File

@@ -6,6 +6,9 @@ new_post.onclick = function() {
app.open_post_window();
}
jQuery('document').ready(function() {
});
/*app.alert({

6
src/topics.js
View File

@@ -66,7 +66,7 @@ var RDB = require('./redis.js'),
RDB.set('tid:' + tid + ':uid', global.uid);
RDB.set('tid:' + tid + ':timestamp', new Date().getTime());
RDB.set('topic:slug:' + slugify(title) + ':tid', tid);
RDB.set('topic:slug:' + tid + '/' + slugify(title) + ':tid', tid);
// Posts
posts.create(content, function(pid) {
@@ -78,8 +78,8 @@ var RDB = require('./redis.js'),
global.socket.emit('event:alert', {
title: 'Thank you for registering',
message: 'You have successfully registered - welcome to nodebb!',
title: 'Thank you for posting',
message: 'You have successfully posted. Click here to view your post.',
type: 'notify',
timeout: 2000
});

3
src/websockets.js
View File

@@ -38,8 +38,7 @@ var SocketIO = require('socket.io').listen(global.server),
modules.templates.init();
}
// not required, "connect" emitted automatically
// socket.emit('event:connect', {status: 1});
socket.emit('event:connect', {status: 1});
// BEGIN: API calls (todo: organize)
// julian: :^)