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

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source
main
Julian Lam 10 years ago
parent a9753d7f52 ea83cd5a9f
commit da176aa418
13 changed files with 109 additions and 180 deletions
Show Stats Download Patch File Download Diff File

2
package.json
Unescape Escape View File

@ -1,6 +1,6 @@
{
"name": "nodebb-theme-persona",
"version": "3.0.56",
"version": "3.0.61",
"nbbpm": {
"compatibility": "^0.8.2"
},

2
templates/notifications.tpl
Unescape Escape View File

@ -31,7 +31,7 @@
<!-- ENDIF notifications.image -->
<p>
<a component="notifications/item/link" href="{notifications.path}">{notifications.bodyShort}</a>
<a component="notifications/item/link" href="{config.relative_path}{notifications.path}">{notifications.bodyShort}</a>
</p>
<p class="timestamp">
<span class="timeago" title="{notifications.datetimeISO}"></span>

3
templates/partials/paginator.tpl
Unescape Escape View File

@ -1,4 +1,3 @@
<div class="text-center pagination-container<!-- IF !pagination.pages.length --> hidden<!-- ENDIF !pagination.pages.length -->">
<ul class="pagination">
<li class="previous pull-left<!-- IF !pagination.prev.active --> disabled<!-- ENDIF !pagination.prev.active -->">
@ -21,4 +20,4 @@
<a href="?{pagination.next.qs}" data-page="{pagination.next.page}"> <i class="fa fa-chevron-right"></i></a>
</li>
</ul>
</div>
</div>

1
templates/partials/post_bar.tpl
Unescape Escape View File

@ -23,5 +23,4 @@
<!-- IMPORT partials/thread_tools.tpl -->
</div>
</div>
<hr/>

66
templates/partials/thread_tools.tpl
Unescape Escape View File

@ -5,70 +5,6 @@
<span class="visible-xs-inline"><i class="fa fa-fw fa-gear"></i></span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<!-- IF privileges.editable -->
<li>
<a component="topic/mark-unread-for-all" href="#">
<i class="fa fa-fw fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]
</a>
</li>
<li>
<a component="topic/pin" href="#" class="<!-- IF pinned -->hidden<!-- ENDIF pinned -->">
<i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread_tools.pin]]
</a>
</li>
<li>
<a component="topic/unpin" href="#" class="<!-- IF !pinned -->hidden<!-- ENDIF !pinned -->">
<i class="fa fa-fw fa-thumb-tack fa-rotate-90"></i> [[topic:thread_tools.unpin]]
</a>
</li>
<li>
<a component="topic/lock" href="#" class="<!-- IF locked -->hidden<!-- ENDIF locked -->">
<i class="fa fa-fw fa-lock"></i> [[topic:thread_tools.lock]]
</a>
</li>
<li>
<a component="topic/unlock" href="#" class="<!-- IF !locked -->hidden<!-- ENDIF !locked -->">
<i class="fa fa-fw fa-unlock"></i> [[topic:thread_tools.unlock]]
</a>
</li>
<li class="divider"></li>
<li>
<a component="topic/move" href="#">
<i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move]]
</a>
</li>
<li>
<a component="topic/fork" href="#">
<i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]
</a>
</li>
<li class="divider"></li>
<!-- ENDIF privileges.editable -->
<!-- IF privileges.deletable -->
<li>
<a component="topic/delete" href="#" class="<!-- IF deleted -->hidden<!-- ENDIF deleted -->">
<i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]
</a>
</li>
<li>
<a component="topic/restore" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->">
<i class="fa fa-fw fa-history"></i> [[topic:thread_tools.restore]]
</a>
</li>
<li>
<a component="topic/purge" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->">
<i class="fa fa-fw fa-eraser"></i> [[topic:thread_tools.purge]]
</a>
</li>
<!-- BEGIN thread_tools -->
<li>
<a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a>
</li>
<!-- END thread_tools -->
<!-- ENDIF privileges.deletable -->
</ul>
<ul class="dropdown-menu dropdown-menu-right"></ul>
</div>
<!-- ENDIF privileges.view_thread_tools -->

12
templates/partials/topic/badge.tpl
Unescape Escape View File

@ -1,9 +1,3 @@
<!-- IF posts.user.groups.length -->
<!-- BEGIN groups -->
<!-- IF ../selected -->
<!-- IF ../userTitleEnabled -->
<a href="{config.relative_path}/groups/{../slug}"><small class="label group-label inline-block" style="background-color: {../labelColor};"><!-- IF ../icon --><i class="fa {../icon}"></i> <!-- ENDIF ../icon -->{../userTitle}</small></a>
<!-- ENDIF ../userTitleEnabled -->
<!-- ENDIF ../selected -->
<!-- END groups -->
<!-- ENDIF posts.user.groups.length -->
<!-- IF posts.user.selectedGroup.slug -->
<a href="{config.relative_path}/groups/{posts.user.selectedGroup.slug}"><small class="label group-label inline-block" style="background-color: {posts.user.selectedGroup.labelColor};"><!-- IF posts.user.selectedGroup.icon --><i class="fa {posts.user.selectedGroup.icon}"></i> <!-- ENDIF posts.user.selectedGroup.icon -->{posts.user.selectedGroup.userTitle}</small></a>
<!-- ENDIF posts.user.selectedGroup.slug -->

75
templates/partials/topic/post-menu-list.tpl
Unescape Escape View File

@ -0,0 +1,75 @@
<!-- IF posts.display_moderator_tools -->
<li role="presentation" class="dropdown-header">[[topic:tools]]</li>
<li role="presentation">
<a component="post/edit" role="menuitem" tabindex="-1" href="#">
<span class="menu-icon"><i class="fa fa-pencil"></i></span> [[topic:edit]]
</a>
</li>
<li role="presentation">
<a component="post/delete" role="menuitem" tabindex="-1" href="#" class="<!-- IF posts.deleted -->hidden<!-- ENDIF posts.deleted -->">
<div class="inline menu-icon"><i class="fa fa-trash-o"></i></div> <span>[[topic:delete]]</span>
</a>
</li>
<li role="presentation">
<a component="post/restore" role="menuitem" tabindex="-1" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->">
<div class="inline menu-icon"><i class="fa fa-history"></i></div> <span>[[topic:restore]]</span>
</a>
</li>
<li role="presentation">
<a component="post/purge" role="menuitem" tabindex="-1" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->">
<span class="menu-icon"><i class="fa fa-eraser"></i></span> [[topic:purge]]
</a>
</li>
<!-- BEGIN posts.tools -->
<li role="presentation">
<a component="{posts.tools.action}" role="menuitem" tabindex="-1" href="#">
<span class="menu-icon"><i class="fa {posts.tools.icon}"></i></span> {{posts.tools.html}}
</a>
</li>
<!-- END posts.tools -->
<!-- IF posts.display_move_tools -->
<li role="presentation">
<a component="post/move" role="menuitem" tabindex="-1" href="#">
<span class="menu-icon"><i class="fa fa-arrows"></i></span> [[topic:move]]
</a>
</li>
<!-- ENDIF posts.display_move_tools -->
<li role="presentation" class="divider"></li>
<!-- ENDIF posts.display_moderator_tools -->
<li role="presentation">
<a component="post/favourite" role="menuitem" tabindex="-1" href="#" data-favourited="{posts.favourited}">
<span class="favourite-text">[[topic:favourite]]</span>
<span component="post/favourite-count" class="favouriteCount" data-favourites="{posts.reputation}">{posts.reputation}</span>&nbsp;
<i component="post/favourite/on" class="fa fa-heart <!-- IF !posts.favourited -->hidden<!-- ENDIF !posts.favourited -->"></i>
<i component="post/favourite/off" class="fa fa-heart-o <!-- IF posts.favourited -->hidden<!-- ENDIF posts.favourited -->"></i>
</a>
</li>
<!-- IF !config.disableSocialButtons -->
<li role="presentation" class="divider"></li>
<li role="presentation" class="dropdown-header">[[topic:share_this_post]]</li>
<li role="presentation">
<a role="menuitem" class="facebook-share" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-facebook"></i></span> Facebook</a>
</li>
<li role="presentation">
<a role="menuitem" class="twitter-share" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-twitter"></i></span> Twitter</a>
</li>
<li role="presentation">
<a role="menuitem" class="google-share" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-google-plus"></i></span> Google+</a>
</li>
<!-- ENDIF !config.disableSocialButtons -->
<li role="presentation" class="divider"></li>
<!-- IF !posts.selfPost -->
<li role="presentation">
<a component="post/flag" role="menuitem" tabindex="-1" href="#">
[[topic:flag_title]]
</a>
</li>
<!-- ENDIF !posts.selfPost -->

79
templates/partials/topic/post-menu.tpl
Unescape Escape View File

@ -1,81 +1,4 @@
<span class="dropdown moderator-tools">
<a href="#" data-toggle="dropdown"><i class="fa fa-fw fa-ellipsis-v"></i></a>
<ul class="dropdown-menu dropdown-menu-right" role="menu">
<!-- IF posts.display_moderator_tools -->
<li role="presentation" class="dropdown-header">[[topic:tools]]</li>
<li role="presentation">
<a component="post/edit" role="menuitem" tabindex="-1" href="#">
<span class="menu-icon"><i class="fa fa-pencil"></i></span> [[topic:edit]]
</a>
</li>
<li role="presentation">
<a component="post/delete" role="menuitem" tabindex="-1" href="#" class="<!-- IF posts.deleted -->hidden<!-- ENDIF posts.deleted -->">
<div class="inline menu-icon"><i class="fa fa-trash-o"></i></div> <span>[[topic:delete]]</span>
</a>
</li>
<li role="presentation">
<a component="post/restore" role="menuitem" tabindex="-1" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->">
<div class="inline menu-icon"><i class="fa fa-history"></i></div> <span>[[topic:restore]]</span>
</a>
</li>
<li role="presentation">
<a component="post/purge" role="menuitem" tabindex="-1" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->">
<span class="menu-icon"><i class="fa fa-eraser"></i></span> [[topic:purge]]
</a>
</li>
<!-- BEGIN posts.tools -->
<li role="presentation">
<a component="{posts.tools.action}" role="menuitem" tabindex="-1" href="#">
<span class="menu-icon"><i class="fa {posts.tools.icon}"></i></span> {{posts.tools.html}}
</a>
</li>
<!-- END posts.tools -->
<!-- IF posts.display_move_tools -->
<li role="presentation">
<a component="post/move" role="menuitem" tabindex="-1" href="#">
<span class="menu-icon"><i class="fa fa-arrows"></i></span> [[topic:move]]
</a>
</li>
<!-- ENDIF posts.display_move_tools -->
<li role="presentation" class="divider"></li>
<!-- ENDIF posts.display_moderator_tools -->
<li role="presentation">
<a component="post/favourite" role="menuitem" tabindex="-1" href="#" data-favourited="{posts.favourited}">
<span class="favourite-text">[[topic:favourite]]</span>
<span component="post/favourite-count" class="favouriteCount" data-favourites="{posts.reputation}">{posts.reputation}</span>&nbsp;
<i component="post/favourite/on" class="fa fa-heart <!-- IF !posts.favourited -->hidden<!-- ENDIF !posts.favourited -->"></i>
<i component="post/favourite/off" class="fa fa-heart-o <!-- IF posts.favourited -->hidden<!-- ENDIF posts.favourited -->"></i>
</a>
</li>
<!-- IF !config.disableSocialButtons -->
<li role="presentation" class="divider"></li>
<li role="presentation" class="dropdown-header">[[topic:share_this_post]]</li>
<li role="presentation">
<a role="menuitem" class="facebook-share" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-facebook"></i></span> Facebook</a>
</li>
<li role="presentation">
<a role="menuitem" class="twitter-share" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-twitter"></i></span> Twitter</a>
</li>
<li role="presentation">
<a role="menuitem" class="google-share" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-google-plus"></i></span> Google+</a>
</li>
<!-- ENDIF !config.disableSocialButtons -->
<li role="presentation" class="divider"></li>
<!-- IF !posts.selfPost -->
<li role="presentation">
<a component="post/flag" role="menuitem" tabindex="-1" href="#">
[[topic:flag_title]]
</a>
</li>
<!-- ENDIF !posts.selfPost -->
</ul>
<ul class="dropdown-menu dropdown-menu-right" role="menu"></ul>
</span>

1
templates/partials/topic/post.tpl
Unescape Escape View File

@ -57,7 +57,6 @@
<div component="post/signature" data-uid="{posts.user.uid}" class="post-signature">{posts.user.signature}</div>
<!-- ENDIF posts.user.signature -->
<small class="pull-right">
<span class="post-tools">
<a component="post/reply" href="#" class="no-select <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>

8
templates/partials/topic/reply-button.tpl
Unescape Escape View File

@ -1,9 +1,6 @@
<a component="topic/reply" href="#" class="btn btn-primary <!-- IF !privileges.topics:reply -->hidden<!-- ENDIF !privileges.topics:reply -->">[[topic:reply]]</a>
<!-- IF loggedIn -->
<!-- IF !privileges.topics:reply -->
<!-- IF locked -->
<a component="topic/reply/locked" class="btn btn-primary" disabled><i class="fa fa-lock"></i> [[topic:locked]]</a>
@ -19,7 +16,4 @@
<!-- IF !privileges.topics:reply -->
<a href="{config.relative_path}/login" class="btn btn-primary">[[topic:guest-login-reply]]</a>
<!-- ENDIF !privileges.topics:reply -->
<!-- ENDIF loggedIn -->
<!-- ENDIF loggedIn -->

21
templates/partials/topic/topic-menu-list.tpl
Unescape Escape View File

@ -0,0 +1,21 @@
<!-- IF privileges.editable -->
<li><a component="topic/mark-unread-for-all" href="#"><i class="fa fa-fw fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]</a></li>
<li><a component="topic/pin" href="#" class="<!-- IF pinned -->hidden<!-- ENDIF pinned -->"><i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread_tools.pin]]</a></li>
<li><a component="topic/unpin" href="#" class="<!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"><i class="fa fa-fw fa-thumb-tack fa-rotate-90"></i> [[topic:thread_tools.unpin]]</a></li>
<li><a component="topic/lock" href="#" class="<!-- IF locked -->hidden<!-- ENDIF locked -->"><i class="fa fa-fw fa-lock"></i> [[topic:thread_tools.lock]]</a></li>
<li><a component="topic/unlock" href="#" class="<!-- IF !locked -->hidden<!-- ENDIF !locked -->"><i class="fa fa-fw fa-unlock"></i> [[topic:thread_tools.unlock]]</a></li>
<li class="divider"></li>
<li><a component="topic/move" href="#"><i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move]]</a></li>
<li><a component="topic/fork" href="#"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
<li class="divider"></li>
<!-- ENDIF privileges.editable -->
<!-- IF privileges.deletable -->
<li><a component="topic/delete" href="#" class="<!-- IF deleted -->hidden<!-- ENDIF deleted -->"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]</a></li>
<li><a component="topic/restore" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->"><i class="fa fa-fw fa-history"></i> [[topic:thread_tools.restore]]</a></li>
<li><a component="topic/purge" href="#" class="<!-- IF !deleted -->hidden<!-- ENDIF !deleted -->"><i class="fa fa-fw fa-eraser"></i> [[topic:thread_tools.purge]]</a></li>
<!-- BEGIN thread_tools -->
<li><a href="#" class="{thread_tools.class}"><i class="fa fa-fw {thread_tools.icon}"></i> {thread_tools.title}</a></li>
<!-- END thread_tools -->
<!-- ENDIF privileges.deletable -->

2
templates/partials/users_list_menu.tpl
Unescape Escape View File

@ -4,7 +4,7 @@
<!-- IF !reputation:disabled -->
<li><a href='{config.relative_path}/users/sort-reputation'>[[users:most_reputation]]</a></li>
<!-- ENDIF !reputation:disabled -->
<li><a href='{config.relative_path}/users/map'>[[users:map]]</a></li>
<li <!-- IF template.usersMap -->class="active"<!-- ENDIF template.usersMap -->><a href='{config.relative_path}/users/map'>[[users:map]]</a></li>
<!-- IF function.displayUserSearch, {config.allowGuestUserSearching} -->
<li><a href='{config.relative_path}/users/search'>[[users:search]]</a></li>
<!-- ENDIF function.displayUserSearch -->

17
templates/topic.tpl
Unescape Escape View File

@ -6,7 +6,6 @@
<i class="pull-left fa fa-thumb-tack <!-- IF !pinned -->hidden<!-- ENDIF !pinned -->"></i> <i class="pull-left fa fa-lock <!-- IF !locked -->hidden<!-- ENDIF !locked -->"></i> <span class="topic-title" component="topic/title">{title}</span>
<span class="browsing-users hidden hidden-xs hidden-sm pull-right">
<span>[[category:browsing]]</span>
<div component="topic/browsing/list" class="thread_active_users active-users inline-block"></div>
@ -29,24 +28,16 @@
<meta itemprop="dateModified" content="{posts.relativeEditTime}">
<!-- IMPORT partials/topic/post.tpl -->
<!-- IF !posts.index -->
<div class="post-bar" data-index="{posts.index}">
<!-- IMPORT partials/post_bar.tpl -->
</div>
<!-- ENDIF !posts.index -->
</li>
<!-- END posts -->
</ul>
<div class="post-bar bottom-post-bar <!-- IF unreplied -->hidden<!-- ENDIF unreplied -->">
<div class="post-bar">
<!-- IMPORT partials/post_bar.tpl -->
</div>
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
<div class="visible-xs visible-sm pagination-block text-center">
@ -59,12 +50,10 @@
<i class="fa fa-2x fa-angle-double-down pointer fa-fw pagebottom"></i>
</div>
</div>
</div>
</div>
<!-- IF !config.usePagination -->
<noscript>
<!-- IMPORT partials/paginator.tpl -->
</noscript>
<!-- ENDIF !config.usePagination -->
<!-- ENDIF !config.usePagination -->
Write Preview
Loading…
Cancel
Save