Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 08:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #371 from iamcardinal/master

Browse Source 
Adds meta:keywords tags fixes tabbing, closes #330
This commit is contained in:
Julian Lam
2013-10-02 16:10:43 -07:00
parent 1c32acf7b6 fcab1501f8
commit f173a79a0d
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/templates/admin/settings.tpl
View File

@@ -8,6 +8,8 @@
<input class="form-control" type="text" placeholder="Your Community Name" data-field="title" /><br /> <input class="form-control" type="text" placeholder="Your Community Name" data-field="title" /><br />
<label>Site Description</label> <label>Site Description</label>
<input type="text" class="form-control" placeholder="A short description about your community" data-field="description" /><br /> <input type="text" class="form-control" placeholder="A short description about your community" data-field="description" /><br />
<label>Site Keywords</label>
<input type="text" class="form-control" placeholder="Keywords describing your community, comma-seperated" data-field="keywords" /><br />
<label>Imgur Client ID</label> <label>Imgur Client ID</label>
<input type="text" class="form-control" placeholder="Imgur ClientID for image uploads" data-field="imgurClientID" /><br /> <input type="text" class="form-control" placeholder="Imgur ClientID for image uploads" data-field="imgurClientID" /><br />
<label>Maximum User Image Size</label> <label>Maximum User Image Size</label>

8
src/install.js
View File

@@ -43,10 +43,10 @@ var async = require('async'),
name: 'redis:password', name: 'redis:password',
description: 'Password of your Redis database' description: 'Password of your Redis database'
}, { }, {
name: 'bind_address', name: 'bind_address',
description: 'IP or Hostname to bind to', description: 'IP or Hostname to bind to',
'default': '0.0.0.0' 'default': '0.0.0.0'
}], }],
setup: function (callback) { setup: function (callback) {
async.series([ async.series([
function (next) { function (next) {

3
src/webserver.js
View File

@@ -56,6 +56,9 @@ var express = require('express'),
}, { }, {
property: 'og:site_name', property: 'og:site_name',
content: meta.config.title || 'NodeBB' content: meta.config.title || 'NodeBB'
}, {
property: 'keywords',
content: meta.config['keywords'] || ''
}], }],
metaString = utils.buildMetaTags(defaultMetaTags.concat(options.metaTags || [])), metaString = utils.buildMetaTags(defaultMetaTags.concat(options.metaTags || [])),
templateValues = { templateValues = {