diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-07 20:43:49 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-07 20:43:49 -0400 |
| commit | cf180f614207e6cdae44d1e3649a469b8982ade0 (patch) | |
| tree | e2ffae5bbc7f12577dce0a0b9a7a638df142dd18 /view | |
| parent | 2af8105b460d300ba41928734c960f5f70613952 (diff) | |
| parent | 67665a8b9d8ff1dbcc26a46837447544d8968784 (diff) | |
| download | volse-hubzilla-cf180f614207e6cdae44d1e3649a469b8982ade0.tar.gz volse-hubzilla-cf180f614207e6cdae44d1e3649a469b8982ade0.tar.bz2 volse-hubzilla-cf180f614207e6cdae44d1e3649a469b8982ade0.zip | |
Merge remote-tracking branch 'upstream/dev' into wiki
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/autocomplete.js | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_accounts.tpl (renamed from view/tpl/admin_users.tpl) | 6 | ||||
| -rwxr-xr-x | view/tpl/admin_channels.tpl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 33d825b55..59a9ed355 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -183,7 +183,7 @@ function string2bb(element) { }; smilies = { - match: /(^|\s)(:[a-z]{2,})$/, + match: /(^|\s)(:[a-z_:]{2,})$/, index: 2, search: function(term, callback) { $.getJSON('/smilies/json').done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, template: function(item) { return item.icon + item.text; }, diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_accounts.tpl index ae77ef24c..53f5f1aba 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_accounts.tpl @@ -13,7 +13,7 @@ <div class="generic-content-wrapper-styled" id="adminpage"> <h1>{{$title}} - {{$page}}</h1> - <form action="{{$baseurl}}/admin/users" method="post"> + <form action="{{$baseurl}}/admin/accounts" method="post"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <h3>{{$h_pending}}</h3> @@ -52,7 +52,7 @@ <table id="users"> <thead> <tr> - {{foreach $th_users as $th}}<th>{{$th}}</th>{{/foreach}} + {{foreach $th_users as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}} <th></th> <th></th> </tr> @@ -73,7 +73,7 @@ <td class="service_class">{{$u.account_service_class}}</td> <td class="checkbox_bulkedit"><input type="checkbox" class="users_ckbx" id="id_user_{{$u.account_id}}" name="user[]" value="{{$u.account_id}}"><input type="hidden" name="blocked[]" value="{{$u.blocked}}"></td> <td class="tools"> - <a href="{{$baseurl}}/admin/users/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/users/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a> + <a href="{{$baseurl}}/admin/accounts/{{if ($u.blocked)}}un{{/if}}block/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($u.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class="fa fa-ban admin-icons{{if ($u.blocked)}} dim{{/if}}"></i></a><a href="{{$baseurl}}/admin/accounts/delete/{{$u.account_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><i class="fa fa-trash-o admin-icons"></i></a> </td> </tr> {{/foreach}} diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index 6db963304..f15742f78 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -21,7 +21,7 @@ <table id='channels'> <thead> <tr> - {{foreach $th_channels as $th}}<th>{{$th}}</th>{{/foreach}} + {{foreach $th_channels as $th}}<th><a href="{{$base}}&key={{$th.1}}&dir={{$odir}}">{{$th.0}}</a></th>{{/foreach}} <th></th> <th></th> </tr> |