diff options
| author | David Baker <dbkr@matrix.org> | 2014-09-06 00:14:02 +0100 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-09-06 00:14:02 +0100 |
| commit | c03c25530487e5051affb9685f6f7b0c37abf8e5 (patch) | |
| tree | fa1d0826c145bd082589c51117d1551262899bec /webclient/index.html | |
| parent | Add m.roo.aliases (diff) | |
| download | synapse-c03c25530487e5051affb9685f6f7b0c37abf8e5.tar.xz | |
Better call bar (visually: still lacks ring[back] tones).
Diffstat (limited to 'webclient/index.html')
| -rw-r--r-- | webclient/index.html | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/webclient/index.html b/webclient/index.html index 91b6bf27be..a7ed9aa15f 100644 --- a/webclient/index.html +++ b/webclient/index.html @@ -45,18 +45,29 @@ <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 id="callBar" ng-show="currentCall"> + <img id="callPeerImage" ng-show="currentCall.userProfile.avatar_url" ngSrc="{{ currentCall.userProfile.avatar_url }}" /> + <img class="callIcon" src="img/green_phone.png" ng-show="currentCall.state != 'ended'" /> + <img class="callIcon" id="callEndedIcon" src="img/red_phone.png" ng-show="currentCall.state == 'ended'" /> + <div id="callPeerNameAndState"> + <span id="callPeerName">{{ currentCall.userProfile.displayname }}</span> + <br /> + <span id="callState"> + <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' && !currentCall.didConnect && currentCall.direction == 'outbound'">Call Rejected</span> + <span ng-show="currentCall.state == 'ended' && currentCall.didConnect && currentCall.direction == 'outbound'">Call Ended</span> + <span ng-show="currentCall.state == 'ended' && !currentCall.didConnect && currentCall.direction == 'inbound'">Call Canceled</span> + <span ng-show="currentCall.state == 'ended' && currentCall.didConnect && currentCall.direction == 'inbound'">Call Ended</span> + <span ng-show="currentCall.state == 'wait_local_media'">Waiting for media permission...</span> + </span> </div> + <span ng-show="currentCall.state == 'ringing'"> + <button ng-click="answerCall()">Answer</button> + <button ng-click="hangupCall()">Reject</button> + </span> <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> |