diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-30 14:31:06 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-30 14:31:06 +0100 |
| commit | d24cf0b85b24cb8d6d10e9fe66fed568f9fb08b2 (patch) | |
| tree | 470336bcbdf0f989d48fb2c3349bd0ac0513da42 /view/tpl | |
| parent | 296117124c530ce7533431e6bb8a7958b89f7f51 (diff) | |
| parent | 0e2c539d93e36db0b095e1dcd5080ce2b5fec1d7 (diff) | |
| download | volse-hubzilla-d24cf0b85b24cb8d6d10e9fe66fed568f9fb08b2.tar.gz volse-hubzilla-d24cf0b85b24cb8d6d10e9fe66fed568f9fb08b2.tar.bz2 volse-hubzilla-d24cf0b85b24cb8d6d10e9fe66fed568f9fb08b2.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/admin_accounts.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/jot-header.tpl | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/view/tpl/admin_accounts.tpl b/view/tpl/admin_accounts.tpl index 3535363a0..d6c9591fd 100755 --- a/view/tpl/admin_accounts.tpl +++ b/view/tpl/admin_accounts.tpl @@ -41,7 +41,7 @@ </tbody> </table> <div class="selectall"><a href="#" onclick="return toggle_selectall('pending_ckbx');">{{$select_all}}</a></div> - <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"> <input type="submit" name="page_users_approve" value="{{$approve}}"></div> + <div class="submit"><input type="submit" name="page_accounts_deny" value="{{$deny}}"> <input type="submit" name="page_accounts_approve" value="{{$approve}}"></div> {{else}} <p>{{$no_pending}}</p> {{/if}} @@ -80,7 +80,7 @@ </tbody> </table> <div class="selectall"><a href="#" onclick="return toggle_selectall('users_ckbx');">{{$select_all}}</a></div> - <div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div> + <div class="submit"><input type="submit" name="page_accounts_block" value="{{$block}}/{{$unblock}}"> <input type="submit" name="page_accounts_delete" value="{{$delete}}" onclick="return confirm_delete_multi()"></div> {{else}} NO USERS?!? {{/if}} diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ffaa4e208..0ffc8b349 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -110,10 +110,21 @@ var activeCommentID = 0; var activeCommentText = ''; $(document).ready(function() { + /* enable tinymce on focus and click */ $("#profile-jot-text").focus(enableOnUser); $("#profile-jot-text").click(enableOnUser); + $('#id_mimetype').on('load', jotSetMime); + $('#id_mimetype').on('change', jotSetMime); + + function jotSetMime() { + var mtype = $('#id_mimetype').val(); + if(mtype == 'text/bbcode') + $('#profile-jot-submit-left').show(); + else + $('#profile-jot-submit-left').hide(); + } $('#invisible-wall-file-upload').fileupload({ url: 'wall_attach/{{$nickname}}', |