hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
v1.18.x
Julian Lam 11 years ago
parent 724dcb88c0 e5ec5242c6
commit f90beca449
32 changed files with 133 additions and 117 deletions
Show Stats Download Patch File Download Diff File

10
public/src/forum/accountheader.js
Unescape Escape View File

@ -29,11 +29,11 @@ define(function() {
AccountHeader.createMenu = function() { AccountHeader.createMenu = function() {
var userslug = $('.account-username-box').attr('data-userslug'); var userslug = $('.account-username-box').attr('data-userslug');
var links = $('<div class="account-sub-links inline-block pull-right">\ var links = $('<div class="account-sub-links inline-block pull-right">\
<span id="settingsLink" class="pull-right"><a href="/user/' + userslug + '/settings">settings</a></span>\ <span id="settingsLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/settings">settings</a></span>\
<span id="favouritesLink" class="pull-right"><a href="/user/' + userslug + '/favourites">favourites</a></span>\ <span id="favouritesLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/favourites">favourites</a></span>\
<span class="pull-right"><a href="/user/' + userslug + '/followers">followers</a></span>\ <span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/followers">followers</a></span>\
<span class="pull-right"><a href="/user/' + userslug + '/following">following</a></span>\ <span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/following">following</a></span>\
<span id="editLink" class="pull-right"><a href="/user/' + userslug + '/edit">edit</a></span>\ <span id="editLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/edit">edit</a></span>\
</div>'); </div>');
$('.account-username-box').append(links); $('.account-username-box').append(links);

4
public/src/forum/category.js
Unescape Escape View File

@ -53,8 +53,8 @@ define(['composer'], function(composer) {
li.setAttribute('data-pid', posts[i].pid); li.setAttribute('data-pid', posts[i].pid);
li.innerHTML = '<a href="/user/' + posts[i].userslug + '"><img title="' + posts[i].username + '" style="width: 48px; height: 48px; /*temporary*/" class="img-rounded user-img" src="' + posts[i].picture + '" class="" /></a>' + li.innerHTML = '<a href="' + RELATIVE_PATH + '/user/' + posts[i].userslug + '"><img title="' + posts[i].username + '" style="width: 48px; height: 48px; /*temporary*/" class="img-rounded user-img" src="' + posts[i].picture + '" class="" /></a>' +
'<a href="/topic/' + posts[i].topicSlug + '#' + posts[i].pid + '">' + '<a href="' + RELATIVE_PATH + '/topic/' + posts[i].topicSlug + '#' + posts[i].pid + '">' +
'<strong><span>'+ posts[i].username + '</span></strong>' + '<strong><span>'+ posts[i].username + '</span></strong>' +
'<p>' + '<p>' +
posts[i].content + posts[i].content +

2
public/src/forum/footer.js
Unescape Escape View File

@ -39,7 +39,7 @@
if (userLabel.length) { if (userLabel.length) {
if (data['userslug']) if (data['userslug'])
userLabel.find('#user-profile-link').attr('href', '/user/' + data['userslug']); userLabel.find('#user-profile-link').attr('href', RELATIVE_PATH + '/user/' + data['userslug']);
if (data['picture']) if (data['picture'])
userLabel.find('img').attr('src', data['picture']); userLabel.find('img').attr('src', data['picture']);
if (data['username']) if (data['username'])

4
public/src/forum/topic.js
Unescape Escape View File

@ -406,10 +406,10 @@ define(['composer'], function(composer) {
var activeEl = $('.thread_active_users'); var activeEl = $('.thread_active_users');
function createUserIcon(uid, picture, userslug, username) { function createUserIcon(uid, picture, userslug, username) {
if(!activeEl.find("[href='/user/"+ data.users[i].userslug + "']").length) { if(!activeEl.find('[href="'+ RELATIVE_PATH +'/user/' + data.users[i].userslug + '"]').length) {
var userIcon = $('<img src="'+ picture +'"/>'); var userIcon = $('<img src="'+ picture +'"/>');
var userLink = $('<a href="/user/' + userslug + '"></a>').append(userIcon); var userLink = $('<a href="' + RELATIVE_PATH + '/user/' + userslug + '"></a>').append(userIcon);
userLink.attr('data-uid', uid); userLink.attr('data-uid', uid);
var div = $('<div class="inline-block"></div>'); var div = $('<div class="inline-block"></div>');

9
public/src/translator.js
Unescape Escape View File

@ -25,6 +25,15 @@
module.exports = translator; module.exports = translator;
// Use this in plugins to add your own translation files.
translator.addTranslation = function(filename, translations) {
files.loaded[filename] = translations;
};
translator.getLanguage = function() {
return DEFAULT_LANGUAGE;
};
translator.get = function (key, callback) { translator.get = function (key, callback) {
var parsedKey = key.split(':'), var parsedKey = key.split(':'),
languageFile = parsedKey[0]; languageFile = parsedKey[0];

2
public/templates/account.tpl
Unescape Escape View File

@ -3,7 +3,7 @@
<div class="account-username-box" data-userslug="{userslug}"> <div class="account-username-box" data-userslug="{userslug}">
<span class="account-username"> <span class="account-username">
<a href="/user/{userslug}">{username}</a> <a href="{relative_path}/user/{userslug}">{username}</a>
</span> </span>
</div> </div>

4
public/templates/accountedit.tpl
Unescape Escape View File

@ -32,8 +32,8 @@
<div class="account-username-box" data-userslug="{userslug}"> <div class="account-username-box" data-userslug="{userslug}">
<span class="account-username"> <span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> <a href="{relative_path}/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/edit">[[user:edit]]</a> <a href="{relative_path}/user/{userslug}/edit">[[user:edit]]</a>
</span> </span>
</div> </div>

4
public/templates/accountsettings.tpl
Unescape Escape View File

@ -2,8 +2,8 @@
<div class="account-username-box" data-userslug="{userslug}"> <div class="account-username-box" data-userslug="{userslug}">
<span class="account-username"> <span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> <a href="{relative_path}/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/settings">[[user:settings]]</a> <a href="{relative_path}/user/{userslug}/settings">[[user:settings]]</a>
</span> </span>
</div> </div>

20
public/templates/admin/header.tpl
Unescape Escape View File

@ -8,10 +8,10 @@
</script> </script>
<link id="base-theme" href="{relative_path}/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen"> <link id="base-theme" href="{relative_path}/vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" href="{relative_path}/vendor/fontawesome/css/font-awesome.min.css"> <link rel="stylesheet" href="{relative_path}/vendor/fontawesome/css/font-awesome.min.css">
<script type="text/javascript" src="http://code.jquery.com/jquery.js"></script> <script type="text/javascript" src="//code.jquery.com/jquery.js"></script>
<script type="text/javascript" src="{relative_path}/vendor/bootstrap/js/bootstrap.min.js"></script> <script type="text/javascript" src="{relative_path}/vendor/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="http://code.jquery.com/qunit/qunit-git.js"></script> <script type="text/javascript" src="//code.jquery.com/qunit/qunit-git.js"></script>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/qunit/qunit-git.css"> <link rel="stylesheet" type="text/css" href="//code.jquery.com/qunit/qunit-git.css">
<link rel="stylesheet" type="text/css" href="{relative_path}/vendor/colorpicker/colorpicker.css"> <link rel="stylesheet" type="text/css" href="{relative_path}/vendor/colorpicker/colorpicker.css">
<script type="text/javascript" src="{relative_path}/socket.io/socket.io.js"></script> <script type="text/javascript" src="{relative_path}/socket.io/socket.io.js"></script>
<script type="text/javascript" src="{relative_path}/src/app.js"></script> <script type="text/javascript" src="{relative_path}/src/app.js"></script>
@ -33,8 +33,8 @@
} }
}); });
</script> </script>
<link rel="stylesheet" type="text/css" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css"> <link rel="stylesheet" type="text/css" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">
<script type="text/javascript" src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script> <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
<script src="{relative_path}/src/utils.js"></script> <script src="{relative_path}/src/utils.js"></script>
<link rel="stylesheet" type="text/css" href="{relative_path}/css/theme.css" /> <link rel="stylesheet" type="text/css" href="{relative_path}/css/theme.css" />
@ -49,18 +49,18 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="/admin/index">NodeBB ACP</a> <a class="navbar-brand" href="{relative_path}/admin/index">NodeBB ACP</a>
</div> </div>
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li> <li>
<a href="/admin/index"><i class="fa fa-home" title="Home"></i></a> <a href="{relative_path}/admin/index"><i class="fa fa-home" title="Home"></i></a>
</li> </li>
<li> <li>
<a href="/admin/settings"><i class="fa fa-cogs" title="Settings"></i></a> <a href="{relative_path}/admin/settings"><i class="fa fa-cogs" title="Settings"></i></a>
</li> </li>
<li> <li>
<a href="/" target="_top"><i class="fa fa-book" title="Forum"></i></a> <a href="{relative_path}/" target="_top"><i class="fa fa-book" title="Forum"></i></a>
</li> </li>
<li> <li>
<a href="#" id="reconnect"></a> <a href="#" id="reconnect"></a>
@ -74,7 +74,7 @@
</a> </a>
<ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown"> <ul id="user-control-list" class="dropdown-menu" aria-labelledby="user_dropdown">
<li> <li>
<a id="user-profile-link" href="/user/{userslug}" target="_top"><span>Profile</span></a> <a id="user-profile-link" href="{relative_path}/user/{userslug}" target="_top"><span>Profile</span></a>
</li> </li>
<li id="logout-link"> <li id="logout-link">
<a href="#">Log out</a> <a href="#">Log out</a>

12
public/templates/admin/users.tpl
Unescape Escape View File

@ -3,10 +3,10 @@
<button id="createUser" class="btn btn-primary">Create User</button> <button id="createUser" class="btn btn-primary">Create User</button>
<hr /> <hr />
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li class='active'><a href='/admin/users/latest'>Latest Users</a></li> <li class='active'><a href='{relative_path}/admin/users/latest'>Latest Users</a></li>
<li class=''><a href='/admin/users/sort-posts'>Top Posters</a></li> <li class=''><a href='{relative_path}/admin/users/sort-posts'>Top Posters</a></li>
<li class=''><a href='/admin/users/sort-reputation'>Most Reputation</a></li> <li class=''><a href='{relative_path}/admin/users/sort-reputation'>Most Reputation</a></li>
<li class=''><a href='/admin/users/search'>Search</a></li> <li class=''><a href='{relative_path}/admin/users/search'>Search</a></li>
</ul> </ul>
<br /> <br />
@ -19,11 +19,11 @@
<ul id="users-container" class="users admin"> <ul id="users-container" class="users admin">
<!-- BEGIN users --> <!-- BEGIN users -->
<div class="users-box" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}" data-banned="{users.banned}"> <div class="users-box" data-uid="{users.uid}" data-admin="{users.administrator}" data-username="{users.username}" data-banned="{users.banned}">
<a href="/user/{users.userslug}"> <a href="{relative_path}/user/{users.userslug}">
<img src="{users.picture}" class="img-thumbnail"/> <img src="{users.picture}" class="img-thumbnail"/>
</a> </a>
<br/> <br/>
<a href="/user/{users.userslug}">{users.username}</a> <a href="{relative_path}/user/{users.userslug}">{users.username}</a>
<br/> <br/>
<div title="reputation"> <div title="reputation">
<i class='fa fa-star'></i> <i class='fa fa-star'></i>

11
public/templates/category.tpl
Unescape Escape View File

@ -1,11 +1,10 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a> <a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
</li> </li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">{category_name} <a target="_blank" href="../{category_id}.rss"><i class="fa fa-rss-square"></i></a></span> <span itemprop="title">{category_name} <a target="_blank" href="../{category_id}.rss"><i class="fa fa-rss-square"></i></a></span>
</li> </li>
<div id="category_active_users"></div>
</ol> </ol>
<div> <div>
@ -56,7 +55,7 @@
</span> </span>
| |
<span> <span>
<a href="/user/{topics.userslug}"> <a href="../../user/{topics.userslug}">
<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/> <img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a> </a>
[[category:posted]] <span class="timeago" title="{topics.relativeTime}"></span> [[category:posted]] <span class="timeago" title="{topics.relativeTime}"></span>
@ -66,7 +65,7 @@
<!-- IF topics.unreplied --> <!-- IF topics.unreplied -->
[[category:no_replies]] [[category:no_replies]]
<!-- ELSE --> <!-- ELSE -->
<a href="/user/{topics.teaser_userslug}"> <a href="../../user/{topics.teaser_userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> <img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</a> </a>
<a href="../../topic/{topics.slug}#{topics.teaser_pid}"> <a href="../../topic/{topics.slug}#{topics.teaser_pid}">
@ -95,7 +94,7 @@
<div class="panel-heading">[[category:sidebar.active_participants]]</div> <div class="panel-heading">[[category:sidebar.active_participants]]</div>
<div class="panel-body active-users"> <div class="panel-body active-users">
<!-- BEGIN active_users --> <!-- BEGIN active_users -->
<a data-uid="{active_users.uid}" href="/user/{active_users.userslug}"><img title="{active_users.username}" src="{active_users.picture}" class="img-rounded user-img" /></a> <a data-uid="{active_users.uid}" href="../../user/{active_users.userslug}"><img title="{active_users.username}" src="{active_users.picture}" class="img-rounded user-img" /></a>
<!-- END active_users --> <!-- END active_users -->
</div> </div>
</div> </div>
@ -104,7 +103,7 @@
<div class="panel-heading">[[category:sidebar.moderators]]</div> <div class="panel-heading">[[category:sidebar.moderators]]</div>
<div class="panel-body moderators"> <div class="panel-body moderators">
<!-- BEGIN moderators --> <!-- BEGIN moderators -->
<a href="/user/{moderators.userslug}"><img title="{moderators.username}" src="{moderators.picture}" class="img-rounded" /></a> <a href="../../user/{moderators.userslug}"><img title="{moderators.username}" src="{moderators.picture}" class="img-rounded" /></a>
<!-- END moderators --> <!-- END moderators -->
</div> </div>
</div> </div>

2
public/templates/confirm.tpl
Unescape Escape View File

@ -2,6 +2,6 @@
<strong>{title}</strong> <strong>{title}</strong>
<p>{text}</p> <p>{text}</p>
<p> <p>
<a href="/">[[notifications:back_to_home]]</a> <a href="{relative_path}/">[[notifications:back_to_home]]</a>
</p> </p>
</div> </div>

6
public/templates/favourites.tpl
Unescape Escape View File

@ -1,13 +1,13 @@
<div class="well favourites"> <div class="well favourites">
<div class="account-username-box" data-userslug="{userslug}"> <div class="account-username-box" data-userslug="{userslug}">
<span class="account-username"> <span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> <a href="{relative_path}/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/favourites">[[topic:favourites]]</a> <a href="{relative_path}/user/{userslug}/favourites">[[topic:favourites]]</a>
</span> </span>
</div> </div>
<!-- IF show_nofavourites --> <!-- IF show_nofavourites -->
<div id="no-favourites-notice" class="alert alert-warning">[[topic:has_no_favourites]]</div> <div id="no-favourites-notice" class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
<!-- ENDIF show_nofavourites --> <!-- ENDIF show_nofavourites -->
<div class="row"> <div class="row">

8
public/templates/followers.tpl
Unescape Escape View File

@ -2,20 +2,20 @@
<div class="account-username-box" data-userslug="{userslug}"> <div class="account-username-box" data-userslug="{userslug}">
<span class="account-username"> <span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> <a href="../../user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/followers">[[user:followers]]</a> <a href="../../user/{userslug}/followers">[[user:followers]]</a>
</span> </span>
</div> </div>
<div> <div>
<!-- BEGIN followers --> <!-- BEGIN followers -->
<div class="users-box"> <div class="users-box">
<a href="/user/{followers.userslug}"> <a href="../../user/{followers.userslug}">
<img src="{followers.picture}" class="img-thumbnail"/> <img src="{followers.picture}" class="img-thumbnail"/>
</a> </a>
<br/> <br/>
<div class="user-info"> <div class="user-info">
<a href="/user/{followers.userslug}">{followers.username}</a> <a href="../../user/{followers.userslug}">{followers.username}</a>
<br/> <br/>
<div title="reputation" class="reputation"> <div title="reputation" class="reputation">
<i class='fa fa-star'></i> <i class='fa fa-star'></i>

8
public/templates/following.tpl
Unescape Escape View File

@ -2,20 +2,20 @@
<div class="account-username-box" data-userslug="{userslug}"> <div class="account-username-box" data-userslug="{userslug}">
<span class="account-username"> <span class="account-username">
<a href="/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i> <a href="../../user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
<a href="/user/{userslug}/following">[[user:following]]</a> <a href="../../user/{userslug}/following">[[user:following]]</a>
</span> </span>
</div> </div>
<div> <div>
<!-- BEGIN following --> <!-- BEGIN following -->
<div class="users-box"> <div class="users-box">
<a href="/user/{following.userslug}"> <a href="../../user/{following.userslug}">
<img src="{following.picture}" class="img-thumbnail"/> <img src="{following.picture}" class="img-thumbnail"/>
</a> </a>
<br/> <br/>
<div class="user-info"> <div class="user-info">
<a href="/user/{following.userslug}">{following.username}</a> <a href="../../user/{following.userslug}">{following.username}</a>
<br/> <br/>
<div title="reputation" class="reputation"> <div title="reputation" class="reputation">
<span class='formatted-number'>{following.reputation}</span> <span class='formatted-number'>{following.reputation}</span>

2
public/templates/footer.tpl
Unescape Escape View File

@ -63,7 +63,7 @@
<footer id="footer" class="container footer hide"> <footer id="footer" class="container footer hide">
{footerHTML} {footerHTML}
<div class="copyright"> <div class="copyright">
Copyright &copy; 2013 <a target="_blank" href="http://www.nodebb.com">NodeBB Forums</a> | <a target="_blank" href="//github.com/designcreateplay/NodeBB/graphs/contributors">Contributors</a> Copyright &copy; 2013 <a target="_blank" href="https://www.nodebb.com">NodeBB Forums</a> | <a target="_blank" href="//github.com/designcreateplay/NodeBB/graphs/contributors">Contributors</a>
</div> </div>
</footer> </footer>

24
public/templates/header.tpl
Unescape Escape View File

@ -40,10 +40,10 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<div> <div>
<a href="/"> <a href="{relative_path}/">
<img class="{brand:logo:display} forum-logo" src="{brand:logo}" /> <img class="{brand:logo:display} forum-logo" src="{brand:logo}" />
</a> </a>
<a href="/"> <a href="{relative_path}/">
<h1 class="navbar-brand forum-title">{title}</h1> <h1 class="navbar-brand forum-title">{title}</h1>
</a> </a>
</div> </div>
@ -52,23 +52,23 @@
<div class="navbar-collapse collapse navbar-ex1-collapse"> <div class="navbar-collapse collapse navbar-ex1-collapse">
<ul id="main-nav" class="nav navbar-nav"> <ul id="main-nav" class="nav navbar-nav">
<li> <li>
<a href="/recent"><i class="fa fa-clock-o" title="[[global:header.recent]]"></i></a> <a href="{relative_path}/recent"><i class="fa fa-clock-o" title="[[global:header.recent]]"></i></a>
</li> </li>
<li class="nodebb-loggedin"> <li class="nodebb-loggedin">
<a href="/unread"><i class="fa fa-envelope" title="[[global:header.unread]]"> <span id="numUnreadBadge" class="">0</span></i></a> <a href="{relative_path}/unread"><i class="fa fa-envelope" title="[[global:header.unread]]"> <span id="numUnreadBadge" class="">0</span></i></a>
</li> </li>
<li> <li>
<a href="/users"><i class="fa fa-users" title="[[global:header.users]]"></i></a> <a href="{relative_path}/users"><i class="fa fa-users" title="[[global:header.users]]"></i></a>
</li> </li>
<li class="{adminDisplay}"> <li class="{adminDisplay}">
<a href="/admin"><i class="fa fa-cogs" title="[[global:header.admin]]"></i></a> <a href="{relative_path}/admin"><i class="fa fa-cogs" title="[[global:header.admin]]"></i></a>
</li> </li>
<li class="visible-xs"> <li class="visible-xs">
<a href="/search">[[global:header.search]]</a> <a href="{relative_path}/search">[[global:header.search]]</a>
</li> </li>
<!-- BEGIN navigation --> <!-- BEGIN navigation -->
<li class="{navigation.class}"> <li class="{navigation.class}">
<a href="{navigation.route}" title="{navigation.title}"> <a href="{relative_path}{navigation.route}" title="{navigation.title}">
<!-- IF navigation.iconClass --> <!-- IF navigation.iconClass -->
<i class="fa {navigation.iconClass}"></i> <i class="fa {navigation.iconClass}"></i>
<!-- ENDIF navigation.iconClass --> <!-- ENDIF navigation.iconClass -->
@ -123,20 +123,20 @@
<ul id="logged-out-menu" class="nav navbar-nav navbar-right"> <ul id="logged-out-menu" class="nav navbar-nav navbar-right">
<!-- IF allowRegistration --> <!-- IF allowRegistration -->
<li class="visible-lg visible-md visible-sm"> <li class="visible-lg visible-md visible-sm">
<a href="/register">[[global:register]]</a> <a href="{relative_path}/register">[[global:register]]</a>
</li> </li>
<!-- ENDIF allowRegistration --> <!-- ENDIF allowRegistration -->
<li class="visible-lg visible-md visible-sm"> <li class="visible-lg visible-md visible-sm">
<a href="/login">[[global:login]]</a> <a href="{relative_path}/login">[[global:login]]</a>
</li> </li>
<li class="visible-xs"> <li class="visible-xs">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a> <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="loggedout_dropdown"><i class="fa fa-sign-in"></i></a>
<ul class="dropdown-menu" aria-labelledby="loggedout_dropdown"> <ul class="dropdown-menu" aria-labelledby="loggedout_dropdown">
<li> <li>
<a href="/register">[[global:register]]</a> <a href="{relative_path}/register">[[global:register]]</a>
</li> </li>
<li> <li>
<a href="/login">[[global:login]]</a> <a href="{relative_path}/login">[[global:login]]</a>
</li> </li>
</ul> </ul>
</li> </li>

2
public/templates/home.tpl
Unescape Escape View File

@ -5,7 +5,7 @@
<div class="row home" itemscope itemtype="http://www.schema.org/ItemList"> <div class="row home" itemscope itemtype="http://www.schema.org/ItemList">
<!-- BEGIN categories --> <!-- BEGIN categories -->
<div class="{categories.class}"> <div class="{categories.class}">
<a href="category/{categories.slug}" itemprop="url"> <a href="{relative_path}/category/{categories.slug}" itemprop="url">
<meta itemprop="name" content="{categories.name}"> <meta itemprop="name" content="{categories.name}">
<h4><span class="badge {categories.badgeclass}">{categories.topic_count} </span> {categories.name}</h4> <h4><span class="badge {categories.badgeclass}">{categories.topic_count} </span> {categories.name}</h4>
<div class="icon" style="background: {categories.background}; color: {categories.color};"> <div class="icon" style="background: {categories.background}; color: {categories.color};">

4
public/templates/login.tpl
Unescape Escape View File

@ -1,6 +1,6 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a> <a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
</li> </li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">[[login:login]]</span> <span itemprop="title">[[login:login]]</span>
@ -41,7 +41,7 @@
<div class="form-group"> <div class="form-group">
<div class="col-lg-offset-2 col-lg-10"> <div class="col-lg-offset-2 col-lg-10">
<hr /> <hr />
<button class="btn btn-primary btn-lg btn-block" id="login" type="submit">[[login:login]]</button> &nbsp; <a id="reset-link" class="hide" href="/reset">[[login:forgot_password]]</a> <button class="btn btn-primary btn-lg btn-block" id="login" type="submit">[[login:login]]</button> &nbsp; <a id="reset-link" class="hide" href="{relative_path}/reset">[[login:forgot_password]]</a>
</div> </div>
</div> </div>
<input type="hidden" name="_csrf" value="{token}" id="csrf-token" /> <input type="hidden" name="_csrf" value="{token}" id="csrf-token" />

2
public/templates/logout.tpl
Unescape Escape View File

@ -1,6 +1,6 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a> <a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
</li> </li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">[[global:logout]]</span> <span itemprop="title">[[global:logout]]</span>

1
public/templates/noscript/category.tpl
Unescape Escape View File

@ -1,7 +1,6 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/">Home</a></li> <li><a href="/">Home</a></li>
<li class="active">{category_name}</li> <li class="active">{category_name}</li>
<div id="category_active_users"></div>
</ol> </ol>
<ul class="topics"> <ul class="topics">
<!-- BEGIN topics --> <!-- BEGIN topics -->

2
public/templates/outgoing.tpl
Unescape Escape View File

@ -1,7 +1,7 @@
<div class="outgoing"> <div class="outgoing">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">Home</span></a> <a href="{relative_path}/" itemprop="url"><span itemprop="title">Home</span></a>
</li> </li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">[[notifications:outgoing_link]]</span> <span itemprop="title">[[notifications:outgoing_link]]</span>

22
public/templates/recent.tpl
Unescape Escape View File

@ -1,17 +1,17 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/">Home</a></li> <li><a href="{relative_path}/">Home</a></li>
<li class="active">Recent <a href="/recent.rss"><i class="fa fa-rss-square"></i></a></li> <li class="active">Recent <a href="{relative_path}/recent.rss"><i class="fa fa-rss-square"></i></a></li>
</ol> </ol>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li class=''><a href='/recent/day'>[[recent:day]]</a></li> <li class=''><a href='{relative_path}/recent/day'>[[recent:day]]</a></li>
<li class=''><a href='/recent/week'>[[recent:week]]</a></li> <li class=''><a href='{relative_path}/recent/week'>[[recent:week]]</a></li>
<li class=''><a href='/recent/month'>[[recent:month]]</a></li> <li class=''><a href='{relative_path}/recent/month'>[[recent:month]]</a></li>
</ul> </ul>
<br /> <br />
<a href="/recent"> <a href="{relative_path}/recent">
<div class="alert alert-warning hide" id="new-topics-alert"></div> <div class="alert alert-warning hide" id="new-topics-alert"></div>
</a> </a>
@ -27,7 +27,7 @@
<div class="row"> <div class="row">
<div class="col-md-12 col-xs-12 topic-row img-thumbnail"> <div class="col-md-12 col-xs-12 topic-row img-thumbnail">
<a href="../../topic/{topics.slug}"> <a href="{relative_path}/topic/{topics.slug}">
<h3><span class="topic-title"><strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong> {topics.title}</span></h3> <h3><span class="topic-title"><strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong> {topics.title}</span></h3>
</a> </a>
<small> <small>
@ -42,11 +42,11 @@
</span> </span>
| |
<span> <span>
<a href="/user/{topics.userslug}"> <a href="{relative_path}/user/{topics.userslug}">
<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/> <img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a> </a>
posted in posted in
<a href="../../category/{topics.categorySlug}"> <a href="{relative_path}/category/{topics.categorySlug}">
<i class="fa {topics.categoryIcon}"></i> {topics.categoryName} <i class="fa {topics.categoryIcon}"></i> {topics.categoryName}
</a> </a>
<span class="timeago" title="{topics.relativeTime}"></span> <span class="timeago" title="{topics.relativeTime}"></span>
@ -57,10 +57,10 @@
<!-- IF topics.unreplied --> <!-- IF topics.unreplied -->
No one has replied No one has replied
<!-- ELSE --> <!-- ELSE -->
<a href="/user/{topics.teaser_userslug}"> <a href="{relative_path}/user/{topics.teaser_userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> <img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</a> </a>
<a href="../../topic/{topics.slug}#{topics.teaser_pid}"> <a href="{relative_path}/topic/{topics.slug}#{topics.teaser_pid}">
replied replied
</a> </a>
<span class="timeago" title="{topics.teaser_timestamp}"></span> <span class="timeago" title="{topics.teaser_timestamp}"></span>

2
public/templates/register.tpl
Unescape Escape View File

@ -1,6 +1,6 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a> <a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
</li> </li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">[[register:register]]</span> <span itemprop="title">[[register:register]]</span>

3
public/templates/reset.tpl
Unescape Escape View File

@ -1,6 +1,6 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a> <a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
</li> </li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">[[reset_password:reset_password]]</span> <span itemprop="title">[[reset_password:reset_password]]</span>
@ -10,6 +10,7 @@
<div class="alert alert-info"> <div class="alert alert-info">
[[reset_password:reset_password:enter_email]] [[reset_password:reset_password:enter_email]]
</div> </div>
<div class="well"> <div class="well">
<div class="alert alert-success" id="success" style="display:none"> <div class="alert alert-success" id="success" style="display:none">
<button type="button" class="close" data-dismiss="alert">&times;</button> <button type="button" class="close" data-dismiss="alert">&times;</button>

4
public/templates/reset_code.tpl
Unescape Escape View File

@ -1,9 +1,9 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a> <a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
</li> </li>
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/reset" itemprop="url"><span itemprop="title">[[reset_password:reset_password]]</span></a> <a href="{relative_path}/reset" itemprop="url"><span itemprop="title">[[reset_password:reset_password]]</span></a>
</li> </li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">[[reset_password:update_password]]</span> <span itemprop="title">[[reset_password:update_password]]</span>

6
public/templates/search.tpl
Unescape Escape View File

@ -1,5 +1,5 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/">[[global:home]]</a></li> <li><a href="{relative_path}/">[[global:home]]</a></li>
<li class="active">[[global:header.search]]</li> <li class="active">[[global:header.search]]</li>
</ol> </ol>
@ -26,7 +26,7 @@
<!-- BEGIN topics --> <!-- BEGIN topics -->
<li class="category-item"> <li class="category-item">
<a href="../../topic/{topics.slug}" id="tid-{topics.tid}"> <a href="{relative_path}/topic/{topics.slug}" id="tid-{topics.tid}">
<div> <div>
<div class="col-md-12 img-thumbnail"> <div class="col-md-12 img-thumbnail">
<div class="search-result-post"> <div class="search-result-post">
@ -50,7 +50,7 @@
<ul id="topics-container" data-search-query="{search_query}"> <ul id="topics-container" data-search-query="{search_query}">
<!-- BEGIN posts --> <!-- BEGIN posts -->
<li class="category-item"> <li class="category-item">
<a href="../../topic/{posts.topicSlug}#{posts.pid}" id="tid-{posts.tid}"> <a href="{relative_path}/topic/{posts.topicSlug}#{posts.pid}" id="tid-{posts.tid}">
<div> <div>
<div class="col-md-12 img-thumbnail"> <div class="col-md-12 img-thumbnail">
<div class="search-result-post"> <div class="search-result-post">

14
public/templates/topic.tpl
Unescape Escape View File

@ -13,10 +13,10 @@
<div class="topic"> <div class="topic">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/" itemprop="url"><span itemprop="title">[[global:home]]</span></a> <a href="{relative_path}/" itemprop="url"><span itemprop="title">[[global:home]]</span></a>
</li> </li>
<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<a href="/category/{category_slug}" itemprop="url"><span itemprop="title">{category_name}</span></a> <a href="{relative_path}/category/{category_slug}" itemprop="url"><span itemprop="title">{category_name}</span></a>
</li> </li>
<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb"> <li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
<span itemprop="title">{topic_name} <a target="_blank" href="../{topic_id}.rss"><i class="fa fa-rss-square"></i></a></span> <span itemprop="title">{topic_name} <a target="_blank" href="../{topic_id}.rss"><i class="fa fa-rss-square"></i></a></span>
@ -33,7 +33,7 @@
<meta itemprop="dateModified" content="{posts.relativeEditTime}"> <meta itemprop="dateModified" content="{posts.relativeEditTime}">
<div class="col-md-1 profile-image-block hidden-xs hidden-sm sub-post"> <div class="col-md-1 profile-image-block hidden-xs hidden-sm sub-post">
<a href="/user/{posts.userslug}"> <a href="{relative_path}/user/{posts.userslug}">
<img src="{posts.picture}" align="left" class="img-thumbnail" itemprop="image" /> <img src="{posts.picture}" align="left" class="img-thumbnail" itemprop="image" />
<!-- IF posts.user_banned --> <!-- IF posts.user_banned -->
<span class="label label-danger">[[topic:banned]]</span> <span class="label label-danger">[[topic:banned]]</span>
@ -44,7 +44,7 @@
<div class="col-md-11"> <div class="col-md-11">
<div class="post-block"> <div class="post-block">
<a class="main-post avatar" href="/user/{posts.userslug}"> <a class="main-post avatar" href="{relative_path}/user/{posts.userslug}">
<img itemprop="image" src="{posts.picture}" align="left" class="img-thumbnail" width=150 height=150 /> <img itemprop="image" src="{posts.picture}" align="left" class="img-thumbnail" width=150 height=150 />
</a> </a>
<h3 class="main-post"> <h3 class="main-post">
@ -54,12 +54,12 @@
<div class="topic-buttons"> <div class="topic-buttons">
<div class="btn-group"> <div class="btn-group">
<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {posts.username}"> <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {posts.username}">
<span class="username-field" href="/user/{posts.userslug}" itemprop="author">{posts.username}&nbsp;</span> <span class="username-field" href="{relative_path}/user/{posts.userslug}" itemprop="author">{posts.username}&nbsp;</span>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="/user/{posts.userslug}"><i class="fa fa-user"></i> [[topic:profile]]</a></li> <li><a href="{relative_path}/user/{posts.userslug}"><i class="fa fa-user"></i> [[topic:profile]]</a></li>
<li><a href="#" class="chat"><i class="fa fa-comment"></i> [[topic:chat]]</a></li> <li><a href="#" class="chat"><i class="fa fa-comment"></i> [[topic:chat]]</a></li>
</ul> </ul>
</div> </div>
@ -120,7 +120,7 @@
<span class="pull-right"> <span class="pull-right">
[[category:posted]] <span class="relativeTimeAgo timeago" title="{posts.relativeTime}"></span> [[category:posted]] <span class="relativeTimeAgo timeago" title="{posts.relativeTime}"></span>
<!-- IF posts.editor --> <!-- IF posts.editor -->
<span>| [[category:last_edited_by]] <strong><a href="/user/{posts.editorslug}">{posts.editorname}</a></strong></span> <span>| [[category:last_edited_by]] <strong><a href="{relative_path}/user/{posts.editorslug}">{posts.editorname}</a></strong></span>
<span class="timeago" title="{posts.relativeEditTime}"></span> <span class="timeago" title="{posts.relativeEditTime}"></span>
<!-- ENDIF posts.editor --> <!-- ENDIF posts.editor -->
</span> </span>

17
public/templates/unread.tpl
Unescape Escape View File

@ -1,8 +1,7 @@
<div class="unread"> <div class="unread">
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/">[[global:home]]</a></li> <li><a href="{relative_path}/">[[global:home]]</a></li>
<li class="active">{category_name}</li> <li class="active">{category_name}</li>
<div id="category_active_users"></div>
</ol> </ol>
<div class="alert alert-warning {no_topics_message}" id="category-no-topics"> <div class="alert alert-warning {no_topics_message}" id="category-no-topics">
@ -11,7 +10,7 @@
<button id="mark-allread-btn" class="btn btn-primary {show_markallread_button}">[[unread:mark_all_read]]</button> <button id="mark-allread-btn" class="btn btn-primary {show_markallread_button}">[[unread:mark_all_read]]</button>
<a href="/unread"> <a href="{relative_path}/unread">
<div class="alert alert-warning hide" id="new-topics-alert"></div> <div class="alert alert-warning hide" id="new-topics-alert"></div>
</a> </a>
@ -22,7 +21,7 @@
<li class="category-item {topics.deleted-class}"> <li class="category-item {topics.deleted-class}">
<div class="row"> <div class="row">
<div class="col-md-12 topic-row"> <div class="col-md-12 topic-row">
<a href="../../topic/{topics.slug}"> <a href="{relative_path}/topic/{topics.slug}">
<h3><span class="topic-title"><strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong> {topics.title}</span></h3> <h3><span class="topic-title"><strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong> {topics.title}</span></h3>
</a> </a>
<small> <small>
@ -37,11 +36,11 @@
</span> </span>
| |
<span> <span>
<a href="/user/{topics.userslug}"> <a href="{relative_path}/user/{topics.userslug}">
<img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/> <img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a> </a>
posted in posted in
<a href="../../category/{topics.categorySlug}"> <a href="{relative_path}/category/{topics.categorySlug}">
<i class="fa {topics.categoryIcon}"></i> {topics.categoryName} <i class="fa {topics.categoryIcon}"></i> {topics.categoryName}
</a> </a>
<span class="timeago" title="{topics.relativeTime}"></span> <span class="timeago" title="{topics.relativeTime}"></span>
@ -52,10 +51,10 @@
<!-- IF topics.unreplied --> <!-- IF topics.unreplied -->
No one has replied No one has replied
<!-- ELSE --> <!-- ELSE -->
<a href="/user/{topics.teaser_userslug}"> <a href="{relative_path}/user/{topics.teaser_userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> <img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</a> </a>
<a href="../../topic/{topics.slug}#{topics.teaser_pid}"> <a href="{relative_path}/topic/{topics.slug}#{topics.teaser_pid}">
replied replied
</a> </a>
<span class="timeago" title="{topics.teaser_timestamp}"></span> <span class="timeago" title="{topics.teaser_timestamp}"></span>

16
public/templates/users.tpl
Unescape Escape View File

@ -1,15 +1,15 @@
<div class="users"> <div class="users">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li class=''><a href='/users/latest'>[[users:latest_users]]</a></li> <li class=''><a href='{relative_path}/users/latest'>[[users:latest_users]]</a></li>
<li class=''><a href='/users/sort-posts'>[[users:top_posters]]</a></li> <li class=''><a href='{relative_path}/users/sort-posts'>[[users:top_posters]]</a></li>
<li class=''><a href='/users/sort-reputation'>[[users:most_reputation]]</a></li> <li class=''><a href='{relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
<li class=''><a href='/users/online'>[[users:online]]</a></li> <li class=''><a href='{relative_path}/users/online'>[[users:online]]</a></li>
<li class=''><a href='/users/search'>[[users:search]]</a></li> <li class=''><a href='{relative_path}/users/search'>[[users:search]]</a></li>
</ul> </ul>
<br /> <br />
<div class="search {search_display} well">
<div class="search {search_display} well">
<div class="input-group"> <div class="input-group">
<input class="form-control" id="search-user" type="text" placeholder="[[users:enter_username]]"/> <input class="form-control" id="search-user" type="text" placeholder="[[users:enter_username]]"/>
<span class="input-group-addon"> <span class="input-group-addon">
@ -21,12 +21,12 @@
<ul id="users-container" class="users-container"> <ul id="users-container" class="users-container">
<!-- BEGIN users --> <!-- BEGIN users -->
<li class="users-box registered-user"> <li class="users-box registered-user">
<a href="/user/{users.userslug}"> <a href="{relative_path}/user/{users.userslug}">
<img src="{users.picture}" class="img-thumbnail"/> <img src="{users.picture}" class="img-thumbnail"/>
</a> </a>
<br/> <br/>
<div class="user-info"> <div class="user-info">
<a href="/user/{users.userslug}">{users.username}</a> <a href="{relative_path}/user/{users.userslug}">{users.username}</a>
<br/> <br/>
<div title="reputation" class="reputation"> <div title="reputation" class="reputation">
<i class='fa fa-star'></i> <i class='fa fa-star'></i>

2
src/routes/api.js
Unescape Escape View File

@ -67,7 +67,7 @@ var path = require('path'),
data.motd_class = (parseInt(meta.config.show_motd, 10) === 1 || meta.config.show_motd === undefined) ? '' : ' none'; data.motd_class = (parseInt(meta.config.show_motd, 10) === 1 || meta.config.show_motd === undefined) ? '' : ' none';
data.motd_class += (meta.config.motd && meta.config.motd.length > 0 ? '' : ' default'); data.motd_class += (meta.config.motd && meta.config.motd.length > 0 ? '' : ' default');
data.motd = require('marked')(meta.config.motd || "<div class=\"pull-right btn-group\"><a target=\"_blank\" href=\"http://www.nodebb.org\" class=\"btn btn-default btn-lg\"><i class=\"fa fa-comment\"></i><span class='hidden-mobile'>&nbsp;Get NodeBB</span></a> <a target=\"_blank\" href=\"https://github.com/designcreateplay/NodeBB\" class=\"btn btn-default btn-lg\"><i class=\"fa fa-github\"></i><span class='hidden-mobile'>&nbsp;Fork us on Github</span></a> <a target=\"_blank\" href=\"https://twitter.com/NodeBB\" class=\"btn btn-default btn-lg\"><i class=\"fa fa-twitter\"></i><span class='hidden-mobile'>&nbsp;@NodeBB</span></a></div>\n\n# NodeBB <span>v" + pkg.version + "</span>\nWelcome to NodeBB, the discussion platform of the future."); data.motd = require('marked')(meta.config.motd || "<div class=\"pull-right btn-group\"><a target=\"_blank\" href=\"https://www.nodebb.org\" class=\"btn btn-default btn-lg\"><i class=\"fa fa-comment\"></i><span class='hidden-mobile'>&nbsp;Get NodeBB</span></a> <a target=\"_blank\" href=\"https://github.com/designcreateplay/NodeBB\" class=\"btn btn-default btn-lg\"><i class=\"fa fa-github\"></i><span class='hidden-mobile'>&nbsp;Fork us on Github</span></a> <a target=\"_blank\" href=\"https://twitter.com/NodeBB\" class=\"btn btn-default btn-lg\"><i class=\"fa fa-twitter\"></i><span class='hidden-mobile'>&nbsp;@NodeBB</span></a></div>\n\n# NodeBB <span>v" + pkg.version + "</span>\nWelcome to NodeBB, the discussion platform of the future.");
res.json(data); res.json(data);
}); });
}); });

15
src/webserver.js
Unescape Escape View File

@ -1,11 +1,10 @@
var path = require('path'), var path = require('path'),
fs = require('fs'), fs = require('fs'),
nconf = require('nconf'),
express = require('express'), express = require('express'),
express_namespace = require('express-namespace'), express_namespace = require('express-namespace'),
WebServer = express(), WebServer = express(),
server = require('http').createServer(WebServer), server,
nconf = require('nconf'),
winston = require('winston'), winston = require('winston'),
validator = require('validator'), validator = require('validator'),
async = require('async'), async = require('async'),
@ -30,6 +29,16 @@ var path = require('path'),
plugins = require('./plugins'), plugins = require('./plugins'),
logger = require('./logger'); logger = require('./logger');
if(nconf.get('ssl')) {
server = require('https').createServer({
key: fs.readFileSync(nconf.get('ssl').key),
cert: fs.readFileSync(nconf.get('ssl').cert)
}, WebServer);
} else {
server = require('http').createServer(WebServer);
}
(function (app) { (function (app) {
"use strict"; "use strict";

Write Preview
Loading…
Cancel
Save