diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/tpl/chatroom_new.tpl | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/tpl/chatroom_new.tpl')
| -rw-r--r-- | view/tpl/chatroom_new.tpl | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index c64f21c97..8acff2ff5 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -1,14 +1,12 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$header}}</h1> - -<form action="chat" method="post" > -{{include file="field_input.tpl" field=$name}} -{{include file="field_input.tpl" field=$chat_expire}} -<button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;" >{{$permissions}}</button> -{{$acl}} -<div class="clear"></div> -<br /> -<br /> -<input id="dbtn-submit" type="submit" name="submit" value="{{$submit}}" /> -</form> +<div id="chatroom-new" class="section-content-tools-wrapper"> + <form action="chat" method="post" > + {{include file="field_input.tpl" field=$name}} + {{include file="field_input.tpl" field=$chat_expire}} + {{$acl}} + <div class="btn-group pull-right"> + <button id="dbtn-acl" class="btn btn-default" data-toggle="modal" data-target="#aclModal" title="{{$permissions}}" onclick="return false;" ><i id="jot-perms-icon" class="icon-{{$lockstate}}"></i></button> + <button id="dbtn-submit" class="btn btn-primary" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button> + </div> + <div class="clear"></div> + </form> </div> |