From 1a104686acdfb45190ab1afdf286b1fe3943b644 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 5 Jun 2013 16:17:07 -0400 Subject: [PATCH] new header for meta title --- nodebb | 2 +- public/templates/admin/header.tpl | 2 +- public/templates/admin/settings.tpl | 8 ++++++++ public/templates/header.tpl | 6 ++++-- src/routes/authentication.js | 5 ++++- src/routes/user.js | 5 ++++- src/webserver.js | 5 ++++- 7 files changed, 26 insertions(+), 7 deletions(-) diff --git a/nodebb b/nodebb index 90ffe6d3c3..ab0192539f 100755 --- a/nodebb +++ b/nodebb @@ -1,4 +1,4 @@ #!/bin/bash clear echo "Launching NodeBB" -supervisor --extensions 'node|js|tpl' app +supervisor --extensions 'node|js|tpl' -- app $1 \ No newline at end of file diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl index f73d6a2c5c..4c469f7ff1 100644 --- a/public/templates/admin/header.tpl +++ b/public/templates/admin/header.tpl @@ -1,7 +1,7 @@ - + NodeBB Administration Panel diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl index c2ecb195eb..7697fc9b39 100644 --- a/public/templates/admin/settings.tpl +++ b/public/templates/admin/settings.tpl @@ -1,6 +1,14 @@

Settings

+

General Settings

+
+
+ + +
+
+

Privilege Thresholds

diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 9f092070e1..2086f7c5d2 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -1,10 +1,12 @@ - NodeBB + {title} - + + + diff --git a/src/routes/authentication.js b/src/routes/authentication.js index f84a375506..21a0e17c5a 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -82,7 +82,10 @@ Auth.create_routes = function(app) { var build_header = function() { - return templates['header'].parse({ cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css' }); + return templates['header'].parse({ + cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css', + title: global.config['title'] || 'NodeBB' + }); }; app.get('/logout', function(req, res) { diff --git a/src/routes/user.js b/src/routes/user.js index e65030e1af..b40660fef1 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -7,7 +7,10 @@ var user = require('./../user.js'), (function(User) { User.create_routes = function(app) { var build_header = function() { - return templates['header'].parse({ cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css' }); + return templates['header'].parse({ + cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css', + title: global.config['title'] || 'NodeBB' + }); }; app.get('/uid/:uid', function(req, res) { diff --git a/src/webserver.js b/src/webserver.js index 9db1caa53d..1c23af81bb 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -23,7 +23,10 @@ var express = require('express'), (function(app) { var templates = null, build_header = function() { - return templates['header'].parse({ cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css' }); + return templates['header'].parse({ + cssSrc: global.config['theme:src'] || '/vendor/bootstrap/css/bootstrap.min.css', + title: global.config['title'] || 'NodeBB' + }); }; // Middlewares