diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-25 11:13:54 +0200 |
| commit | 1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab (patch) | |
| tree | 92d4bb31a1372239e317f8672d6b80e59b709523 /webclient/room | |
| parent | Oops. Removed my NetBeans private folders (diff) | |
| parent | For the content repo, don't just use homeserver.hostname as that might not in... (diff) | |
| download | synapse-1bd380c816493ffdd2c2a7a6463b1ef48c1bfcab.tar.xz | |
Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop
Diffstat (limited to 'webclient/room')
| -rw-r--r-- | webclient/room/room.html | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/webclient/room/room.html b/webclient/room/room.html index 95da067714..06ca63d2ea 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -1,4 +1,5 @@ <div ng-controller="RoomController" data-ng-init="onInit()" class="room"> + <h1 id="roomLogo">[matrix]</h1> <div id="page"> <div id="wrapper"> @@ -32,7 +33,7 @@ ng-class="(events.rooms[room_id].messages[$index + 1].user_id !== msg.user_id ? 'differentUser' : '') + (msg.user_id === state.user_id ? ' mine' : '')" scroll-item> <td class="leftBlock"> <div class="sender" ng-hide="events.rooms[room_id].messages[$index - 1].user_id === msg.user_id">{{ members[msg.user_id].displayname || msg.user_id }}</div> - <div class="timestamp">{{ (msg.content.hsob_ts || msg.ts) | date:'MMM d HH:mm:ss' }}</div> + <div class="timestamp">{{ (msg.content.hsob_ts || msg.ts) | date:'MMM d HH:mm' }}</div> </td> <td class="avatar"> <img class="avatarImage" ng-src="{{ members[msg.user_id].avatar_url || 'img/default-profile.jpg' }}" width="32" height="32" @@ -73,29 +74,28 @@ <div id="controls"> <table id="inputBarTable"> <tr> - <td width="1"> + <td id="userIdCell" width="1px"> {{ state.user_id }} </td> - <td width="*" style="min-width: 100px"> + <td width="*"> <input id="mainInput" ng-model="textInput" ng-enter="send()" ng-focus="true" autocomplete="off" tab-complete/> </td> - <td width="150px"> + <td id="buttonsCell"> <button ng-click="send()">Send</button> - <button m-file-input="imageFileToSend">Send Image</button> - </td> - <td width="1"> - + <button m-file-input="imageFileToSend">Image</button> </td> </tr> </table> - <span> - Invite a user: - <input ng-model="userIDToInvite" size="32" type="text" placeholder="User ID (ex:@user:homeserver)"/> - <button ng-click="inviteUser(userIDToInvite)">Invite</button> - </span> - <button ng-click="leaveRoom()">Leave</button> - <button ng-click="loadMoreHistory()" ng-disabled="!state.can_paginate">Load more history</button> + <div id="extraControls"> + <span> + Invite a user: + <input ng-model="userIDToInvite" size="32" type="text" placeholder="User ID (ex:@user:homeserver)"/> + <button ng-click="inviteUser(userIDToInvite)">Invite</button> + </span> + <button ng-click="leaveRoom()">Leave</button> + </div> + {{ feedback }} <div ng-hide="!state.stream_failure"> {{ state.stream_failure.data.error || "Connection failure" }} |