diff --git a/app.js b/app.js index 56b95a1cee..4005af1aa1 100644 --- a/app.js +++ b/app.js @@ -18,7 +18,7 @@ global.templates = {}; templates.init([ 'header', 'footer', 'logout', 'admin/header', 'admin/footer', 'admin/index', 'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext', - 'emails/header', 'emails/footer', 'install/header', 'install/footer', 'install/basic' + 'emails/header', 'emails/footer', 'install/header', 'install/footer', 'install/redis' ]); templates.ready(function() { diff --git a/public/templates/config.json b/public/templates/config.json index 04aa514a26..5af89957fb 100644 --- a/public/templates/config.json +++ b/public/templates/config.json @@ -1,25 +1,29 @@ { - "custom_mapping": { - "admin/topics[^]*": "admin/topics", - "admin/categories[^]*": "admin/categories", - "admin/users[^]*": "admin/users", - "admin/redis[^]*": "admin/redis", - "admin/index[^]*": "admin/index", - "admin/themes[^]*": "admin/themes", - "admin/settings[^]*": "admin/settings", - "admin/twitter[^]*": "admin/twitter", - "admin/facebook[^]*": "admin/facebook", - "admin/gplus[^]*": "admin/gplus", - "install/?$": "install/basic", - "install/basic/?$": "install/basic", - "users[^]*edit": "accountedit", - "users[^]*friends": "friends", - "users/[^]*": "account", - "latest": "category", - "popular": "category", - "active": "category" - }, - "force_refresh": { - "logout": true - } + "custom_mapping": { + "admin/topics[^]*": "admin/topics", + "admin/categories[^]*": "admin/categories", + "admin/users[^]*": "admin/users", + "admin/redis[^]*": "admin/redis", + "admin/index[^]*": "admin/index", + "admin/themes[^]*": "admin/themes", + "admin/settings[^]*": "admin/settings", + "admin/twitter[^]*": "admin/twitter", + "admin/facebook[^]*": "admin/facebook", + "admin/gplus[^]*": "admin/gplus", + "install/?$": "install/redis", + "install/basic/?": "install/basic", + "install/redis/?": "install/redis", + "install/mail/?": "install/mail", + "install/social/?": "install/social", + "install/privileges/?": "install/privileges", + "users[^]*edit": "accountedit", + "users[^]*friends": "friends", + "users/[^]*": "account", + "latest": "category", + "popular": "category", + "active": "category" + }, + "force_refresh": { + "logout": true + } } \ No newline at end of file diff --git a/public/templates/install/basic.tpl b/public/templates/install/basic.tpl index 9ab273509e..5a656fc21d 100644 --- a/public/templates/install/basic.tpl +++ b/public/templates/install/basic.tpl @@ -1,28 +1,51 @@ -
- Thanks for choosing to install NodeBB! We'll need some information to set up your installation - configuration... -
- -- Please enter the web-accessible url that will be used to point to the NodeBB installation. If you are using a port number in the address, - include it in the field below, not here - -
- -- -
+This "secret" is used to encode user sessions, so they are not stored in plaintext. Enter a bunch of random characters below:
- \ No newline at end of file + + +