aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2015-11-04 22:52:40 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2015-11-04 22:52:40 +0100
commit1c0fe8936819f760800bf0d0fd79aa42c21933b2 (patch)
treeab546f636d61ad4470a74f26ebf0008de0785ac1 /view/tpl
parent9398e49eb7573b172b12341357cd1657139c43c4 (diff)
downloadvolse-hubzilla-1c0fe8936819f760800bf0d0fd79aa42c21933b2.tar.gz
volse-hubzilla-1c0fe8936819f760800bf0d0fd79aa42c21933b2.tar.bz2
volse-hubzilla-1c0fe8936819f760800bf0d0fd79aa42c21933b2.zip
Chat page improved (I think). Works now better with diff. resolutions, font sizes and languages. Fixed follow field on conn. page. Small schemas updates.
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/chat.tpl28
-rwxr-xr-xview/tpl/follow.tpl2
2 files changed, 17 insertions, 13 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>
diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl
index f643a3597..0c808b9a5 100755
--- a/view/tpl/follow.tpl
+++ b/view/tpl/follow.tpl
@@ -2,7 +2,7 @@
<h3>{{$connect}}</h3>
<div id="connect-desc">{{$desc}}</div>
<form action="follow" method="post" />
- <input id="side-follow-url" type="text" name="url" size="24" title="{{$hint}}" />
+ <input id="side-follow-url" type="text" name="url" title="{{$hint}}" />
<input id="side-follow-submit" type="submit" name="submit" class="btn btn-default" value="{{$follow}}" />
</form>
{{if $abook_usage_message}}