diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-01 18:21:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-01 18:21:29 +0100 |
| commit | 3faa2ae78c7ce2330ed7699ffe3fd08306055da9 (patch) | |
| tree | e97b09a70586b58cdc9f2533dae1d071167b4b71 /webclient/index.html | |
| parent | Add beginnings of ban support. (diff) | |
| parent | Follow API renaming. state -> presence. mtime_ago -> last_active_ago (diff) | |
| download | synapse-3faa2ae78c7ce2330ed7699ffe3fd08306055da9.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'webclient/index.html')
| -rw-r--r-- | webclient/index.html | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/webclient/index.html b/webclient/index.html index 3c31a8a051..f016dbb877 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -44,6 +44,19 @@ <div id="header"> <!-- Do not show buttons on the login page --> <div id="headerContent" ng-hide="'/login' == location || '/register' == location"> + <div id="callBar"> + <div ng-show="currentCall.state == 'ringing'"> + Incoming call from {{ currentCall.user_id }} + <button ng-click="answerCall()">Answer</button> + <button ng-click="hangupCall()">Reject</button> + </div> + <button ng-click="hangupCall()" ng-show="currentCall && currentCall.state != 'ringing' && currentCall.state != 'ended' && currentCall.state != 'fledgling'">Hang up</button> + <span ng-show="currentCall.state == 'invite_sent'">Calling...</span> + <span ng-show="currentCall.state == 'connecting'">Call Connecting...</span> + <span ng-show="currentCall.state == 'connected'">Call Connected</span> + <span ng-show="currentCall.state == 'ended'">Call Ended</span> + <span style="display: none; ">{{ currentCall.state }}</span> + </div> <a href id="headerUserId" ng-click='goToUserPage(user_id)'>{{ user_id }}</a> <button ng-click='goToPage("/")'>Home</button> @@ -56,7 +69,7 @@ <div id="footer" ng-hide="location.indexOf('/room') == 0"> <div id="footerContent"> - © 2014 Matrix.org + © 2014 Matrix.org </div> </div> </body> |