Merge remote-tracking branch 'origin/master' into user-icons
Conflicts: less/category.less templates/account/edit.tpl templates/groups/details.tplmain
Julian Lam
10 years ago
commit
a9753d7f52
@ -0,0 +1,31 @@
|
|||||||
|
<!-- IMPORT partials/account_menu.tpl -->
|
||||||
|
|
||||||
|
<div class="col-md-5">
|
||||||
|
<form class="form-horizontal">
|
||||||
|
|
||||||
|
<div class="control-group">
|
||||||
|
<label class="control-label" for="inputNewEmail">[[user:email]]</label>
|
||||||
|
<div class="controls">
|
||||||
|
<input class="form-control" type="text" id="inputNewEmail" placeholder="[[user:email]]" value="{email}">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- disables autocomplete on FF --><input type="password" style="display:none">
|
||||||
|
|
||||||
|
<!-- IF isSelf -->
|
||||||
|
<div class="control-group">
|
||||||
|
<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
|
||||||
|
<div class="controls">
|
||||||
|
<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- ENDIF isSelf -->
|
||||||
|
|
||||||
|
<input type="hidden" name="uid" id="inputUID" value="{uid}" />
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
<div class="form-actions">
|
||||||
|
<a id="submitBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_email]]</a>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
<!-- IMPORT partials/account_menu.tpl -->
|
||||||
|
|
||||||
|
<div class="col-md-5">
|
||||||
|
<form class='form-horizontal'>
|
||||||
|
<!-- disables autocomplete on FF --><input type="password" style="display:none">
|
||||||
|
|
||||||
|
<!-- IF isSelf -->
|
||||||
|
<div class="control-group">
|
||||||
|
<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
|
||||||
|
<div class="controls">
|
||||||
|
<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- ENDIF isSelf -->
|
||||||
|
|
||||||
|
<div class="control-group">
|
||||||
|
<label class="control-label" for="inputNewPassword">[[user:password]]</label>
|
||||||
|
<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"><span class="success hide"><i class="fa fa-check"></i></span><span class="error hide"></span><span class="default"><i class="fa fa-circle-o"></i></span></span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="control-group">
|
||||||
|
<label class="control-label" for="inputNewPasswordAgain">[[user:confirm_password]]</label>
|
||||||
|
<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"><span class="success hide"><i class="fa fa-check"></i></span><span class="error hide"></span><span class="default"><i class="fa fa-circle-o"></i></span></span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<br/>
|
||||||
|
<div class="form-actions">
|
||||||
|
<a id="changePasswordBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_password]]</a>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
<!-- IMPORT partials/account_menu.tpl -->
|
||||||
|
|
||||||
|
<div class="col-md-5">
|
||||||
|
<form class="form-horizontal">
|
||||||
|
|
||||||
|
<div class="control-group">
|
||||||
|
<label class="control-label" for="inputNewUsername">[[user:username]]</label>
|
||||||
|
<div class="controls">
|
||||||
|
<input class="form-control" type="text" id="inputNewUsername" placeholder="[[user:username]]" value="{username}">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- disables autocomplete on FF --><input type="password" style="display:none">
|
||||||
|
|
||||||
|
<!-- IF isSelf -->
|
||||||
|
<div class="control-group">
|
||||||
|
<label class="control-label" for="inputCurrentPassword">[[user:current_password]]</label>
|
||||||
|
<div class="controls">
|
||||||
|
<input autocomplete="off" class="form-control" type="password" id="inputCurrentPassword" placeholder="[[user:current_password]]" value=""<!-- IF !hasPassword --> disabled<!-- ENDIF !hasPassword -->>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- ENDIF isSelf -->
|
||||||
|
|
||||||
|
<input type="hidden" name="uid" id="inputUID" value="{uid}" />
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
<div class="form-actions">
|
||||||
|
<a id="submitBtn" href="#" class="btn btn-primary"><i class="hide fa fa-spinner fa-spin"></i> [[user:change_username]]</a>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
<input class="form-control" type="text" component="groups/members/search" placeholder="[[global:search]]"/><br/>
|
||||||
|
<table component="groups/members" class="table table-striped table-hover" data-nextstart="{group.membersNextStart}">
|
||||||
|
<!-- BEGIN members -->
|
||||||
|
<tr data-uid="{group.members.uid}">
|
||||||
|
<td>
|
||||||
|
<a href="{config.relative_path}/user/{group.members.userslug}">
|
||||||
|
<!-- IF group.members.picture -->
|
||||||
|
<img src="{group.members.picture}" />
|
||||||
|
<!-- ELSE -->
|
||||||
|
<div class="user-icon" style="background-color: {group.members.icon:bgColor};">{group.members.icon:text}</div>
|
||||||
|
<!-- ENDIF group.members.picture -->
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
<td class="member-name">
|
||||||
|
<a href="{config.relative_path}/user/{group.members.userslug}">{group.members.username}</a> <i title="[[groups:owner]]" class="fa fa-star text-warning <!-- IF !group.members.isOwner -->invisible<!-- ENDIF !group.members.isOwner -->"></i>
|
||||||
|
</td>
|
||||||
|
<!-- IF group.isOwner -->
|
||||||
|
<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="toggleOwnership">
|
||||||
|
[[groups:details.grant]]
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="#" data-ajaxify="false" data-action="kick">
|
||||||
|
[[groups:details.kick]]
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<!-- ENDIF group.isOwner -->
|
||||||
|
</tr>
|
||||||
|
<!-- END members -->
|
||||||
|
</table>
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
<div class="modal" tabindex="-1" role="dialog" aria-labelledby="Flag post" aria-hidden="true">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<div class="modal-content">
|
||||||
|
<div class="modal-header">
|
||||||
|
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||||
|
<h3>[[topic:flag]]</h3>
|
||||||
|
</div>
|
||||||
|
<div class="modal-body">
|
||||||
|
<div class="form-group">
|
||||||
|
<button class="btn btn-default form-control flag-reason">[[topic:spam]]</button>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<button class="btn btn-default form-control flag-reason">[[topic:offensive]]</button>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<textarea class="form-control" id="flag-reason-custom" placeholder="[[topic:custom-flag-reason]]"></textarea>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-footer">
|
||||||
|
<button type="button" class="btn btn-primary" id="flag-post-commit" disabled>[[topic:flag]]</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
<ul class="nav nav-pills">
|
||||||
|
<li><a href='{config.relative_path}/users/online'>[[global:online]]</a></li>
|
||||||
|
<li><a href='{config.relative_path}/users/sort-posts'>[[users:top_posters]]</a></li>
|
||||||
|
<!-- 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>
|
||||||
|
<!-- IF function.displayUserSearch, {config.allowGuestUserSearching} -->
|
||||||
|
<li><a href='{config.relative_path}/users/search'>[[users:search]]</a></li>
|
||||||
|
<!-- ENDIF function.displayUserSearch -->
|
||||||
|
<!-- IF inviteOnly -->
|
||||||
|
<button component="user/invite" class="btn btn-success pull-right"><i class="fa fa-users"></i> [[users:invite]]</button>
|
||||||
|
<!-- ENDIF inviteOnly -->
|
||||||
|
</ul>
|
||||||
Loading…
Reference in New Issue