diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-05 06:34:14 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-05 06:34:14 +0100 |
| commit | 07bd396837426fbe4cf3ecd189513d50a14081a1 (patch) | |
| tree | 9ffe32f8b1eb1c6991c0827c7f182a509d12efe7 /view/tpl/chat.tpl | |
| parent | 73bef17365b6ca1a92c78243eed5252ec4869f86 (diff) | |
| parent | f7468ab473f49b9594095d29a50f8e921d0b15af (diff) | |
| download | volse-hubzilla-07bd396837426fbe4cf3ecd189513d50a14081a1.tar.gz volse-hubzilla-07bd396837426fbe4cf3ecd189513d50a14081a1.tar.bz2 volse-hubzilla-07bd396837426fbe4cf3ecd189513d50a14081a1.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'view/tpl/chat.tpl')
| -rw-r--r-- | view/tpl/chat.tpl | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 003e0192b..18576fd56 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,12 +1,5 @@ <div class="generic-content-wrapper-styled"> -<h1>{{$room_name}}</h1> -<div id="chatContainer"> - - <div id="chatTopBar"> - <div id="chatLineHolder"></div> - </div> - <div id="chatSide"> {{if $is_owner}} <div id="chatDrop"> <form id="chat-destroy" method="post" action="chat"> @@ -14,9 +7,20 @@ <input type="hidden" name="action" value="drop" /> <input type="submit" name="submit" value="{{$drop}}" onclick="return confirmDelete();"/> </form> - </div><br /> + </div> {{/if}} +<h1>{{$room_name}}</h1> + + +<div id="chatContainer"> + + <div id="chatTopBar"> + <div id="chatLineHolder"></div> + </div> + + <div id="chatSide"> + <div id="chatUsers"></div><br /> </div> <div class="clear"></div> @@ -25,14 +29,14 @@ <form id="chat-form" method="post" action="#"> <input type="hidden" name="room_id" value="{{$room_id}}" /> - <textarea id="chatText" name="chat_text" rows=3 cols=80></textarea><br /> + <textarea id="chatText" name="chat_text" rows=3></textarea><br /> <input type="submit" name="submit" value="{{$submit}}" /> </form> - <a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}} - </div> - + <div id="chatOptionsBar"> + <a href="{{$baseurl}}/chat/{{$nickname}}/{{$room_id}}/leave">{{$leave}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=away">{{$away}}</a> | <a href="{{$baseurl}}/chatsvc?f=&room_id={{$room_id}}&status=online">{{$online}}</a>{{if $bookmark_link}} | <a href="{{$bookmark_link}}" target="_blank" >{{$bookmark}}</a>{{/if}} + </div> </div> </div> |