diff options
author | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
---|---|---|
committer | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
commit | ebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch) | |
tree | c23cbf55aac433c90ac254d0684dabf9d4528133 /view/tpl/chatroom_new.tpl | |
parent | 5cca00ddc79dad667464674e08a2a860e262eabd (diff) | |
parent | d0834c7e1394e1986b2b00e039125deff74d9e5e (diff) | |
download | volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2 volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
Diffstat (limited to 'view/tpl/chatroom_new.tpl')
-rw-r--r-- | view/tpl/chatroom_new.tpl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index 86eadb132..287f95cc0 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -2,10 +2,11 @@ <form action="chat" method="post" > {{include file="field_input.tpl" field=$name}} -<br /> -<br /> +<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button> {{$acl}} <div class="clear"></div> +<br /> +<br /> <input type="submit" name="submit" value="{{$submit}}" /> </form> |