Skip to content

S
sfu
Commit efb8a719 authored by Alain Takoudjou's avatar Alain Takoudjou
Browse files
Options

improve sfu design and remove some useless code

parent 32459b4b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 228 additions and 261 deletions
static/common.css
View file @ efb8a719
body {
font: 14px "Lato", Arial, sans-serif;
}
h1 {
font-size: 160%;
}
......@@ -10,7 +6,14 @@ h1 {
display: inline;
}
.signature {
border-top: solid;
padding-top: 0;
border-width: thin;
clear: both;
height: 3.125rem;
text-align: center;
}
body {
overflow-x: hidden;
......@@ -32,3 +35,10 @@ body {
*, :after, :before {
box-sizing: border-box;
}
textarea {
font-family: Metropolis,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
}
\ No newline at end of file
static/index.html
View file @ efb8a719
......@@ -2,6 +2,7 @@
<html lang="en">
<head>
<title>SFU</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/common.css">
<link rel="stylesheet" href="/mainpage.css">
......@@ -10,17 +11,6 @@
<!-- Font Awesome File -->
<link rel="stylesheet" type="text/css" href="/css/font-awesome.min.css">
</head>
<head>
<title>SFU</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Security-Policy" content="default-src 'self' cdnjs.cloudflare.com; script-src 'self'; style-src 'self' cdnjs.cloudflare.com; font-src 'self'" />
<link rel="stylesheet" href="/common.css">
<link rel="stylesheet" href="/mainpage.css">
<!-- Font Awesome File -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="author" href="https://www.irif.fr/~jch/"/>
</head>
<body>
......
static/mainpage.css
View file @ efb8a719
......@@ -5,46 +5,36 @@
display: none;
}
.signature {
border-top: solid;
padding-top: 0em;
border-width: thin;
clear: both;
height: 50px;
text-align: center;
}
.navbar-brand {
margin-bottom: 80px;
margin-bottom: 5rem;
}
.home {
height: calc(100vh - 50px);
padding: 30px;
padding: 1.875rem;
}
#public-groups-table tr a{
margin-left: 15px;
margin-left: 0.9375rem;
font-weight: 700;
}
a {
text-decoration: none;
color: #0058e4;
text-decoration: none;
color: #0058e4;
}
a:hover {
color: #0a429c;
color: #0a429c;
}
label {
display: block;
display: block;
}
@media only screen and (max-device-width: 480px) {
.home {
padding: 10px;
@media only screen and (max-device-width: 768px) {
.home {
padding: 0.625rem;
}
}
}
\ No newline at end of file
static/sfu.css
View file @ efb8a719
This diff is collapsed.
static/sfu.html
View file @ efb8a719
......@@ -26,14 +26,14 @@
<header>
<nav class="topnav navbar navbar-expand navbar-light fixed-top">
<div id="header">
<div class="colapse" title="Colapse" id="sidebarCollapse">
<svg class="svg-inline--fa fa-align-left fa-w-14" aria-hidden="true" data-prefix="fas" data-icon="align-left" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" data-fa-i2svg="">
<div class="colapse" title="Colapse left panel" id="sidebarCollapse">
<svg class="svg-inline--fa" aria-hidden="true" data-icon="align-left" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
<path fill="currentColor" d="M288 44v40c0 8.837-7.163 16-16 16H16c-8.837 0-16-7.163-16-16V44c0-8.837 7.163-16 16-16h256c8.837 0 16 7.163 16 16zM0 172v40c0 8.837 7.163 16 16 16h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16zm16 312h416c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16zm256-200H16c-8.837 0-16 7.163-16 16v40c0 8.837 7.163 16 16 16h256c8.837 0 16-7.163 16-16v-40c0-8.837-7.163-16-16-16z"></path>
</svg>
</div>
<h1 id="title" class="header-title"></h1>
</div>
<ul class="nav-menu">
<li>
<button id="presentbutton" class="invisible btn btn-success">
......@@ -60,13 +60,13 @@
<li>
<div id="unsharebutton" class="invisible nav-link nav-button nav-cancel">
<span><i class="fa fa-window-close-o" aria-hidden="true"></i></span>
<label>Share Screen</label>
<label>Unshare Screen</label>
</div>
</li>
<li>
<div class="nav-button nav-link invisible" id="user">
<span><i class="fa fa-user dropbtn" aria-hidden="true"></i></span>
<label>Profile</label>
<label>User</label>
</div>
<div id="userDropdown" class="dropdown-content">
<div id="statdiv">
......@@ -89,7 +89,7 @@
</nav>
</header>
<div class="row full-width" id="mainrow">
<div class="coln-left">
<div class="coln-left" id="left">
<div id="chat">
<div id="chatbox">
<div id="box"></div>
......@@ -103,14 +103,13 @@
</div>
</div>
<div id="resizer"></div>
<div class="coln-right">
<div class="coln-right" id="right">
<span class="show-video blink" id="switch-video"><i class="fa fa-exchange" aria-hidden="true"></i></span>
<div class="video-container no-video" id="video-container">
<div id="peers"></div>
</div>
<div class="login-container invisible" id="login-container">
<div class="login-box">
<h2>Login to SFU</h2>
<form id="userform" class="userform">
<label for="username">Username:</label>
<input id="username" type="text" name="username"
......@@ -148,7 +147,7 @@
<option>default</option>
<option>off</option>
</select>
</div>
<label for="sendselect">Send:</label>
......
static/sfu.js
View file @ efb8a719
......@@ -47,7 +47,6 @@ function getUsername() {
function showVideo() {
let video_container = document.getElementById('video-container');
//video_container[0].style.display = "block";
video_container.classList.remove('no-video');
}
......@@ -60,7 +59,6 @@ function hideVideo(force) {
return;
}
let video_container = document.getElementById('video-container');
//video_container.style.display = "";
video_container.classList.add('no-video');
}
......@@ -80,6 +78,8 @@ function setConnected(connected) {
userbox.classList.remove('invisible');
connectionbox.classList.add('invisible');
displayUsername();
displayMessage("Press Present to enable your camera or microphone",
"info");
} else {
resetUsers();
let userpass = getUserPass();
......@@ -109,7 +109,6 @@ function gotClose(code, reason) {
delUpMediaKind(null);
setConnected(false);
if(code != 1000) {
//displayError('Socket close: Code ' + code, "error");
console.warn('Socket close', code, reason);
}
}
......@@ -173,7 +172,7 @@ function setButtonsVisibility() {
setVisibility('presentbutton', permissions.present && !local);
setVisibility('unpresentbutton', local);
// allow multiple shared documents
setVisibility('sharebutton', permissions.present && !share);
setVisibility('sharebutton', permissions.present);
setVisibility('unsharebutton', share);
setVisibility('mediaoptions', permissions.present);
......@@ -190,7 +189,6 @@ function setLocalMute(mute) {
localMute = mute;
muteLocalTracks(localMute);
let button = document.getElementById('mutebutton');
//button.textContent = localMute ? 'Unmute' : 'Mute';
if(localMute)
button.classList.add('muted');
else
......@@ -644,15 +642,20 @@ function resizePeers() {
Object.keys(serverConnection.down).length;
let peers = document.getElementById('peers');
let columns = Math.ceil(Math.sqrt(count));
peers.style['grid-template-columns'] = `repeat(${columns}, 1fr)`;
if (false) {
if (peers.offsetWidth < peers.offsetHeight) {
// we change view orientation
peers.style['grid-template-rows'] = `repeat(${columns}, auto)`;
}
} else {
peers.style['grid-template-columns'] = `repeat(${columns}, 1fr)`;
let rows = "";
let size = 100 / columns;
// Peers div has padding 10 on top and bottom, remove 20 on offsetHeight
let max_video_height = Math.trunc((peers.offsetHeight - 30) / columns);
for(let i = 0; i < columns; i++){
rows += size + "% ";
}
peers.style['grid-template-columns'] = `repeat(${columns}, 1fr)`;
peers.style['grid-template-rows'] = rows;
let media_list = document.getElementsByClassName("media");
[].forEach.call(media_list, function (element) {
element.style['max-height'] = max_video_height + "px";
});
}
/** @type{Object.<string,string>} */
......@@ -965,19 +968,17 @@ document.getElementById('input').onkeypress = function(e) {
function chatResizer(e) {
e.preventDefault();
let chat = document.getElementById('chat');
let full_width = document.getElementById("mainrow").offsetWidth;
let left = document.getElementById("left");
let right = document.getElementById("right");
let start_x = e.clientX;
let start_width = parseFloat(
document.defaultView.getComputedStyle(chat).width.replace('px', ''),
);
let inputbutton = document.getElementById('inputbutton');
let start_width = parseFloat(left.offsetWidth);
function start_drag(e) {
let width = start_width + e.clientX - start_x;
if(width < 40)
inputbutton.style.display = 'none';
else
inputbutton.style.display = 'inline';
chat.style.width = width + 'px';
let left_width = (start_width + e.clientX - start_x) * 100 / full_width;
left.style.flex = left_width;
right.style.flex = 100 - left_width;
}
function stop_drag(e) {
document.documentElement.removeEventListener(
......@@ -999,26 +1000,32 @@ function chatResizer(e) {
document.getElementById('resizer').addEventListener('mousedown', chatResizer, false);
function displayError(message, level) {
var background = "linear-gradient(to right, #529518, #96c93d)";
if (level === undefined || level === "error") {
level = "error";
background = "linear-gradient(to right, #e20a0a, #df2d2d)";
function displayError(message, level, position, gravity) {
var background = "linear-gradient(to right, #e20a0a, #df2d2d)";
if (level === "info") {
background = "linear-gradient(to right, #529518, #96c93d)";
}
if (level === "warning") {
background = "linear-gradient(to right, #edd800, #c9c200)";
}
Toastify({
text: message,
duration: 5000,
duration: 4000,
close: true,
position: 'center',
position: position ? position: 'center',
gravity: gravity ? gravity : 'top',
backgroundColor: background,
className: level,
}).showToast();
}
function displayWarning(message) {
// don't overwrite real errors
if(!errorTimeout)
return displayError(message);
let level = "warning";
return displayError(message, level);
}
function displayMessage(message) {
return displayError(message, "info", "right", "bottom");
}
document.getElementById('userform').onsubmit = function(e) {
......@@ -1135,7 +1142,6 @@ function start() {
setLocalMute(localMute);
//document.getElementById('connectbutton').disabled = false;
let userpass = getUserPass();
if(userpass)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7