Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-18 20:40:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed indents

Browse Source
This commit is contained in:
Baris Usakli
2013-06-20 16:49:04 -04:00
parent 9309722898 912664756f
commit e7619e6fe3
3 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
app.js
View File

@@ -110,56 +110,59 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
ask('Will you be using a port number to access NodeBB? (y)', function(use_port) {
ask('... the host IP or address of your Redis instance? (127.0.0.1)', function(redis_host) {
ask('... the host port of your Redis instance? (6379)', function(redis_port) {
ask('... your NodeBB secret? (keyboard mash for a bit here)', function(secret) {
if (!base_url) base_url = 'http://localhost';
if (!port) port = 4567;
if (!use_port) use_port = true; else use_port = (use_port === 'y' ? true : false);
if (!redis_host) redis_host = '127.0.0.1';
if (!redis_port) redis_port = 6379;
if (!secret) secret = utils.generateUUID();
ask('... the password of your Redis database? (no password)', function(redis_password) {
ask('... your NodeBB secret? (keyboard mash for a bit here)', function(secret) {
if (!base_url) base_url = 'http://localhost';
if (!port) port = 4567;
if (!use_port) use_port = true; else use_port = (use_port === 'y' ? true : false);
if (!redis_host) redis_host = '127.0.0.1';
if (!redis_port) redis_port = 6379;
if (!secret) secret = utils.generateUUID();
var fs = require('fs'),
path = require('path'),
config = {
secret: secret,
base_url: base_url,
port: port,
use_port: use_port,
upload_path: '/public/uploads/',
redis: {
host: redis_host,
port: redis_port
var fs = require('fs'),
path = require('path'),
config = {
secret: secret,
base_url: base_url,
port: port,
use_port: use_port,
upload_path: '/public/uploads/',
redis: {
host: redis_host,
port: redis_port,
password: redis_password
}
}
}
// Server-side config
fs.writeFile(path.join(__dirname, 'config.json'), JSON.stringify(config, null, 4), function(err) {
if (err) throw err;
else {
process.stdout.write(
"\n\nConfiguration Saved OK\n\n"
);
if (!args.setup) {
// Server-side config
fs.writeFile(path.join(__dirname, 'config.json'), JSON.stringify(config, null, 4), function(err) {
if (err) throw err;
else {
process.stdout.write(
"Please start NodeBB again and register a new user at " +
base_url + (use_port ? ':' + port : '') + "/register. This user will automatically become an administrator.\n\n"
"\n\nConfiguration Saved OK\n\n"
);
if (!args.setup) {
process.stdout.write(
"Please start NodeBB again and register a new user at " +
base_url + (use_port ? ':' + port : '') + "/register. This user will automatically become an administrator.\n\n"
);
}
process.stdout.write(
"If at any time you'd like to run this setup again, run the app with the \"--setup\" flag\n\n"
);
process.exit();
}
process.stdout.write(
"If at any time you'd like to run this setup again, run the app with the \"--setup\" flag\n\n"
);
process.exit();
}
});
});
// Client-side config
fs.writeFile(path.join(__dirname, 'public', 'config.json'), JSON.stringify({
socket: {
address: base_url,
port: port
},
api_url: base_url + (use_port ? ':' + port : '') + '/api/'
}, null, 4))
// Client-side config
fs.writeFile(path.join(__dirname, 'public', 'config.json'), JSON.stringify({
socket: {
address: base_url,
port: port
},
api_url: base_url + (use_port ? ':' + port : '') + '/api/'
}, null, 4))
});
});
});
});

20
public/templates/admin/categories.tpl
View File

@@ -7,18 +7,18 @@
<li class=''><a href='/admin/categories/disabled'>Disabled</a></li>
</ul>
<!-- TODO: remove inline event listeners. -->
<div class="row-fluid admin-categories">
<ul class="span12" id="entry-container">
<!-- BEGIN categories -->
<li class="entry-row {categories.blockclass}">
<li data-cid="{categories.cid}" class="entry-row {categories.blockclass}">
<form class="form-inline">
<div class="icon">
<i onclick="select_icon(this);" class="{categories.icon} icon-2x"></i>
<i onclick="select_icon(this); modified(this);" class="{categories.icon} icon-2x"></i>
</div>
<input placeholder="Category Name" value="{categories.name}" class="input-medium"></input>
<select class="blockclass input-medium" data-value="{categories.blockclass}" onchange="update_blockclass(this);">
<input placeholder="Category Name" value="{categories.name}" onchange="modified(this);" class="input-medium"></input>
<select class="blockclass input-medium" data-value="{categories.blockclass}" onchange="update_blockclass(this); modified(this);">
<option value="category-purple">category-purple</option>
<option value="category-darkblue">category-darkblue</option>
<option value="category-blue">category-blue</option>
@@ -26,7 +26,7 @@
<option value="category-orange">category-orange</option>
</select>
<!--<input value="{categories.icon}" class="input-medium" onchange="update_icon(this);"></input>-->
<input placeholder="Category Description" value="{categories.description}" class="input-medium description"></input>
<input onchange="modified(this);" placeholder="Category Description" value="{categories.description}" class="input-medium description"></input>
<!--<a target="_blank" href="../category/{categories.slug}">category/{categories.slug}</a>-->
<!--<div style="float: right">
@@ -37,12 +37,20 @@
<!-- END categories -->
</ul>
<button class="btn btn-large btn-primary" id="save">Save</button>
</div>
<script type="text/javascript">
var modified_catgories = {};
function modified(el) {
}
function select_icon(el) {
var selected = el.className.replace(' icon-2x', '');
jQuery('#icons .selected').removeClass('selected');

4
src/redis.js
View File

@@ -7,6 +7,10 @@
RedisDB.exports = redis.createClient(global.config.redis.port, global.config.redis.host);
if( global.config.redis.password ) {
RedisDB.exports.auth(global.config.redis.password);
}
RedisDB.exports.handle = function(error) {
if (error !== null) {
if (PRODUCTION === false) {