1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-22 16:45:58 +01:00

improve sfu design and remove some useless code

This commit is contained in:
Alain Takoudjou 2020-09-03 17:01:21 +02:00
parent 32459b4b5b
commit efb8a71981
6 changed files with 228 additions and 261 deletions

View file

@ -1,7 +1,3 @@
body {
font: 14px "Lato", Arial, sans-serif;
}
h1 { h1 {
font-size: 160%; font-size: 160%;
} }
@ -10,7 +6,14 @@ h1 {
display: inline; display: inline;
} }
.signature {
border-top: solid;
padding-top: 0;
border-width: thin;
clear: both;
height: 3.125rem;
text-align: center;
}
body { body {
overflow-x: hidden; overflow-x: hidden;
@ -32,3 +35,10 @@ body {
*, :after, :before { *, :after, :before {
box-sizing: border-box; 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;
}

View file

@ -2,6 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<title>SFU</title> <title>SFU</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="/common.css"> <link rel="stylesheet" href="/common.css">
<link rel="stylesheet" href="/mainpage.css"> <link rel="stylesheet" href="/mainpage.css">
@ -10,17 +11,6 @@
<!-- Font Awesome File --> <!-- Font Awesome File -->
<link rel="stylesheet" type="text/css" href="/css/font-awesome.min.css"> <link rel="stylesheet" type="text/css" href="/css/font-awesome.min.css">
</head> </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> <body>

View file

@ -5,46 +5,36 @@
display: none; display: none;
} }
.signature {
border-top: solid;
padding-top: 0em;
border-width: thin;
clear: both;
height: 50px;
text-align: center;
}
.navbar-brand { .navbar-brand {
margin-bottom: 80px; margin-bottom: 5rem;
} }
.home { .home {
height: calc(100vh - 50px); height: calc(100vh - 50px);
padding: 30px; padding: 1.875rem;
} }
#public-groups-table tr a{ #public-groups-table tr a{
margin-left: 15px; margin-left: 0.9375rem;
font-weight: 700; font-weight: 700;
} }
a { a {
text-decoration: none; text-decoration: none;
color: #0058e4; color: #0058e4;
} }
a:hover { a:hover {
color: #0a429c; color: #0a429c;
} }
label { label {
display: block; display: block;
} }
@media only screen and (max-device-width: 480px) { @media only screen and (max-device-width: 768px) {
.home { .home {
padding: 10px; padding: 0.625rem;
} }
} }

View file

@ -1,6 +1,7 @@
.nav-fixed .topnav { .nav-fixed .topnav {
z-index: 1039; z-index: 1039;
} }
.fixed-top{ .fixed-top{
position: fixed; position: fixed;
top: 0; top: 0;
@ -8,12 +9,13 @@
left: 0; left: 0;
z-index: 1030; z-index: 1030;
} }
.topnav { .topnav {
padding-left: 0; padding-left: 0;
/*height: 3.313rem;*/
height: 4rem; height: 4rem;
z-index: 1039; z-index: 1039;
} }
.navbar .form-control, .topnav { .navbar .form-control, .topnav {
font-size: 1rem; font-size: 1rem;
} }
@ -32,7 +34,7 @@
} }
.form-control-inline { .form-control-inline {
display: inline-block; display: inline-block;
} }
.shadow { .shadow {
@ -43,7 +45,7 @@
} }
.bg-gray { .bg-gray {
background-color: #eee!important; background-color: #eee!important;
} }
@ -55,13 +57,11 @@
align-items: center; align-items: center;
-webkit-box-pack: justify; -webkit-box-pack: justify;
justify-content: space-between; justify-content: space-between;
/*background: #4b4c7b;*/
background: #610a86; background: #610a86;
} }
.navbar { .navbar {
position: relative; position: relative;
padding: .5rem; padding: .5rem;
/*border-bottom: 1px solid #e6e6e6;*/
} }
.topnav .navbar-brand { .topnav .navbar-brand {
@ -85,14 +85,13 @@
user-select: none; user-select: none;
border: 1px solid transparent; border: 1px solid transparent;
padding: 0.255rem .75rem; padding: 0.255rem .75rem;
/*font-size: 1rem;*/
line-height: 1.5; line-height: 1.5;
border-radius: .25rem; border-radius: .25rem;
transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out; transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;
} }
.btn { .btn {
transition-duration: 0.4s; transition-duration: 0.4s;
} }
.btn-default:hover { .btn-default:hover {
@ -161,12 +160,11 @@
} }
.btn-large { .btn-large {
font-size: 110%; font-size: 110%;
} }
.app { .app {
background-color: #f7f7f7; background-color: #f7f7f7;
/*height: 100%;*/
overflow: hidden; overflow: hidden;
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -174,48 +172,43 @@
} }
.coln-left { .coln-left {
flex: 30%; flex: 30%;
padding: 0; padding: 0;
margin: 0; margin: 0;
}
.coln-middle {
flex: 30%;
} }
.coln-right { .coln-right {
flex: 70%; flex: 70%;
} }
/* Clear floats after the columns */ /* Clear floats after the columns */
.row { .row {
display: flex; display: flex;
} }
.full-height { .full-height {
height: 100vh; height: 100vh;
} }
.full-width { .full-width {
width: calc(100vw - 200px); width: calc(100vw - 200px);
height: calc(100vh - 64px); height: calc(100vh - 64px);
} }
.full-width-active { .full-width-active {
width: calc(100vw - 60px); width: 100vw;
} }
.container { .container {
width: 100%; width: 100%;
} }
.users-header { .users-header {
height: 4rem; height: 4rem;
padding: 10px; padding: 10px;
background: #610a86; background: #610a86;
/*border-bottom: 1px solid #e6e6e6;*/ font-size: .95rem;
font-size: .95rem; font-weight: 500;
font-weight: 500;
} }
.users-header:after, .users-header:before { .users-header:after, .users-header:before {
@ -228,24 +221,23 @@
} }
.reply { .reply {
height: 60px; height: 60px;
width: 100%; width: 100%;
background-color: #eae7e5; background-color: #eae7e5;
padding: 10px 5px 10px 5px !important; padding: 10px 5px 10px 5px;
margin: 0 !important; margin: 0;
z-index: 1000; z-index: 1000;
} }
.reply textarea { .reply textarea {
width: 100%; width: 100%;
resize: none; resize: none;
overflow: hidden; overflow: hidden;
padding: 5px !important; padding: 5px;
outline: none; outline: none;
border: none; border: none;
text-indent: 5px; text-indent: 5px;
box-shadow: none; box-shadow: none;
height: 100%; height: 100%;
font-size: 16px;
} }
textarea.form-reply { textarea.form-reply {
@ -258,17 +250,13 @@ textarea.form-reply {
width: 100%; width: 100%;
height: 34px; height: 34px;
padding: 6px 12px; padding: 6px 12px;
font-size: 14px; font-size: 1rem;
line-height: 1.42857143;
color: #555; color: #555;
background-color: #fff; background-color: #fff;
background-image: none; background-image: none;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 4px; border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075); box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
-o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
} }
@ -287,17 +275,17 @@ textarea.form-reply {
} }
.select-inline { .select-inline {
display: inline-block; display: inline-block;
width: inherit; width: inherit;
} }
.message { .message {
width: auto !important; width: auto !important;
padding: 4px 10px 7px !important; padding: 4px 10px 7px !important;
border-radius: 10px 10px 10px 0;
background: #daf1c6; background: #daf1c6;
font-size: 12px; font-size: 12px;
box-shadow: 0 1px 1px rgba(43, 43, 43, 0.16); box-shadow: 0 1px 1px rgba(43, 43, 43, 0.16);
border-radius: 5px;
word-wrap: break-word; word-wrap: break-word;
display: inline-block; display: inline-block;
margin: 1em 0 0; margin: 1em 0 0;
@ -305,10 +293,7 @@ textarea.form-reply {
} }
.message-sender { .message-sender {
float: right;
background: #ececec; background: #ececec;
border-radius: 10px 10px 0 10px;
margin-left: 20% !important;
} }
.message-row:after, .message-row:before { .message-row:after, .message-row:before {
@ -337,30 +322,29 @@ textarea.form-reply {
} }
.video-container { .video-container {
/*height: 100%;*/ height: calc(100vh - 64px);
height: calc(100vh - 64px); position: relative;
position: relative; background: rgba(0, 0, 0, 0.61);
background: rgba(0, 0, 0, 0.61); /* Display only when showing video */
/* Display only when showing video */ display: block;
display: block; transition: all 1s ease-out;
transition: all 1s ease-out; opacity: 1;
opacity: 1;
} }
.no-video { .no-video {
display: none; display: none;
transition: opacity 1s ease-out; transition: opacity 1s ease-out;
opacity: 0; opacity: 0;
} }
.mobile-container { .mobile-container {
display: block !important; display: block !important;
} }
.login-container { .login-container {
height: calc(100vh - 64px); height: calc(100vh - 64px);
position: relative; position: relative;
display: block; display: block;
} }
.login-box { .login-box {
@ -372,8 +356,8 @@ textarea.form-reply {
} }
.login-box h2 { .login-box h2 {
text-align: center; text-align: center;
margin-bottom: 40px; margin-bottom: 40px;
} }
.label-fallback { .label-fallback {
@ -381,69 +365,65 @@ textarea.form-reply {
} }
.label { .label {
background-color: rgba(0, 0, 0, 0.6);
left: 0; left: 0;
position: absolute; position: absolute;
top: 0; bottom: 0;
width: auto; width: 100%;
z-index: 1; z-index: 1;
text-align: center; text-align: center;
height: 2em; line-height: 25px;
margin: 10px 10px 10px 38%; color: #ffffff;
padding: 0 20px;
line-height: 30px;
color: #d4d4d4;
} }
.nav-link { .nav-link {
padding: 0; padding: 0;
color: #dbd9d9; color: #dbd9d9;
min-width: 32px; min-width: 32px;
display: block; display: block;
text-align: center; text-align: center;
margin: 0 10px; margin: 0 10px;
position: relative; position: relative;
line-height: 1.1; line-height: 1.1;
} }
.nav-link span { .nav-link span {
display: block; display: block;
} }
.nav-link label { .nav-link label {
display: block; display: block;
cursor: pointer; cursor: pointer;
color: #fff; color: #fff;
font-size: 55%; font-size: 55%;
} }
.nav-link:hover { .nav-link:hover {
color: #c2a4e0; color: #c2a4e0;
} }
.nav-link label:hover { .nav-link label:hover {
color: #c2a4e0; color: #c2a4e0;
} }
.nav-cancel, .muted, .nav-cancel label, .muted label { .nav-cancel, .muted, .nav-cancel label, .muted label {
color: #d03e3e color: #d03e3e
} }
.nav-cancel:hover, .muted:hover, .nav-cancel label:hover, .muted label:hover { .nav-cancel:hover, .muted:hover, .nav-cancel label:hover, .muted label:hover {
color: #d03e3e color: #d03e3e
} }
.nav-button { .nav-button {
cursor: pointer; cursor: pointer;
font-size: 25px; font-size: 25px;
} }
.header-title { .header-title {
float: left; float: left;
margin: 0; margin: 0;
font-size: 1rem; font-size: 1rem;
font-weight: 700; font-weight: 700;
color: #cecece; color: #cecece;
line-height: 2em; line-height: 2em;
} }
#title { #title {
@ -490,8 +470,8 @@ h1 {
} }
.clear { .clear {
clear: both; clear: both;
content: ""; content: "";
} }
#optionsdiv { #optionsdiv {
@ -536,10 +516,6 @@ h1 {
text-align-last: center; text-align-last: center;
} }
#main {
/*display: flex;*/
}
#chatbox { #chatbox {
height: 100%; height: 100%;
} }
@ -561,15 +537,14 @@ h1 {
} }
#box { #box {
/*height: 95%;*/
overflow: auto; overflow: auto;
height: calc(100% - 60px); height: calc(100% - 60px);
padding: 10px; padding: 10px;
} }
#disconnectbutton, #connectbutton { #disconnectbutton, #connectbutton {
margin-left: 80px; margin-left: 80px;
margin-top: 15px; margin-top: 15px;
} }
#input { #input {
@ -583,18 +558,12 @@ h1 {
outline: none; outline: none;
} }
#inputbutton {
/*background-color: white;
border: none;
margin-right: 0.2em;*/
}
#inputbutton:focus { #inputbutton:focus {
outline: none; outline: none;
} }
#resizer { #resizer {
width: 8px; width: 4px;
margin-left: -4px; margin-left: -4px;
z-index: 1000; z-index: 1000;
} }
@ -607,8 +576,9 @@ h1 {
padding: 10px; padding: 10px;
display: grid; display: grid;
grid-template-columns: repeat(1, 1fr); grid-template-columns: repeat(1, 1fr);
grid-template-rows: repeat(2, auto); grid-template-rows: repeat(1, auto);
grid-gap: 20px; row-gap: 0;
column-gap: 20px;
position: absolute; position: absolute;
top: 0; top: 0;
right: 0; right: 0;
@ -629,7 +599,8 @@ h1 {
.media { .media {
width: 100%; width: 100%;
max-height: calc(100vh - 73px); max-height: calc(100vh - 84px);
padding-bottom: 20px;
} }
.media-failed { .media-failed {
@ -642,7 +613,6 @@ h1 {
.sidenav { .sidenav {
background-color: #4d076b; background-color: #4d076b;
-webkit-box-shadow: 0 0 24px 0 rgba(71,77,86,.1), 0 1px 0 0 rgba(71,77,86,.08);
box-shadow: 0 0 24px 0 rgba(71,77,86,.1), 0 1px 0 0 rgba(71,77,86,.08); box-shadow: 0 0 24px 0 rgba(71,77,86,.1), 0 1px 0 0 rgba(71,77,86,.08);
display: block; display: block;
position: fixed; position: fixed;
@ -696,11 +666,11 @@ h1 {
} }
.sidenav-content h2 { .sidenav-content h2 {
margin: 0; margin: 0;
} }
.nav-menu { .nav-menu {
margin: 0; margin: 0;
} }
.nav-menu li { .nav-menu li {
@ -722,14 +692,10 @@ h1 {
font-size: 150%; font-size: 150%;
border-radius: 30px; border-radius: 30px;
background: #600aa0; background: #600aa0;
-webkit-box-shadow: 4px 4px 7px 1px rgba(0,0,0,0.16);
-moz-box-shadow: 4px 4px 7px 1px rgba(0,0,0,0.16);
box-shadow: 4px 4px 7px 1px rgba(0,0,0,0.16); box-shadow: 4px 4px 7px 1px rgba(0,0,0,0.16);
} }
.blink { .blink {
-webkit-animation: blink 1.0s linear infinite;
-moz-animation: blink 1.0s linear infinite;
-ms-animation: blink 1.0s linear infinite; -ms-animation: blink 1.0s linear infinite;
-o-animation: blink 1.0s linear infinite; -o-animation: blink 1.0s linear infinite;
animation: blink 1.0s linear infinite; animation: blink 1.0s linear infinite;
@ -749,33 +715,33 @@ h1 {
/* Dropdown Menu */ /* Dropdown Menu */
.dropbtn { .dropbtn {
cursor: pointer; cursor: pointer;
} }
.dropdown { .dropdown {
position: relative; position: relative;
display: inline-block; display: inline-block;
} }
.dropdown-content { .dropdown-content {
display: none; display: none;
position: absolute; position: absolute;
background-color: #fff; background-color: #fff;
max-width: 300px; max-width: 300px;
min-width: 200px; min-width: 200px;
margin-top: 11px; margin-top: 11px;
overflow: auto; overflow: auto;
right: 7px; right: 7px;
box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2); box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
z-index: 1; z-index: 1;
padding: 15px; padding: 15px;
} }
.dropdown-content a { .dropdown-content a {
color: black; color: black;
padding: 12px 16px; padding: 12px 16px;
text-decoration: none; text-decoration: none;
display: block; display: block;
} }
.dropdown a:hover {background-color: #ddd;} .dropdown a:hover {background-color: #ddd;}
@ -783,8 +749,8 @@ h1 {
.show {display: block;} .show {display: block;}
.dropdown-content label{ .dropdown-content label{
display: block; display: block;
margin-top: 15px; margin-top: 15px;
} }
/* END Dropdown Menu */ /* END Dropdown Menu */
@ -814,26 +780,25 @@ h1 {
} }
#left-sidebar .sfu-header { #left-sidebar .sfu-header {
display: inline-block; display: inline-block;
} }
header .colapse { header .colapse {
float: left; float: left;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
padding-top: 5px; padding-top: 5px;
margin-right: 20px; margin-right: 20px;
} }
.sfu-header { .sfu-header {
font-size: 1.3rem; font-size: 1.3rem;
font-weight: 900; font-weight: 900;
color: #dbd9d9; color: #dbd9d9;
/*color: #416d8e;*/
} }
.header-sep { .header-sep {
height: 20px; height: 20px;
} }
/* Shrinking the sidebar from 200px to 60px and center aligining its content*/ /* Shrinking the sidebar from 200px to 60px and center aligining its content*/
@ -841,6 +806,7 @@ header .colapse {
min-width: 60px; min-width: 60px;
max-width: 60px; max-width: 60px;
text-align: center; text-align: center;
margin-left: -60px !important;
} }
#left-sidebar .sidebar-header strong { #left-sidebar .sidebar-header strong {
@ -877,7 +843,7 @@ header .colapse {
} }
#left-sidebar.active #users > div { #left-sidebar.active #users > div {
padding: 10px 5px !important; padding: 10px 5px !important;
} }
#users > div:hover { #users > div:hover {
@ -894,39 +860,41 @@ header .colapse {
/* END Sidebar Left */ /* END Sidebar Left */
@media screen and (max-height: 450px) { @media screen and (max-height: 450px) {
.sidenav-content {padding: 10px;} .sidenav-content {padding: 10px;}
.sidenav a {font-size: 18px;} .sidenav a {font-size: 18px;}
} }
/*@media only screen and (max-width: 768px) {*/ /*@media only screen and (max-width: 768px) {*/
@media only screen and (max-device-width: 768px) { @media only screen and (max-device-width: 768px) {
.nav-link { .nav-link {
margin: 0; margin: 0;
line-height: 1.5; line-height: 1.5;
} }
.nav-link label { .nav-link label {
display: none; display: none;
} }
.nav-text { .nav-text {
display: none; display: none;
} }
.label { .label {
margin: 5px 5px 5px 30%; margin: 5px 5px 5px 30%;
} }
.video-container { .video-container {
height: calc(100vh - 64px); height: calc(100vh - 64px);
position: fixed; position: fixed;
top: 64px; top: 64px;
right: 0; right: 0;
left: 0; left: 0;
margin-bottom: 60px; margin-bottom: 60px;
} }
.coln-left { .coln-left {
flex: 100%; flex: 100%;
width: 100vw; width: 100vw;
} }
.coln-right { .coln-right {
@ -934,11 +902,10 @@ header .colapse {
} }
.full-width { .full-width {
width: 100vw; width: 100vw;
} }
#left-sidebar.active { #left-sidebar.active {
min-width: 200px; min-width: 200px;
max-width: 200px; max-width: 200px;
} }
@ -955,13 +922,14 @@ header .colapse {
margin-left: 0; margin-left: 0;
} }
#left-sidebar .sidebar-header strong { #left-sidebar .sidebar-header strong {
display: none; display: none;
} }
#left-sidebar.active .sidebar-header h3 { #left-sidebar.active .sidebar-header h3 {
display: none; display: none;
} }
#left-sidebar.active .sidebar-header strong { #left-sidebar.active .sidebar-header strong {
display: block; display: block;
} }
@ -970,4 +938,8 @@ header .colapse {
padding: 3px; padding: 3px;
} }
#resizer {
display: none;
}
} }

View file

@ -26,8 +26,8 @@
<header> <header>
<nav class="topnav navbar navbar-expand navbar-light fixed-top"> <nav class="topnav navbar navbar-expand navbar-light fixed-top">
<div id="header"> <div id="header">
<div class="colapse" title="Colapse" id="sidebarCollapse"> <div class="colapse" title="Colapse left panel" 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=""> <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> <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> </svg>
</div> </div>
@ -60,13 +60,13 @@
<li> <li>
<div id="unsharebutton" class="invisible nav-link nav-button nav-cancel"> <div id="unsharebutton" class="invisible nav-link nav-button nav-cancel">
<span><i class="fa fa-window-close-o" aria-hidden="true"></i></span> <span><i class="fa fa-window-close-o" aria-hidden="true"></i></span>
<label>Share Screen</label> <label>Unshare Screen</label>
</div> </div>
</li> </li>
<li> <li>
<div class="nav-button nav-link invisible" id="user"> <div class="nav-button nav-link invisible" id="user">
<span><i class="fa fa-user dropbtn" aria-hidden="true"></i></span> <span><i class="fa fa-user dropbtn" aria-hidden="true"></i></span>
<label>Profile</label> <label>User</label>
</div> </div>
<div id="userDropdown" class="dropdown-content"> <div id="userDropdown" class="dropdown-content">
<div id="statdiv"> <div id="statdiv">
@ -89,7 +89,7 @@
</nav> </nav>
</header> </header>
<div class="row full-width" id="mainrow"> <div class="row full-width" id="mainrow">
<div class="coln-left"> <div class="coln-left" id="left">
<div id="chat"> <div id="chat">
<div id="chatbox"> <div id="chatbox">
<div id="box"></div> <div id="box"></div>
@ -103,14 +103,13 @@
</div> </div>
</div> </div>
<div id="resizer"></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> <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 class="video-container no-video" id="video-container">
<div id="peers"></div> <div id="peers"></div>
</div> </div>
<div class="login-container invisible" id="login-container"> <div class="login-container invisible" id="login-container">
<div class="login-box"> <div class="login-box">
<h2>Login to SFU</h2>
<form id="userform" class="userform"> <form id="userform" class="userform">
<label for="username">Username:</label> <label for="username">Username:</label>
<input id="username" type="text" name="username" <input id="username" type="text" name="username"

View file

@ -47,7 +47,6 @@ function getUsername() {
function showVideo() { function showVideo() {
let video_container = document.getElementById('video-container'); let video_container = document.getElementById('video-container');
//video_container[0].style.display = "block";
video_container.classList.remove('no-video'); video_container.classList.remove('no-video');
} }
@ -60,7 +59,6 @@ function hideVideo(force) {
return; return;
} }
let video_container = document.getElementById('video-container'); let video_container = document.getElementById('video-container');
//video_container.style.display = "";
video_container.classList.add('no-video'); video_container.classList.add('no-video');
} }
@ -80,6 +78,8 @@ function setConnected(connected) {
userbox.classList.remove('invisible'); userbox.classList.remove('invisible');
connectionbox.classList.add('invisible'); connectionbox.classList.add('invisible');
displayUsername(); displayUsername();
displayMessage("Press Present to enable your camera or microphone",
"info");
} else { } else {
resetUsers(); resetUsers();
let userpass = getUserPass(); let userpass = getUserPass();
@ -109,7 +109,6 @@ function gotClose(code, reason) {
delUpMediaKind(null); delUpMediaKind(null);
setConnected(false); setConnected(false);
if(code != 1000) { if(code != 1000) {
//displayError('Socket close: Code ' + code, "error");
console.warn('Socket close', code, reason); console.warn('Socket close', code, reason);
} }
} }
@ -173,7 +172,7 @@ function setButtonsVisibility() {
setVisibility('presentbutton', permissions.present && !local); setVisibility('presentbutton', permissions.present && !local);
setVisibility('unpresentbutton', local); setVisibility('unpresentbutton', local);
// allow multiple shared documents // allow multiple shared documents
setVisibility('sharebutton', permissions.present && !share); setVisibility('sharebutton', permissions.present);
setVisibility('unsharebutton', share); setVisibility('unsharebutton', share);
setVisibility('mediaoptions', permissions.present); setVisibility('mediaoptions', permissions.present);
@ -190,7 +189,6 @@ function setLocalMute(mute) {
localMute = mute; localMute = mute;
muteLocalTracks(localMute); muteLocalTracks(localMute);
let button = document.getElementById('mutebutton'); let button = document.getElementById('mutebutton');
//button.textContent = localMute ? 'Unmute' : 'Mute';
if(localMute) if(localMute)
button.classList.add('muted'); button.classList.add('muted');
else else
@ -644,15 +642,20 @@ function resizePeers() {
Object.keys(serverConnection.down).length; Object.keys(serverConnection.down).length;
let peers = document.getElementById('peers'); let peers = document.getElementById('peers');
let columns = Math.ceil(Math.sqrt(count)); let columns = Math.ceil(Math.sqrt(count));
peers.style['grid-template-columns'] = `repeat(${columns}, 1fr)`; let rows = "";
if (false) { let size = 100 / columns;
if (peers.offsetWidth < peers.offsetHeight) { // Peers div has padding 10 on top and bottom, remove 20 on offsetHeight
// we change view orientation let max_video_height = Math.trunc((peers.offsetHeight - 30) / columns);
peers.style['grid-template-rows'] = `repeat(${columns}, auto)`; for(let i = 0; i < columns; i++){
} rows += size + "% ";
} else {
peers.style['grid-template-columns'] = `repeat(${columns}, 1fr)`;
} }
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>} */ /** @type{Object.<string,string>} */
@ -965,19 +968,17 @@ document.getElementById('input').onkeypress = function(e) {
function chatResizer(e) { function chatResizer(e) {
e.preventDefault(); 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_x = e.clientX;
let start_width = parseFloat( let start_width = parseFloat(left.offsetWidth);
document.defaultView.getComputedStyle(chat).width.replace('px', ''),
);
let inputbutton = document.getElementById('inputbutton');
function start_drag(e) { function start_drag(e) {
let width = start_width + e.clientX - start_x; let left_width = (start_width + e.clientX - start_x) * 100 / full_width;
if(width < 40) left.style.flex = left_width;
inputbutton.style.display = 'none'; right.style.flex = 100 - left_width;
else
inputbutton.style.display = 'inline';
chat.style.width = width + 'px';
} }
function stop_drag(e) { function stop_drag(e) {
document.documentElement.removeEventListener( document.documentElement.removeEventListener(
@ -999,26 +1000,32 @@ function chatResizer(e) {
document.getElementById('resizer').addEventListener('mousedown', chatResizer, false); document.getElementById('resizer').addEventListener('mousedown', chatResizer, false);
function displayError(message, level) { function displayError(message, level, position, gravity) {
var background = "linear-gradient(to right, #529518, #96c93d)"; var background = "linear-gradient(to right, #e20a0a, #df2d2d)";
if (level === undefined || level === "error") { if (level === "info") {
level = "error"; background = "linear-gradient(to right, #529518, #96c93d)";
background = "linear-gradient(to right, #e20a0a, #df2d2d)"; }
if (level === "warning") {
background = "linear-gradient(to right, #edd800, #c9c200)";
} }
Toastify({ Toastify({
text: message, text: message,
duration: 5000, duration: 4000,
close: true, close: true,
position: 'center', position: position ? position: 'center',
gravity: gravity ? gravity : 'top',
backgroundColor: background, backgroundColor: background,
className: level, className: level,
}).showToast(); }).showToast();
} }
function displayWarning(message) { function displayWarning(message) {
// don't overwrite real errors let level = "warning";
if(!errorTimeout) return displayError(message, level);
return displayError(message); }
function displayMessage(message) {
return displayError(message, "info", "right", "bottom");
} }
document.getElementById('userform').onsubmit = function(e) { document.getElementById('userform').onsubmit = function(e) {
@ -1135,7 +1142,6 @@ function start() {
setLocalMute(localMute); setLocalMute(localMute);
//document.getElementById('connectbutton').disabled = false;
let userpass = getUserPass(); let userpass = getUserPass();
if(userpass) if(userpass)