diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-08-17 16:14:15 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-17 16:14:15 -0700 |
| commit | 30fd17c58dccd688e99407b8c3a7b0cf9f4fbdfe (patch) | |
| tree | 36a41c8349b4f6a48011ba070c12b397c4221a57 /view/tpl | |
| parent | be3a272a80182074e7417e33cc280b523779254b (diff) | |
| parent | 4ebee195cc1b5cb8e0d79bb5c58b50b271fc68a7 (diff) | |
| download | volse-hubzilla-30fd17c58dccd688e99407b8c3a7b0cf9f4fbdfe.tar.gz volse-hubzilla-30fd17c58dccd688e99407b8c3a7b0cf9f4fbdfe.tar.bz2 volse-hubzilla-30fd17c58dccd688e99407b8c3a7b0cf9f4fbdfe.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
view/nl/messages.po
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_channels.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/admin_users.tpl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index a3390b179..8a2f4458a 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -32,7 +32,7 @@ <td class='channel_id'>{{$c.channel_id}}</td> <td class='channel_name'><a href="channel/{{$c.channel_address}}">{{$c.channel_name}}</a></td> <td class='channel_address'>{{$c.channel_address}}</td> - <td class="checkbox"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td> + <td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td> <td class="tools"> <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='icon-ban-circle admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a> <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='icon-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a> diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index aa0abb12f..f372911a0 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -31,7 +31,7 @@ <tr> <td class="created">{{$u.account_created}}</td> <td class="email">{{$u.account_email}}</td> - <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td> + <td class="checkbox_bulkedit"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}"></td> <td class="tools"> <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$approve}}"><i class="icon-thumbs-up-alt admin-icons"></i></a> <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="btn btn-default btn-xs" title="{{$deny}}"><i class="icon-thumbs-down-alt admin-icons"></i></a> @@ -71,7 +71,7 @@ <td class="login_date">{{$u.account_lastlog}}</td> <td class="account_expires">{{$u.account_expires}}</td> <td class="service_class">{{$u.account_service_class}}</td> - <td class="checkbox"><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="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="icon-ban-circle 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="icon-trash admin-icons"></i></a> </td> |