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

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	package.json
main
psychobunny 10 years ago
parent 0a3839c840 e859790d0c
commit e4096e86d4
13 changed files with 85 additions and 77 deletions
Show Stats Download Patch File Download Diff File

1
less/chats.less
Unescape Escape View File

@ -43,6 +43,7 @@
width:24px;
height:24px;
margin-left: 0.5em;
border-radius: 50%;
}
}
}

2
less/header.less
Unescape Escape View File

@ -129,6 +129,7 @@
max-width: 32px;
max-height: 32px;
float: left;
border-radius: 50%;
}
a {
@ -208,6 +209,7 @@
img {
width: 32px;
margin-right: 1em;
border-radius: 50%;
}
}

1
less/notifications.less
Unescape Escape View File

@ -34,6 +34,7 @@
.user-img {
width: 24px;
height: 24px;
border-radius: 50%;
}
}
}

2
package.json
Unescape Escape View File

@ -38,4 +38,4 @@
"bugs": {
"url": "https://github.com/psychobunny/nodebb-theme-persona/issues"
}
}
}

4
templates/account/edit.tpl
Unescape Escape View File

@ -114,7 +114,7 @@
<div class="input-group">
<input class="form-control" type="password" id="inputNewPassword" placeholder="[[user:password]]" value="">
<span class="input-group-addon">
<span id="password-notify"><i class="fa fa-circle-o"></i></span>
<span id="password-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
</span>
</div>
</div>
@ -124,7 +124,7 @@
<div class="input-group">
<input class="form-control" type="password" id="inputNewPasswordAgain" placeholder="[[user:confirm_password]]" value="">
<span class="input-group-addon">
<span id="password-confirm-notify"><i class="fa fa-circle-o"></i></span>
<span id="password-confirm-notify"><span class="msg"></span><i class="fa fa-circle-o"></i></span>
</span>
</div>
</div>

11
templates/account/favourites.tpl
Unescape Escape View File

@ -7,12 +7,13 @@
<!-- ENDIF !posts.length -->
<div class="row">
<div class="col-xs-12">
<!-- IMPORT partials/posts_list.tpl -->
<!-- IMPORT partials/posts_list.tpl -->
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
</div>
</div>
</div>

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

@ -1,7 +1,7 @@
<!-- IMPORT partials/account_menu.tpl -->
<div id="groups-list" class="groups">
<div component="groups/container" id="groups-list" class="groups row">
<!-- IF !groups.length -->
<div class="alert alert-warning">[[groups:no_groups_found]]</div>
<!-- ELSE -->

13
templates/account/posts.tpl
Unescape Escape View File

@ -4,16 +4,17 @@
<div class="favourites">
<!-- IF !posts.length -->
<div class="alert alert-info">[[user:has_no_posts]]</div>
<div class="alert alert-warning">[[user:has_no_posts]]</div>
<!-- ENDIF !posts.length -->
<div class="row">
<div class="col-xs-12">
<!-- IMPORT partials/posts_list.tpl -->
<!-- IMPORT partials/posts_list.tpl -->
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
<!-- IF config.usePagination -->
<!-- IMPORT partials/paginator.tpl -->
<!-- ENDIF config.usePagination -->
</div>
</div>
</div>

4
templates/account/profile.tpl
Unescape Escape View File

@ -25,7 +25,7 @@
<!-- ENDIF !config.disableChat -->
<a id="follow-btn" href="#" class="btn btn-success btn-sm <!-- IF isFollowing -->hide<!-- ENDIF isFollowing -->">[[user:follow]]</a>
<a id="unfollow-btn" href="#" class="btn btn-warning btn-sm <!-- IF !isFollowing -->hide<!-- ENDIF !isFollowing -->">[[user:unfollow]]</a>
<!-- IF isAdmin -->
<br/><br/>
@ -156,7 +156,7 @@
<div class="col-md-7">
<!-- IF !posts.length -->
<div class="alert alert-info">[[user:has_no_posts]]</div>
<div class="alert alert-warning">[[user:has_no_posts]]</div>
<!-- ENDIF !posts.length -->
<!-- IMPORT partials/posts_list.tpl -->
</div>

114
templates/chats.tpl
Unescape Escape View File

@ -1,65 +1,67 @@
<div class="col-sm-9">
<!-- IF !allowed -->
<div class="alert alert-warning">
[[error:chat-restricted]]
</div>
<!-- ENDIF !allowed -->
<!-- IF meta -->
<div class="panel panel-default expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
<div class="panel-heading">
<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
<h2 class="panel-title">[[modules:chat.message-history]]</h2>
<div class="row">
<div class="col-sm-9">
<!-- IF !allowed -->
<div class="alert alert-warning">
[[error:chat-restricted]]
</div>
<div class="panel-body">
<span class="since-bar"><a href="#" class="selected" data-since="recent">[[recent:title]]</a> &bull; <a href="#" data-since="week">[[modules:chat.seven_days]]</a> &bull; <a href="#" data-since="month">[[modules:chat.thirty_days]]</a> &bull; <a href="#" data-since="threemonths">[[modules:chat.three_months]]</a></span>
<ul class="chat-content">
<!-- IMPORT partials/chat_messages.tpl -->
</ul>
<div class="input-group">
<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input" rows="1"></textarea>
<span class="input-group-btn">
<button class="btn btn-primary" type="button" data-action="send">[[modules:chat.send]]</button>
</span>
<!-- ENDIF !allowed -->
<!-- IF meta -->
<div class="panel panel-default expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
<div class="panel-heading">
<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
<h2 class="panel-title">[[modules:chat.message-history]]</h2>
</div>
<div class="panel-body">
<span class="since-bar"><a href="#" class="selected" data-since="recent">[[recent:title]]</a> &bull; <a href="#" data-since="week">[[modules:chat.seven_days]]</a> &bull; <a href="#" data-since="month">[[modules:chat.thirty_days]]</a> &bull; <a href="#" data-since="threemonths">[[modules:chat.three_months]]</a></span>
<ul class="chat-content">
<!-- IMPORT partials/chat_messages.tpl -->
</ul>
<div class="input-group">
<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input" rows="1"></textarea>
<span class="input-group-btn">
<button class="btn btn-primary" type="button" data-action="send">[[modules:chat.send]]</button>
</span>
</div>
</div>
</div>
</div>
<!-- ELSE -->
<div class="alert alert-info">
[[modules:chat.no-messages]]
</div>
<!-- ENDIF meta -->
</div>
<div class="col-sm-3">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">[[modules:chat.contacts]]</h2>
</div>
<div class="panel-body">
<ul class="chats-list">
<!-- BEGIN contacts -->
<li data-username="{contacts.username}" data-uid="{contacts.uid}">
<i component="user/status" title="[[global:{contacts.status}]]" class="fa fa-circle status {contacts.status}"></i>
<img class="user-img" src="{contacts.picture}">
<span>{contacts.username}</span>
</li>
<!-- END contacts -->
</ul>
<!-- ELSE -->
<div class="alert alert-info">
[[modules:chat.no-messages]]
</div>
<!-- ENDIF meta -->
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">[[modules:chat.recent-chats]]</h2>
<div class="col-sm-3">
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">[[modules:chat.contacts]]</h2>
</div>
<div class="panel-body">
<ul class="chats-list">
<!-- BEGIN contacts -->
<li data-username="{contacts.username}" data-uid="{contacts.uid}">
<i component="user/status" title="[[global:{contacts.status}]]" class="fa fa-circle status {contacts.status}"></i>
<img class="user-img" src="{contacts.picture}">
<span>{contacts.username}</span>
</li>
<!-- END contacts -->
</ul>
</div>
</div>
<div class="panel-body">
<ul class="chats-list recent-chats" data-nextstart="{nextStart}">
<!-- BEGIN chats -->
<li data-username="{chats.username}" data-uid="{chats.uid}" class="<!-- IF chats.unread -->unread<!-- ENDIF chats.unread -->">
<i component="user/status" title="[[global:{chats.status}]]" class="fa fa-circle status {chats.status}"></i>
<img class="user-img" src="{chats.picture}">
<span>{chats.username}</span>
</li>
<!-- END chats -->
</ul>
<div class="panel panel-default">
<div class="panel-heading">
<h2 class="panel-title">[[modules:chat.recent-chats]]</h2>
</div>
<div class="panel-body">
<ul class="chats-list recent-chats" data-nextstart="{nextStart}">
<!-- BEGIN chats -->
<li data-username="{chats.username}" data-uid="{chats.uid}" class="<!-- IF chats.unread -->unread<!-- ENDIF chats.unread -->">
<i component="user/status" title="[[global:{chats.status}]]" class="fa fa-circle status {chats.status}"></i>
<img class="user-img" src="{chats.picture}">
<span>{chats.username}</span>
</li>
<!-- END chats -->
</ul>
</div>
</div>
</div>
</div>

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

@ -31,7 +31,7 @@
<span class="tag-list">
<!-- BEGIN tags -->
<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag">{topics.tags.value}</span></a>
<a href="{config.relative_path}/tags/{topics.tags.value}"><span class="tag" style="<!-- IF topics.tags.color -->color: {topics.tags.color};<!-- ENDIF topics.tags.color --><!-- IF topics.tags.bgColor -->background-color: {topics.tags.bgColor};<!-- ENDIF topics.tags.bgColor -->">{topics.tags.value}</span></a>
<!-- END tags -->
<!-- IF topics.tags.length --><small>&bull;</small><!-- ENDIF topics.tags.length -->
</span>

4
templates/unread.tpl
Unescape Escape View File

@ -34,11 +34,11 @@
</button>
<ul class="dropdown-menu" role="menu">
<li role="presentation" class="category">
<a role="menu-item" href="/unread"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
<a role="menu-item" href="{config.relative_path}/unread"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
</li>
<!-- BEGIN categories -->
<li role="presentation" class="category" data-cid="{categories.cid}">
<a role="menu-item" href="/unread?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
<a role="menu-item" href="{config.relative_path}/unread?cid={categories.cid}"><i class="fa fa-fw <!-- IF categories.selected -->fa-check<!-- ENDIF categories.selected -->"></i><!-- IF categories.icon --><i class="fa fa-fw {categories.icon}"></i><!-- ENDIF categories.icon --> {categories.name}</a>
</li>
<!-- END categories -->
</ul>

2
templates/users.tpl
Unescape Escape View File

@ -29,7 +29,7 @@
<!-- IMPORT partials/users_list.tpl -->
<!-- IF anonymousUserCount -->
<li class="users-box anon-user">
<img src="https://secure.gravatar.com/avatar/" />
<img src="{defaultGravatar}" />
<br/>
<div class="user-info">
<span id="online_anon_count">{anonymousUserCount}</span>

Write Preview
Loading…
Cancel
Save