diff --git a/app.js b/app.js index b47935376d..6ccc6098f6 100644 --- a/app.js +++ b/app.js @@ -99,6 +99,7 @@ function loadConfig() { // Ensure themes_path is a full filepath nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path'))); + nconf.set('core_templates_path', path.join(__dirname, 'src/views')); nconf.set('base_templates_path', path.join(nconf.get('themes_path'), 'nodebb-theme-vanilla/templates')); } diff --git a/src/meta/templates.js b/src/meta/templates.js index 4851d19016..16195c9aef 100644 --- a/src/meta/templates.js +++ b/src/meta/templates.js @@ -21,7 +21,8 @@ Templates.compile = function(callback) { }, 1000); } - var baseTemplatesPath = nconf.get('base_templates_path'), + var coreTemplatesPath = nconf.get('core_templates_path'), + baseTemplatesPath = nconf.get('base_templates_path'), viewsPath = nconf.get('views_dir'), themeTemplatesPath = nconf.get('theme_templates_path'); @@ -31,6 +32,9 @@ Templates.compile = function(callback) { mkdirp.sync(viewsPath); async.parallel({ + coreTpls: function(next) { + utils.walk(coreTemplatesPath, next); + }, baseTpls: function(next) { utils.walk(baseTemplatesPath, next); }, @@ -38,7 +42,8 @@ Templates.compile = function(callback) { utils.walk(themeTemplatesPath, next); } }, function(err, data) { - var baseTpls = data.baseTpls, + var coreTpls = data.coreTpls, + baseTpls = data.baseTpls, themeTpls = data.themeTpls, paths = {}; @@ -46,9 +51,14 @@ Templates.compile = function(callback) { winston.warn('[meta/templates] Could not find base template files at: ' + baseTemplatesPath); } + coreTpls = !coreTpls ? [] : coreTpls.map(function(tpl) { return tpl.replace(coreTemplatesPath, ''); }); baseTpls = !baseTpls ? [] : baseTpls.map(function(tpl) { return tpl.replace(baseTemplatesPath, ''); }); themeTpls = !themeTpls ? [] : themeTpls.map(function(tpl) { return tpl.replace(themeTemplatesPath, ''); }); + coreTpls.forEach(function(el, i) { + paths[coreTpls[i]] = path.join(coreTemplatesPath, coreTpls[i]); + }); + baseTpls.forEach(function(el, i) { paths[baseTpls[i]] = path.join(baseTemplatesPath, baseTpls[i]); }); diff --git a/src/views/403.tpl b/src/views/403.tpl new file mode 100644 index 0000000000..46478a224c --- /dev/null +++ b/src/views/403.tpl @@ -0,0 +1,4 @@ +
+ [[global:403.title]] +

[[global:403.message]]

+
\ No newline at end of file diff --git a/src/views/404.tpl b/src/views/404.tpl new file mode 100644 index 0000000000..95cd1b9383 --- /dev/null +++ b/src/views/404.tpl @@ -0,0 +1,4 @@ +
+ [[global:404.title]] +

[[global:404.message]]

+
\ No newline at end of file diff --git a/src/views/500.tpl b/src/views/500.tpl new file mode 100644 index 0000000000..4680ee6642 --- /dev/null +++ b/src/views/500.tpl @@ -0,0 +1,5 @@ +
+ [[global:500.title]] +

[[global:500.message]]

+

{errorMessage}

+
\ No newline at end of file diff --git a/src/views/admin/categories.tpl b/src/views/admin/categories.tpl new file mode 100644 index 0000000000..d2661bf043 --- /dev/null +++ b/src/views/admin/categories.tpl @@ -0,0 +1,148 @@ + +
+

Categories +
+ + +
+

+
+ + +
+ +
+ + + + + + +
\ No newline at end of file diff --git a/src/views/admin/database.tpl b/src/views/admin/database.tpl new file mode 100644 index 0000000000..c51f63a798 --- /dev/null +++ b/src/views/admin/database.tpl @@ -0,0 +1,54 @@ + + + +

Redis

+
+
+ Redis Version {redis_version}
+
+ Uptime in Seconds {uptime_in_seconds}
+ Uptime in Days {uptime_in_days}
+
+ Connected Clients {connected_clients}
+ Connected Slaves {connected_slaves}
+ Blocked Clients {blocked_clients}
+
+ + Used Memory {used_memory_human}
+ Memory Fragmentation Ratio {mem_fragmentation_ratio}
+
+ Total Connections Received {total_connections_received}
+ Total Commands Processed {total_commands_processed}
+ Instantaneous Ops. Per Second {instantaneous_ops_per_sec}
+
+ Keyspace Hits {keyspace_hits}
+ Keyspace Misses {keyspace_misses}
+
+
+

Raw Info

+
+
{raw}
+
+ + + +

Mongo

+
+
+ + Collections {collections}
+ Objects {objects}
+ Avg. Object Size {avgObjSize} kb
+
+ Data Size {dataSize} mb
+ Storage Size {storageSize} mb
+ Index Size {indexSize} mb
+ File Size {fileSize} mb
+ +
+
+

Raw Info

+
+
{raw}
+
+ diff --git a/src/views/admin/events.tpl b/src/views/admin/events.tpl new file mode 100644 index 0000000000..43bad6d192 --- /dev/null +++ b/src/views/admin/events.tpl @@ -0,0 +1,5 @@ +

Events

+ +
+{eventdata}
+
\ No newline at end of file diff --git a/src/views/admin/footer.tpl b/src/views/admin/footer.tpl new file mode 100644 index 0000000000..df590eb6f9 --- /dev/null +++ b/src/views/admin/footer.tpl @@ -0,0 +1,55 @@ + + + + + + +
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/src/views/admin/groups.tpl b/src/views/admin/groups.tpl new file mode 100644 index 0000000000..5b38e1e3a0 --- /dev/null +++ b/src/views/admin/groups.tpl @@ -0,0 +1,130 @@ +

Groups

+ +
+ +
+ +
+ +
+ + + + + +
+ + + + diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl new file mode 100644 index 0000000000..3413788ac7 --- /dev/null +++ b/src/views/admin/header.tpl @@ -0,0 +1,145 @@ + + + + NodeBB Administration Panel + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + NodeBB ACP +
+
+ + + +
+
+
+ +
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
diff --git a/src/views/admin/index.tpl b/src/views/admin/index.tpl new file mode 100644 index 0000000000..143be9e853 --- /dev/null +++ b/src/views/admin/index.tpl @@ -0,0 +1,95 @@ +
+
+
Welcome to NodeBB
+
+

+ NodeBB Community Forum + Get Plugins and Themes + Follow @NodeBB + NodeBB Documentation +

+
+
+ +
+
Notices
+
+ +
+ {notices.doneText} {notices.notDoneText} +
+ +
+
+ +
+
Pageviews
+
+
+

Monthly
{pageviews.monthly}

+
+
+

Daily
{pageviews.daily}

+
+
+
+ + +
+
{stats.name}
+
+
+
+
{stats.day}
+
Day
+
+
+
{stats.week}
+
Week
+
+
+
{stats.month}
+
Month
+
+
+
{stats.alltime}
+
All Time
+
+
+
+
+ + + +
+ + +
+
+
Updates
+
+
+

You are running NodeBB v{version}.

+
+

+ Always make sure that your NodeBB is up to date for the latest security patches and bug fixes. +

+

+ + +

+

+ Restarting your NodeBB will drop all existing connections. A reload is lighter and is probably + what you want 99% of the time. +

+
+
+ +
+
Active Users
+
+
+
+
+ +
diff --git a/src/views/admin/languages.tpl b/src/views/admin/languages.tpl new file mode 100644 index 0000000000..7fd449cf1e --- /dev/null +++ b/src/views/admin/languages.tpl @@ -0,0 +1,27 @@ + +
+

Languages

+
+

+ The following setting(s) determine the language settings for your NodeBB. + The default language determines the language settings for all users who + are visiting your NodeBB. +

+ +
+
+ + +
+
+
+ + + \ No newline at end of file diff --git a/src/views/admin/logger.tpl b/src/views/admin/logger.tpl new file mode 100644 index 0000000000..644cd466ad --- /dev/null +++ b/src/views/admin/logger.tpl @@ -0,0 +1,46 @@ +

Logger

+
+ +

Logger Settings

+
+ +

+ By enabling the check boxes, you will receive logs to your terminal. If you specify a path, logs will then be saved to a file instead. HTTP logging is useful for collecting statistics about who, when, and what people access on your forum. In addition to logging HTTP requests, we can also log socket.io events. Socket.io logging, in combination with redis-cli monitor, can be very helpful for learning NodeBB's internals. +

+
+

+ Simply check/uncheck the logging settings to enable or disable logging on the fly. No restart needed. +

+
+ +
+ + +
+
+ + +
+
+ + + + +
+
+
+ +
+
+ + + + diff --git a/src/views/admin/plugins.tpl b/src/views/admin/plugins.tpl new file mode 100644 index 0000000000..460d324618 --- /dev/null +++ b/src/views/admin/plugins.tpl @@ -0,0 +1,42 @@ +

Plugins

+ +
+

+ Interested in writing plugins for NodeBB? +

+

+ Full documentation regarding plugin authoring can be found in the NodeBB Wiki. +

+
+ + +
+ +
    + +
  • +
    + + + + + + + + + +
    + +

    {plugins.name}

    + + +

    {plugins.description}

    + + +

    For more information: {plugins.url}

    + +
    • + +
+ + diff --git a/src/views/admin/settings.tpl b/src/views/admin/settings.tpl new file mode 100644 index 0000000000..0076cd603d --- /dev/null +++ b/src/views/admin/settings.tpl @@ -0,0 +1,73 @@ +

Settings

+
+ + + +
+ + + + + + + + + + + + +
+
+
+
+ +
+
+ +
+
+ +
+

Privilege Thresholds

+

Use privilege thresholds to manage how much reputation a user must gain to receive moderator access.


+ Manage Thread

+ Manage Content

+
+ +
+
+ +
+

Activity Thresholds

+ Minimum reputation to downvote posts

+ Minimum reputation to flag posts

+
+ +
+
+ + + + + \ No newline at end of file diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl new file mode 100644 index 0000000000..efe7c31127 --- /dev/null +++ b/src/views/admin/settings/advanced.tpl @@ -0,0 +1,30 @@ +
+
+
+
+ +
+

+ When the forum is in maintenance mode, all requests will be redirected to a static holding page. + Administrators are exempt from this redirection, and are able to access the site normally. +

+
+
+
+
+
+ +
+
+
+ +
+

+ Leave blank for default +

+
+
+
+
\ No newline at end of file diff --git a/src/views/admin/settings/email.tpl b/src/views/admin/settings/email.tpl new file mode 100644 index 0000000000..3ba947f3ec --- /dev/null +++ b/src/views/admin/settings/email.tpl @@ -0,0 +1,29 @@ +
+
+
+
+

+ Please ensure that you have installed a third-party emailer (e.g. PostageApp, Mailgun, Mandrill, SendGrid, etc), otherwise emails will not be sent by NodeBB +

+
+ +

+ The following email address refers to the email that the recipient will see in the "From" and "Reply To" fields. +

+
+
+ +

+ The test email will be sent to the currently logged in user's email address. +

+
+
+
+
+ +
+
+
+
\ No newline at end of file diff --git a/src/views/admin/settings/general.tpl b/src/views/admin/settings/general.tpl new file mode 100644 index 0000000000..c5b8e2cf9a --- /dev/null +++ b/src/views/admin/settings/general.tpl @@ -0,0 +1,51 @@ +
+
+
+ + + +
+ +
+ + + +

+ If no browser title is specified, the site title will be used +

+ + +
+ + +
+ + +
+

+ +
+
+

+ +
+
+ +
+
+ +
+
+ +
+
+
+
\ No newline at end of file diff --git a/src/views/admin/settings/pagination.tpl b/src/views/admin/settings/pagination.tpl new file mode 100644 index 0000000000..5df5324e0c --- /dev/null +++ b/src/views/admin/settings/pagination.tpl @@ -0,0 +1,16 @@ + \ No newline at end of file diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl new file mode 100644 index 0000000000..609c032d57 --- /dev/null +++ b/src/views/admin/settings/post.tpl @@ -0,0 +1,61 @@ +
+
+
+
+ + +
+ + Seconds between Posts

+ Seconds before new user can post

+ Minimum Title Length

+ Maximum Title Length

+ Minimum Post Length

+
+ +
+ Chat Message Inbox Size

+
+ +
+ Maximum File Size

+ +
+ +
+ Topic Thumb Size

+ +

Composer Settings

+

+ The following settings govern the functionality and/or appearance of the post composer shown + to users when they create new topics, or reply to existing topics. +

+
+ +
+
+ +
+
+ + +
+
+
+
\ No newline at end of file diff --git a/src/views/admin/settings/sockets.tpl b/src/views/admin/settings/sockets.tpl new file mode 100644 index 0000000000..e2aef70383 --- /dev/null +++ b/src/views/admin/settings/sockets.tpl @@ -0,0 +1,21 @@ +
+
+
+
+ +
+
+
+ +
+
+
+ +
+

+ Leave blank if unsure. +

+
+
+
+
\ No newline at end of file diff --git a/src/views/admin/settings/tags.tpl b/src/views/admin/settings/tags.tpl new file mode 100644 index 0000000000..d81eef59bb --- /dev/null +++ b/src/views/admin/settings/tags.tpl @@ -0,0 +1,9 @@ +
+
+
+ Tags per Topic

+ Minimum Tag Length

+ Maximum Tag Length

+
+
+
\ No newline at end of file diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl new file mode 100644 index 0000000000..2a8819ced8 --- /dev/null +++ b/src/views/admin/settings/user.tpl @@ -0,0 +1,117 @@ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+

Avatars

+
+ +
+ +
+ + +
+ +
+ +
+ +
+ +
+ + +
+ + +

Account Protection

+
+ + +

+ If login attempts to a user's account exceeds this threshold, that account will be locked for a pre-configured amount of time +

+
+
+ + +
+
+ + +
+ +

Other

+
+ + +
+
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
\ No newline at end of file diff --git a/src/views/admin/settings/web-crawler.tpl b/src/views/admin/settings/web-crawler.tpl new file mode 100644 index 0000000000..b362d73605 --- /dev/null +++ b/src/views/admin/settings/web-crawler.tpl @@ -0,0 +1,23 @@ +
+
+
+ Custom Robots.txt Leave blank for default
+ +
+ +
+ Feeds +
+ +
+ +
+ +
+
+
+
\ No newline at end of file diff --git a/src/views/admin/sounds.tpl b/src/views/admin/sounds.tpl new file mode 100644 index 0000000000..4aff365532 --- /dev/null +++ b/src/views/admin/sounds.tpl @@ -0,0 +1,64 @@ + +
+

Sounds

+
+

+ Sounds for various actions in NodeBB can be configured here. +

+ +
+
+
General
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
Chat
+
+ +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/views/admin/tags.tpl b/src/views/admin/tags.tpl new file mode 100644 index 0000000000..2075ed4643 --- /dev/null +++ b/src/views/admin/tags.tpl @@ -0,0 +1,38 @@ +
+ +
+ No Tags +
+ + +
+ + +
+
+ +
+
+ {tags.value}{tags.score} +
+ +
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/src/views/admin/themes.tpl b/src/views/admin/themes.tpl new file mode 100644 index 0000000000..77c9096908 --- /dev/null +++ b/src/views/admin/themes.tpl @@ -0,0 +1,194 @@ +

Themes

+
+ +
+ + +
+
+

Installed Themes

+

+ The following themes are currently installed in this NodeBB instance. +

+
    +
  • Checking for installed themes...
    • +
+
+
+

Bootswatch Themes

+

+ NodeBB's skins are powered by Bootswatch, a repository containing themes built + with Bootstrap as a base theme. Currently, the Vanilla base theme is best optimized for use with Bootswatch. +

+
    +
  • Loading Themes
    • +
+ +

Revert to Default

+

+ This will remove any custom theme applied to your NodeBB, and restore the base theme. +

+
+
+

Custom CSS

+

+ You may also opt to enter your own CSS declarations here, which will be applied after all other styles. +

+ + +
+
+ +
+
+ +

Custom JS

+

+ You can enter custom JS here, it will be added to the head tag. +

+ + +
+
+ +
+
+ + + +
+ +

Custom Branding

+ +
+ + +
+ +
+ + + +
+
+

Widgets

+ +
+
+ + +
+ +
+ +
+

{templates.areas.name} {templates.template} / {templates.areas.location}

+
+ +
+
+ +
+ +
+ + +
+
+
+

Available Widgets Drag and drop widgets into templates

+ +
No widgets found! Activate the essential widgets plugin in the plugins control panel.
+ +
+ +
+
+
+ {widgets.name} +
{widgets.description} +
+ +
+
+ +
+
+
+
+

Available Containers Drag and drop on top of any widget

+
+
+ None +
+
+ Well +
+
+ Jumbotron +
+
+
+ Panel +
+
+
+
+ Panel Header +
+ + + + + + +
+
+
+ Panel Body +
+
+ +
+ Alert +
+ + + + +
+
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/views/admin/users.tpl b/src/views/admin/users.tpl new file mode 100644 index 0000000000..a4334f3ecd --- /dev/null +++ b/src/views/admin/users.tpl @@ -0,0 +1,107 @@ +

Users

+ + +Download CSV +
+ + +
+ +
+
+ + User not found!
+
+ + +
    + +
    + + +
    + + + {users.username} +
    + +
    + + {users.uid} +
    + + Admin + +
    + + Banned + +
    + +
+ + + + + +
+ +
+ diff --git a/src/views/emails/dailydigest.tpl b/src/views/emails/dailydigest.tpl new file mode 100644 index 0000000000..c692cc993c --- /dev/null +++ b/src/views/emails/dailydigest.tpl @@ -0,0 +1,44 @@ +

[[email:greeting_with_name, {username}]],

+ + +

[[email:digest.notifications, {site_title}]]

+ + + +
+ + +

[[email:digest.latest_topics, {site_title}]]

+
    + + +
  • + {recent.title} +
    • + + +
  • + [[email:digest.daily.no_topics]] +
    • + +
+ +

+ [[email:digest.cta, {site_title}]] +

+ +

+ [[email:closing]]
+ {site_title} +

+ +
+

+ [[email:digest.unsub.info]] [[email:unsub.cta]]. +

\ No newline at end of file diff --git a/src/views/emails/dailydigest_plaintext.tpl b/src/views/emails/dailydigest_plaintext.tpl new file mode 100644 index 0000000000..9a34b0615f --- /dev/null +++ b/src/views/emails/dailydigest_plaintext.tpl @@ -0,0 +1,31 @@ +[[email:welcome.greeting, {username}]], + + +[[email:digest.notifications, {site_title}]] + + +* {notifications.text} ({url}{notifications.path}) + + +=== + + +[[email:digest.latest_topics]] + + + +* {recent.title} ({url}/topic/{recent.slug}) + + +* [[email:digest.daily.no_topics]] + + +[[email:digest.cta, {site_title}]]: {url} + + +[[email:closing]] +{site_title} + +=== + +[[email:digest.unsub.info]] [[email:unsub.cta]]: {url}/user/{username}/settings. \ No newline at end of file diff --git a/src/views/emails/notif_chat.tpl b/src/views/emails/notif_chat.tpl new file mode 100644 index 0000000000..39bbe1e6cd --- /dev/null +++ b/src/views/emails/notif_chat.tpl @@ -0,0 +1,16 @@ +

[[email:greeting_with_name, {username}]],

+ +

{summary}:

+
{message.content}
+ +[[email:notif.chat.cta]] + +

+ [[email:closing]]
+ {site_title} +

+ +
+

+ [[email:notif.chat.unsub.info]] [[email:unsub.cta]]. +

\ No newline at end of file diff --git a/src/views/emails/notif_chat_plaintext.tpl b/src/views/emails/notif_chat_plaintext.tpl new file mode 100644 index 0000000000..a7b78ee481 --- /dev/null +++ b/src/views/emails/notif_chat_plaintext.tpl @@ -0,0 +1,15 @@ +[[email:greeting_with_name, {username}]], + +{summary}: + +{message.content} + +[[email:notif.chat.cta]]: {url} + + +[[email:closing]] +{site_title} + +=== + +[[email:notif.chat.unsub.info]] [[email:unsub.cta]]. diff --git a/src/views/emails/reset.tpl b/src/views/emails/reset.tpl new file mode 100644 index 0000000000..1f53dd08ad --- /dev/null +++ b/src/views/emails/reset.tpl @@ -0,0 +1,14 @@ +

[[email:greeting_no_name]],

+ +

[[email:reset.text1]]

+ +

[[email:reset.text2]]

+ +
+ [[email:reset.cta]] +
+ +

+ [[email:closing]]
+ {site_title} +

\ No newline at end of file diff --git a/src/views/emails/reset_plaintext.tpl b/src/views/emails/reset_plaintext.tpl new file mode 100644 index 0000000000..f7722c9f60 --- /dev/null +++ b/src/views/emails/reset_plaintext.tpl @@ -0,0 +1,10 @@ +[[email:greeting_no_name]], + +[[email:reset.text1]] + +[[email:reset.text2]] [[email:reset.cta]] + + {reset_link} + +[[email:closing]] +{site_title} \ No newline at end of file diff --git a/src/views/emails/test.tpl b/src/views/emails/test.tpl new file mode 100644 index 0000000000..b814dc9cae --- /dev/null +++ b/src/views/emails/test.tpl @@ -0,0 +1,8 @@ +

[[email:greeting_no_name]],

+ +

[[email:test.text1]]

+ +

+ [[email:closing]]
+ {site_title} +

\ No newline at end of file diff --git a/src/views/emails/test_plaintext.tpl b/src/views/emails/test_plaintext.tpl new file mode 100644 index 0000000000..e4555f5ae8 --- /dev/null +++ b/src/views/emails/test_plaintext.tpl @@ -0,0 +1,6 @@ +[[email:greeting_no_name]], + +[[email:test.text1]] + +[[email:closing]] +{site_title} \ No newline at end of file diff --git a/src/views/emails/welcome.tpl b/src/views/emails/welcome.tpl new file mode 100644 index 0000000000..1ed7ed650b --- /dev/null +++ b/src/views/emails/welcome.tpl @@ -0,0 +1,16 @@ +

[[email:greeting_with_name, {username}]],

+ +

+ [[email:welcome.text1, {site_title}]] +

+ +

[[email:welcome.text2]]

+ +
+ [[email:welcome.cta]] +
+ +

+ [[email:closing]]
+ {site_title} +

diff --git a/src/views/emails/welcome_plaintext.tpl b/src/views/emails/welcome_plaintext.tpl new file mode 100644 index 0000000000..a52b67c072 --- /dev/null +++ b/src/views/emails/welcome_plaintext.tpl @@ -0,0 +1,11 @@ +[[email:greeting_with_name, {username}]], + +[[email:welcome.text1, {site_title}]] + +[[email:welcome.text2]] [[email:welcome.cta]]: + + {confirm_link} + + +[[email:closing]] +{site_title} \ No newline at end of file diff --git a/src/views/maintenance.tpl b/src/views/maintenance.tpl new file mode 100644 index 0000000000..f5222cd00f --- /dev/null +++ b/src/views/maintenance.tpl @@ -0,0 +1,9 @@ + + + + {site_title} is currently in Maintenance Mode + + +

This site is in maintenance mode. Try again later.

+ + \ No newline at end of file