Merge pull request #302 from fancycode/disable_call_on_conference_rooms

Hide "call" button when in conference rooms.

Author: fancycode

static/js/controllers/uicontroller.js

@@ -690,6 +690,10 @@ define(['jquery', 'underscore', 'bigscreen', 'moment', 'sjcl', 'modernizr', 'web
 			}
 		});
 
+		$scope.$on("room.updated", function(event, room) {
+			$scope.roomType = room ? room.Type : null;
+		});
+
 		// Apply all layout stuff as classes to our element.
 		$scope.$watch("layout", (function() {
 			var makeName = function(prefix, n) {

static/partials/buddyactions.html

@@ -1,7 +1,7 @@
 <div class="buddyhover">
 	<div class="buddyactions active">
 		<div class="btn-group">
-			<a class="btn btn-primary" data-action="call" title="{{_('Start video call')}}"><i class="fa fa-phone"></i></a>
+			<a class="btn btn-primary" ng-if="roomType!='Conference'" data-action="call" title="{{_('Start video call')}}"><i class="fa fa-phone"></i></a>
 			<a class="btn btn-primary" data-action="chat" title="{{_('Start chat')}}"><i class="fa fa-comments-o"></i></a>
 		</div>
 	</div>
@@ -12,7 +12,7 @@
 					<div class="buddyPicture buddyPictureSmall"><i class="fa fa-user"/><img ng-show="s.Status.buddyPicture" alt ng-src="{{s.Id|buddyImageSrc:s.Status}}"/></div>
 					<div class="buddy3" title="{{s.Status.message}}">{{s.Status.displayName|displayNameForSession:s.Id}}<span ng-show="s.Status.message">, {{s.Status.message}}</span></div>
 					<div class="btn-group">
-						<a class="btn btn-sm btn-primary" title="{{_('Start video call')}}" ng-click="doCall(s.Id); $event.stopPropagation()"><i class="fa fa-phone"></i></a>
+						<a class="btn btn-sm btn-primary" ng-if="roomType!='Conference'" title="{{_('Start video call')}}" ng-click="doCall(s.Id); $event.stopPropagation()"><i class="fa fa-phone"></i></a>
 						<a class="btn btn-sm btn-primary" title="{{_('Start chat')}}" ng-click="doChat(s.Id); $event.stopPropagation()"><i class="fa fa-comments-o"></i></a>
 					</div>
 				</span>

static/partials/chatroom.html

@@ -2,7 +2,7 @@
     <div class="chatheader"><div class="chatstatusicon" ng-click="deactivateRoom()"><i class="fa fa-angle-left"></i> <i class="fa fa fa-comments-o"></i></div><div class="chatheadertitle"><span ng-show="p2pstate" class="fa fa-exchange" title="{{_('Peer to peer')}}"/><span>{{settings.title}} {{id|displayName}}</span></div> <div class="ctrl"><i ng-hide="layout.chatMaximized" ng-click="toggleMax()" class="fa fa-expand"></i><i ng-show="layout.chatMaximized" ng-click="toggleMax()" class="fa fa-compress"></i><!--<i title="{{_('Close chat')}}" ng-click="hide()" class="fa fa-times"></i>--></div></div>
     <div class="chatmenu">
         <div class="btn-group">
-            <button ng-if="!isgroupchat" class="btn btn-sm btn-default" title="{{_('Start video call')}}" ng-click="doCall()"><i class="fa fa-phone fa-fw"></i></button>
+            <button ng-if="!isgroupchat && roomType!='Conference'" class="btn btn-sm btn-default" title="{{_('Start video call')}}" ng-click="doCall()"><i class="fa fa-phone fa-fw"></i></button>
             <button class="btn btn-sm btn-default btn-fileupload" title="{{_('Upload files')}}"><i class="fa fa-upload fa-fw"></i></button>
             <button class="btn btn-sm btn-default btn-locationshare" title="{{_('Share my location')}}" ng-click="shareGeolocation()"><i class="fa fa-location-arrow fa-fw"></i></button>
         </div>