diff options
author | Wave <wave72@users.noreply.github.com> | 2015-11-06 09:09:58 +0100 |
---|---|---|
committer | Wave <wave72@users.noreply.github.com> | 2015-11-06 09:09:58 +0100 |
commit | 30d083ac3cbdf36171cfee7b892271b9b587325c (patch) | |
tree | f2f63728f86f8336330d31ee8edf2fcd742dc71e /view/tpl/chat.tpl | |
parent | 50cf095c000813d0b1408d929c1fa7422b131a3d (diff) | |
parent | 4ca0c2cfd14df5e2b6e9c7f59a10628f7653d6a4 (diff) | |
download | volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.tar.gz volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.tar.bz2 volse-hubzilla-30d083ac3cbdf36171cfee7b892271b9b587325c.zip |
Merge pull request #2 from redmatrix/master
Update to latest hubzilla
Diffstat (limited to 'view/tpl/chat.tpl')
-rw-r--r-- | view/tpl/chat.tpl | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 9f95d2999..18576fd56 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,11 +1,5 @@ -<h1>{{$room_name}}</h1> -<div id="chatContainer"> - - <div id="chatTopBar"> - <div id="chatLineHolder"></div> - </div> +<div class="generic-content-wrapper-styled"> - <div id="chatSide"> {{if $is_owner}} <div id="chatDrop"> <form id="chat-destroy" method="post" action="chat"> @@ -13,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> @@ -24,14 +29,15 @@ <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> <script> |