Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-24 08:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2013-11-25 16:28:14 -05:00
parent 5a5c3c8c60 905e451455
commit 2a8a38b742
2 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -43,7 +43,7 @@
"nodebb-plugin-mentions": "~0.1.14",
"nodebb-plugin-markdown": "~0.1.8",
"nodebb-theme-vanilla": "designcreateplay/nodebb-theme-vanilla",
"nodebb-theme-cerulean": "0.0.8",
"nodebb-theme-cerulean": "0.0.9",
"cron": "~1.0.1"
},
"optionalDependencies": {

38
public/templates/category.tpl
View File

@@ -83,43 +83,35 @@
</ul>
</div>
<div class="col-md-3 {show_sidebar} category-sidebar">
<div class="sidebar-block img-thumbnail">
<div class="block-header">
[[category:sidebar.recent_replies]]
</div>
<div class="block-content recent-replies">
<div class="panel panel-default">
<div class="panel-heading">[[category:sidebar.recent_replies]]</div>
<div class="panel-body recent-replies">
<ul id="category_recent_replies"></ul>
</div>
</div>
<div class="sidebar-block img-thumbnail">
<div class="block-header">
[[category:sidebar.active_participants]]
</div>
<div class="block-content active-users">
<div class="panel panel-default">
<div class="panel-heading">[[category:sidebar.active_participants]]</div>
<div class="panel-body 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>
<!-- END active_users -->
</div>
</div>
<div class="sidebar-block img-thumbnail {moderator_block_class}">
<div class="block-header">
[[category:sidebar.moderators]]
</div>
<div class="block-content">
<div class="panel panel-default {moderator_block_class}">
<div class="panel-heading">[[category:sidebar.moderators]]</div>
<div class="panel-body moderators">
<!-- BEGIN moderators -->
<a href="/user/{moderators.userslug}"><img title="{moderators.username}" src="{moderators.picture}" class="img-rounded" /></a>
<!-- END moderators -->
</div>
</div>
<!-- BEGIN sidebars -->
<div class="sidebar-block img-thumbnail {sidebars.block_class}">
<div class="block-header">
{sidebars.header}
</div>
<div class="block-content">
{sidebars.content}
</div>
<div class="panel panel-default">
<div class="panel panel-default {sidebars.block_class}">{sidebars.header}</div>
<div class="panel-body">{sidebars.content}</div>
</div>
<!-- END sidebars -->
</div>