Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-15 18:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-01-19 18:18:55 -05:00
parent 3d30c0bd87 3624717d84
commit c9f43a60b9
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,18 +6,17 @@
<script> <script>
var RELATIVE_PATH = "{relative_path}"; var RELATIVE_PATH = "{relative_path}";
</script> </script>
<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="//code.jquery.com/jquery.js"></script> <script src="//code.jquery.com/jquery.js"></script>
<script type="text/javascript" src="{relative_path}/vendor/bootstrap/js/bootstrap.min.js"></script> <script src="{relative_path}/vendor/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="//code.jquery.com/qunit/qunit-git.js"></script> <script src="//code.jquery.com/qunit/qunit-git.js"></script>
<link rel="stylesheet" type="text/css" href="//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 src="{relative_path}/socket.io/socket.io.js"></script>
<script type="text/javascript" src="{relative_path}/src/app.js"></script> <script src="{relative_path}/src/app.js?{cache-buster}"></script>
<script type="text/javascript" src="{relative_path}/src/templates.js"></script> <script src="{relative_path}/src/templates.js?{cache-buster}"></script>
<script type="text/javascript" src="{relative_path}/src/translator.js"></script> <script src="{relative_path}/src/translator.js?{cache-buster}"></script>
<script type="text/javascript" src="{relative_path}/src/ajaxify.js"></script> <script src="{relative_path}/src/ajaxify.js?{cache-buster}"></script>
<script src="{relative_path}/vendor/jquery/timeago/jquery.timeago.js"></script> <script src="{relative_path}/vendor/jquery/timeago/jquery.timeago.js"></script>
<script src="{relative_path}/vendor/jquery/js/jquery.form.js"></script> <script src="{relative_path}/vendor/jquery/js/jquery.form.js"></script>
<script src="{relative_path}/vendor/requirejs/require.js"></script> <script src="{relative_path}/vendor/requirejs/require.js"></script>
@@ -28,13 +27,14 @@
require.config({ require.config({
baseUrl: "{relative_path}/src/modules", baseUrl: "{relative_path}/src/modules",
waitSeconds: 3, waitSeconds: 3,
urlArgs: "{cache-buster}",
paths: { paths: {
"forum": '../forum' "forum": '../forum'
} }
}); });
</script> </script>
<link rel="stylesheet" type="text/css" href="//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="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script> <script 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" />

4
src/routes/admin.js
View File

@@ -34,7 +34,6 @@ var nconf = require('nconf'),
}; };
user.getUserFields(req.user.uid, ['username', 'userslug', 'picture'], function(err, userData) { user.getUserFields(req.user.uid, ['username', 'userslug', 'picture'], function(err, userData) {
plugins.fireHook('filter:admin.header.build', custom_header, function(err, custom_header) { plugins.fireHook('filter:admin.header.build', custom_header, function(err, custom_header) {
callback(err, templates['admin/header'].parse({ callback(err, templates['admin/header'].parse({
csrf: res.locals.csrf_token, csrf: res.locals.csrf_token,
@@ -43,7 +42,8 @@ var nconf = require('nconf'),
authentication: custom_header.authentication, authentication: custom_header.authentication,
userpicture: userData.picture, userpicture: userData.picture,
username: userData.username, username: userData.username,
userslug: userData.userslug userslug: userData.userslug,
'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
})); }));
}); });
}); });