Skip to content

Commit

Permalink
theme changes for NodeBB/NodeBB#2811
Browse files Browse the repository at this point in the history
  • Loading branch information
julianlam committed Jul 15, 2015
1 parent 069ca19 commit 273e960
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 2 deletions.
2 changes: 1 addition & 1 deletion less/groups.less
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
}
}

[component="groups/members"], [component="groups/pending"] {
[component="groups/members"], [component="groups/pending"], [component="groups/invited"] {
img {
width: 32px;
}
Expand Down
41 changes: 40 additions & 1 deletion templates/groups/details.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
</div>
</div>
<!-- IF group.isOwner -->
<!-- IF group.private -->
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title clearfix">
Expand All @@ -87,10 +88,12 @@
</div>
<!-- ENDIF group.pending.length -->
</h3>

</div>
<div class="panel-body">
<table component="groups/pending" class="table table-striped table-hover">
<!-- IF !group.pending.length -->
<div class="alert alert-info">[[groups:pending.none]]</div>
<!-- ENDIF !group.pending.length -->
<!-- BEGIN pending -->
<tr data-uid="{group.pending.uid}">
<td>
Expand All @@ -115,6 +118,42 @@
</table>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title clearfix">
<i class="fa fa-gift"></i> [[groups:details.invited]]
</h3>
</div>
<div class="panel-body">
<input class="form-control" type="text" component="groups/members/invite" placeholder="[[groups:invited.search]]"/><br/>
<table component="groups/invited" class="table table-striped table-hover">
<!-- IF !group.invited.length -->
<div class="alert alert-info">[[groups:invited.none]]</div>
<!-- ENDIF !group.invited.length -->
<!-- BEGIN invited -->
<tr data-uid="{group.invited.uid}">
<td>
<a href="{config.relative_path}/user/{group.invited.userslug}"><img src="{group.invited.picture}" /></a>
</td>
<td class="member-name">
<a href="{config.relative_path}/user/{group.invited.userslug}">{group.invited.username}</a>
</td>
<td>
<div class="btn-group pull-right">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
[[global:more]] <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="#" data-ajaxify="false" data-action="rescindInvite">[[groups:invited.uninvite]]</a></li>
</ul>
</div>
</td>
</tr>
<!-- END invited -->
</table>
</div>
</div>
<!-- ENDIF group.private -->
<!-- ENDIF group.isOwner -->
<div widget-area="left"></div>
</div>
Expand Down

0 comments on commit 273e960

Please sign in to comment.