Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-07 13:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source
This commit is contained in:
Baris Usakli
2017-08-16 15:17:26 -04:00
parent c3b1f31a5f a9b1a0bdc4
commit bc0645dc26
19 changed files with 134 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/admin/general/navigation.tpl
View File

@@ -78,6 +78,12 @@
<span class="mdl-switch__label"><strong>[[admin/general/navigation:only-logged-in]]</strong></span>
</label>
</div>
<div class="checkbox">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
<input class="mdl-switch__input" type="checkbox" name="property:guestOnly" <!-- IF enabled.properties.guestOnly -->checked<!-- ENDIF enabled.properties.guestOnly -->/>
<span class="mdl-switch__label"><strong>[[admin/general/navigation:only-guest]]</strong></span>
</label>
</div>
<div class="checkbox">
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
<input class="mdl-switch__input" type="checkbox" name="property:targetBlank" <!-- IF enabled.properties.targetBlank -->checked<!-- ENDIF enabled.properties.targetBlank -->/>

9
src/views/admin/manage/post-queue.tpl
View File

@@ -16,6 +16,7 @@
<thead>
<tr>
<th>[[admin/manage/post-queue:user]]</th>
<th>[[admin/manage/post-queue:category]]</th>
<th>[[admin/manage/post-queue:title]]</th>
<th>[[admin/manage/post-queue:content]]</th>
<th>[[admin/manage/post-queue:posted]]</th>
@@ -33,9 +34,15 @@
<!-- ENDIF posts.user.userslug -->
</td>
<td class="col-md-2">
<a href="{config.relative_path}/category/{posts.category.slug}"><!-- IF posts.categiry.icon --><span class="fa-stack"><i style="color: {posts.category.bgColor};" class="fa fa-circle fa-stack-2x"></i><i style="color: {posts.category.color};" class="fa fa-stack-1x fa-fw {posts.category.icon}"></i></span><!-- ENDIF posts.category.icon --> {posts.category.name}</a>
</td>
<td class="col-md-2">
<!-- IF posts.data.tid -->
<a href="{config.relative_path}/topic/{posts.data.tid}">[[admin/manage/post-queue:reply-to, {posts.topic.title}]]</a>
<!-- ENDIF posts.data.tid -->
{posts.data.title}
</td>
<td class="col-md-7">
<td class="col-md-5">
{posts.data.content}
</td>
<td class="col-md-1">

2
src/views/admin/partials/categories/privileges.tpl
View File

@@ -85,7 +85,7 @@
{privileges.groups.name}
</td>
<td></td>
{function.spawnPrivilegeStates, name, privileges}
{function.spawnPrivilegeStates, privileges.groups.name, privileges}
</tr>
<!-- END privileges.groups -->
<tr>