aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/chat.tpl
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-04 17:48:21 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-04 17:48:21 -0800
commit121446931162293a60626a3d6641073fb44480d8 (patch)
treed1a4e4c85cc4be4c18a7b84c7bb801fe0daaa642 /view/tpl/chat.tpl
parentf4a9529968fedb65289d49ec0901739df17df698 (diff)
parent3d55134953cf94a5b320404e9a5a8af1acadaf19 (diff)
downloadvolse-hubzilla-121446931162293a60626a3d6641073fb44480d8.tar.gz
volse-hubzilla-121446931162293a60626a3d6641073fb44480d8.tar.bz2
volse-hubzilla-121446931162293a60626a3d6641073fb44480d8.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view/tpl/chat.tpl')
-rw-r--r--view/tpl/chat.tpl28
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>