Rebase and fix conflicts

Signed-off-by: Artur Bergen <artur.bergen@struktur.de>

css/style.css

@@ -420,6 +420,15 @@ video {
 	opacity: .7;
 }
 
+.nameIndicator button.video-available {
+	opacity: .7;
+	cursor: not-allowed;
+ }
+
+.nameIndicator button.video-available:active {
+	background-color: transparent;
+}
+
 .mediaIndicator {
 	position: absolute;
 	width: 100%;

js/app.js

@@ -629,9 +629,11 @@
 			var avatarContainer = $hideVideoButton.closest('.videoView').find('.avatar-container');
 			var localVideo = $hideVideoButton.closest('.videoView').find('#localVideo');
 
-			$hideVideoButton.attr('data-original-title', t('spreed', 'Enable video'))
-				.addClass('video-disabled icon-video-off-white')
-				.removeClass('icon-video-white');
+			if (!$hideVideoButton.hasClass('video-available')) {
+				$hideVideoButton.attr('data-original-title', t('spreed', 'Enable video'))
+				 .addClass('video-disabled icon-video-off-white')
+				 .removeClass('icon-video-white');
+			}
 
 			var avatar = avatarContainer.find('.avatar');
 			var guestName = localStorage.getItem("nick");

js/webrtc.js

@@ -954,6 +954,14 @@ var spreedPeerConnectionTable = [];
 			if (!OCA.SpreedMe.app.videoDisabled) {
 				OCA.SpreedMe.app.enableVideo();
 			}
+
+			var availableStream = $(OCA.SpreedMe.webrtc.webrtc.localStream.getVideoTracks());
+			var $hideVideoButton = $('#hideVideo');
+			if(availableStream.length < 1 || availableStream.length == undefined) {
+				$hideVideoButton.removeClass('video-disabled icon-video-off-white')
+				.addClass('video-available icon-video-off-white')
+				.attr('data-original-title', t('spreed', 'No Camera'));
+			}
 		});
 	}