diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-01 18:30:07 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-01 18:30:07 +0100 |
| commit | 00b042a3eb1593a10f4dd149c0c45646178dc71a (patch) | |
| tree | c7658c55c386ea2f106a6aa06ddf73c26776f9c1 /webclient/index.html | |
| parent | Enable SSL for s2s http client (diff) | |
| parent | Follow API renaming. state -> presence. mtime_ago -> last_active_ago (diff) | |
| download | synapse-00b042a3eb1593a10f4dd149c0c45646178dc71a.tar.xz | |
Merge remote-tracking branch 'origin/develop' into server2server_tls
Diffstat (limited to 'webclient/index.html')
| -rw-r--r-- | webclient/index.html | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/webclient/index.html b/webclient/index.html index bf24e392ac..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> |