lbehm
/
workadventure
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

merge into: lbehm:develop
Branches Tags
lbehm:develop
lbehm:develop_2021
lbehm:localEnvironment
lbehm:loginAndRegister
lbehm:hotfix/pingCameraStatus
lbehm:fix-console-admin
lbehm:roomLimitConnexion
lbehm:usersLimit
lbehm:mini-map
lbehm:user_interface
lbehm:update-arc-canvas
lbehm:uniq-socket-by-uuid
lbehm:menuscene
lbehm:groups_in_zones
lbehm:refactorconnect
lbehm:webrtc-staging
lbehm:securityissues
lbehm:test_scenarios
lbehm:screen-sharing
lbehm:enter-animation-player
lbehm:login
lbehm:v1.0.0
...
pull from: lbehm:user_interface
Branches Tags
lbehm:develop
lbehm:develop_2021
lbehm:localEnvironment
lbehm:loginAndRegister
lbehm:hotfix/pingCameraStatus
lbehm:fix-console-admin
lbehm:roomLimitConnexion
lbehm:usersLimit
lbehm:mini-map
lbehm:user_interface
lbehm:update-arc-canvas
lbehm:uniq-socket-by-uuid
lbehm:menuscene
lbehm:groups_in_zones
lbehm:refactorconnect
lbehm:webrtc-staging
lbehm:securityissues
lbehm:test_scenarios
lbehm:screen-sharing
lbehm:enter-animation-player
lbehm:login
lbehm:v1.0.0

4 Commits
develop ... user_inter

Author SHA1 Message Date
Gregoire Parant 3339dc532a Fix 2020-11-04 13:48:07 +01:00
Gregoire Parant d924e03966 Merge branch 'develop' into user_interface 
# Conflicts:
#	front/dist/resources/style/style.css
 2020-11-04 13:39:59 +01:00
Hugo Averty 9df2932f8f Modify icons : micro and cam 2020-06-14 18:48:08 +02:00
Hugo Averty 0640a14f84 ignore DS_Store files 2020-06-14 12:08:30 +02:00
6 changed files with 10 additions and 10 deletions
Show Stats Expand all files Collapse all files

18
front/dist/index.html vendored
View File

@ -57,12 +57,12 @@
</div>
<div class="btn-cam-action">
<div id="btn-micro" class="btn-micro">
<img id="microphone" src="resources/logos/microphone.svg">
<img id="microphone-close" src="resources/logos/microphone-close.svg">
<img id="microphone" src="resources/logos/MIC-ON.png">
<img id="microphone-close" src="resources/logos/MIC-OFF.png">
</div>
<div id="btn-video" class="btn-video">
<img id="cinema" src="resources/logos/cinema.svg">
<img id="cinema-close" src="resources/logos/cinema-close.svg">
<img id="cinema" src="resources/logos/CAM-ON.svg">
<img id="cinema-close" src="resources/logos/CAM-OFF.png.svg">
</div>
<div id="btn-monitor" class="btn-monitor">
<img id="monitor" src="resources/logos/monitor.svg">
@ -86,12 +86,12 @@
</div>
<div class="btn-cam-action">
<div class="btn-micro">
<img id="microphone" src="resources/logos/microphone.svg">
<img id="microphone-close" src="resources/logos/microphone-close.svg">
<img id="microphone" src="resources/logos/MIC-ON.png">
<img id="microphone-close" src="resources/logos/MIC-OFF.png">
</div>
<div class="btn-video">
<img id="cinema" src="resources/logos/cinema.svg">
<img id="cinema-close" src="resources/logos/cinema-close.svg">
<img id="cinema" src="resources/logos/CAM-ON.png">
<img id="cinema-close" src="resources/logos/CAM-OFF.png">
</div>
<div class="btn-monitor">
<img id="monitor" src="resources/logos/monitor.svg">
@ -103,7 +103,7 @@
<div id="activeScreenSharing" class="active-screen-sharing active">
</div>
<div id="webRtcSetup" class="webrtcsetup">
<img id="webRtcSetupNoVideo" class="background-img" src="resources/logos/cinema-close.svg">
<img id="webRtcSetupNoVideo" class="background-img" src="resources/logos/CAM-OFF.png.svg">
<video id="myCamVideoSetup" autoplay muted></video>
</div>
<audio id="audio-webrtc-in">

BIN
front/dist/resources/logos/CAM-OFF.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
front/dist/resources/logos/CAM-ON.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
front/dist/resources/logos/MIC-OFF.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
front/dist/resources/logos/MIC-ON.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

2
front/src/WebRtc/MediaManager.ts
View File

@ -344,7 +344,7 @@ export class MediaManager {
<div class="connecting-spinner"></div>
<div class="rtc-error" style="display: none"></div>
<i id="name-${userId}" style="background-color: ${color};">${userName}</i>
<img id="microphone-${userId}" src="resources/logos/microphone-close.svg">
<img id="microphone-${userId}" src="resources/logos/MIC-OFF.svg">
` +
((reportCallBack!==undefined)?`<img id="report-${userId}" class="report active" src="resources/logos/report.svg">`:'')
+