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
parent
32459b4b5b
commit
efb8a71981
6 changed files with 228 additions and 261 deletions
|
|
@ -1,7 +1,3 @@
|
|||
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;
|
||||
}
|
||||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,27 +5,17 @@
|
|||
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;
|
||||
}
|
||||
|
||||
|
|
@ -42,9 +32,9 @@ label {
|
|||
display: block;
|
||||
}
|
||||
|
||||
@media only screen and (max-device-width: 480px) {
|
||||
@media only screen and (max-device-width: 768px) {
|
||||
.home {
|
||||
padding: 10px;
|
||||
padding: 0.625rem;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
.nav-fixed .topnav {
|
||||
z-index: 1039;
|
||||
}
|
||||
|
||||
.fixed-top{
|
||||
position: fixed;
|
||||
top: 0;
|
||||
|
|
@ -8,12 +9,13 @@
|
|||
left: 0;
|
||||
z-index: 1030;
|
||||
}
|
||||
|
||||
.topnav {
|
||||
padding-left: 0;
|
||||
/*height: 3.313rem;*/
|
||||
height: 4rem;
|
||||
z-index: 1039;
|
||||
}
|
||||
|
||||
.navbar .form-control, .topnav {
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
|
@ -55,13 +57,11 @@
|
|||
align-items: center;
|
||||
-webkit-box-pack: justify;
|
||||
justify-content: space-between;
|
||||
/*background: #4b4c7b;*/
|
||||
background: #610a86;
|
||||
}
|
||||
.navbar {
|
||||
position: relative;
|
||||
padding: .5rem;
|
||||
/*border-bottom: 1px solid #e6e6e6;*/
|
||||
}
|
||||
|
||||
.topnav .navbar-brand {
|
||||
|
|
@ -85,7 +85,6 @@
|
|||
user-select: none;
|
||||
border: 1px solid transparent;
|
||||
padding: 0.255rem .75rem;
|
||||
/*font-size: 1rem;*/
|
||||
line-height: 1.5;
|
||||
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;
|
||||
|
|
@ -166,7 +165,6 @@
|
|||
|
||||
.app {
|
||||
background-color: #f7f7f7;
|
||||
/*height: 100%;*/
|
||||
overflow: hidden;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
|
@ -179,10 +177,6 @@
|
|||
margin: 0;
|
||||
}
|
||||
|
||||
.coln-middle {
|
||||
flex: 30%;
|
||||
}
|
||||
|
||||
.coln-right {
|
||||
flex: 70%;
|
||||
}
|
||||
|
|
@ -202,7 +196,7 @@
|
|||
}
|
||||
|
||||
.full-width-active {
|
||||
width: calc(100vw - 60px);
|
||||
width: 100vw;
|
||||
}
|
||||
|
||||
.container {
|
||||
|
|
@ -213,7 +207,6 @@
|
|||
height: 4rem;
|
||||
padding: 10px;
|
||||
background: #610a86;
|
||||
/*border-bottom: 1px solid #e6e6e6;*/
|
||||
font-size: .95rem;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
|
@ -231,21 +224,20 @@
|
|||
height: 60px;
|
||||
width: 100%;
|
||||
background-color: #eae7e5;
|
||||
padding: 10px 5px 10px 5px !important;
|
||||
margin: 0 !important;
|
||||
padding: 10px 5px 10px 5px;
|
||||
margin: 0;
|
||||
z-index: 1000;
|
||||
}
|
||||
.reply textarea {
|
||||
width: 100%;
|
||||
resize: none;
|
||||
overflow: hidden;
|
||||
padding: 5px !important;
|
||||
padding: 5px;
|
||||
outline: none;
|
||||
border: none;
|
||||
text-indent: 5px;
|
||||
box-shadow: none;
|
||||
height: 100%;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
textarea.form-reply {
|
||||
|
|
@ -258,17 +250,13 @@ textarea.form-reply {
|
|||
width: 100%;
|
||||
height: 34px;
|
||||
padding: 6px 12px;
|
||||
font-size: 14px;
|
||||
line-height: 1.42857143;
|
||||
font-size: 1rem;
|
||||
color: #555;
|
||||
background-color: #fff;
|
||||
background-image: none;
|
||||
border: 1px solid #ccc;
|
||||
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);
|
||||
-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;
|
||||
}
|
||||
|
||||
|
|
@ -294,10 +282,10 @@ textarea.form-reply {
|
|||
.message {
|
||||
width: auto !important;
|
||||
padding: 4px 10px 7px !important;
|
||||
border-radius: 10px 10px 10px 0;
|
||||
background: #daf1c6;
|
||||
font-size: 12px;
|
||||
box-shadow: 0 1px 1px rgba(43, 43, 43, 0.16);
|
||||
border-radius: 5px;
|
||||
word-wrap: break-word;
|
||||
display: inline-block;
|
||||
margin: 1em 0 0;
|
||||
|
|
@ -305,10 +293,7 @@ textarea.form-reply {
|
|||
}
|
||||
|
||||
.message-sender {
|
||||
float: right;
|
||||
background: #ececec;
|
||||
border-radius: 10px 10px 0 10px;
|
||||
margin-left: 20% !important;
|
||||
}
|
||||
|
||||
.message-row:after, .message-row:before {
|
||||
|
|
@ -337,7 +322,6 @@ textarea.form-reply {
|
|||
}
|
||||
|
||||
.video-container {
|
||||
/*height: 100%;*/
|
||||
height: calc(100vh - 64px);
|
||||
position: relative;
|
||||
background: rgba(0, 0, 0, 0.61);
|
||||
|
|
@ -381,18 +365,14 @@ textarea.form-reply {
|
|||
}
|
||||
|
||||
.label {
|
||||
background-color: rgba(0, 0, 0, 0.6);
|
||||
left: 0;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
width: auto;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
z-index: 1;
|
||||
text-align: center;
|
||||
height: 2em;
|
||||
margin: 10px 10px 10px 38%;
|
||||
padding: 0 20px;
|
||||
line-height: 30px;
|
||||
color: #d4d4d4;
|
||||
line-height: 25px;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
.nav-link {
|
||||
|
|
@ -536,10 +516,6 @@ h1 {
|
|||
text-align-last: center;
|
||||
}
|
||||
|
||||
#main {
|
||||
/*display: flex;*/
|
||||
}
|
||||
|
||||
#chatbox {
|
||||
height: 100%;
|
||||
}
|
||||
|
|
@ -561,7 +537,6 @@ h1 {
|
|||
}
|
||||
|
||||
#box {
|
||||
/*height: 95%;*/
|
||||
overflow: auto;
|
||||
height: calc(100% - 60px);
|
||||
padding: 10px;
|
||||
|
|
@ -583,18 +558,12 @@ h1 {
|
|||
outline: none;
|
||||
}
|
||||
|
||||
#inputbutton {
|
||||
/*background-color: white;
|
||||
border: none;
|
||||
margin-right: 0.2em;*/
|
||||
}
|
||||
|
||||
#inputbutton:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
#resizer {
|
||||
width: 8px;
|
||||
width: 4px;
|
||||
margin-left: -4px;
|
||||
z-index: 1000;
|
||||
}
|
||||
|
|
@ -607,8 +576,9 @@ h1 {
|
|||
padding: 10px;
|
||||
display: grid;
|
||||
grid-template-columns: repeat(1, 1fr);
|
||||
grid-template-rows: repeat(2, auto);
|
||||
grid-gap: 20px;
|
||||
grid-template-rows: repeat(1, auto);
|
||||
row-gap: 0;
|
||||
column-gap: 20px;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
|
|
@ -629,7 +599,8 @@ h1 {
|
|||
|
||||
.media {
|
||||
width: 100%;
|
||||
max-height: calc(100vh - 73px);
|
||||
max-height: calc(100vh - 84px);
|
||||
padding-bottom: 20px;
|
||||
}
|
||||
|
||||
.media-failed {
|
||||
|
|
@ -642,7 +613,6 @@ h1 {
|
|||
|
||||
.sidenav {
|
||||
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);
|
||||
display: block;
|
||||
position: fixed;
|
||||
|
|
@ -722,14 +692,10 @@ h1 {
|
|||
font-size: 150%;
|
||||
border-radius: 30px;
|
||||
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);
|
||||
}
|
||||
|
||||
.blink {
|
||||
-webkit-animation: blink 1.0s linear infinite;
|
||||
-moz-animation: blink 1.0s linear infinite;
|
||||
-ms-animation: blink 1.0s linear infinite;
|
||||
-o-animation: blink 1.0s linear infinite;
|
||||
animation: blink 1.0s linear infinite;
|
||||
|
|
@ -829,7 +795,6 @@ header .colapse {
|
|||
font-size: 1.3rem;
|
||||
font-weight: 900;
|
||||
color: #dbd9d9;
|
||||
/*color: #416d8e;*/
|
||||
}
|
||||
|
||||
.header-sep {
|
||||
|
|
@ -841,6 +806,7 @@ header .colapse {
|
|||
min-width: 60px;
|
||||
max-width: 60px;
|
||||
text-align: center;
|
||||
margin-left: -60px !important;
|
||||
}
|
||||
|
||||
#left-sidebar .sidebar-header strong {
|
||||
|
|
@ -904,9 +870,11 @@ header .colapse {
|
|||
margin: 0;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.nav-link label {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.nav-text {
|
||||
display: none;
|
||||
}
|
||||
|
|
@ -938,7 +906,6 @@ header .colapse {
|
|||
}
|
||||
|
||||
#left-sidebar.active {
|
||||
|
||||
min-width: 200px;
|
||||
max-width: 200px;
|
||||
}
|
||||
|
|
@ -955,13 +922,14 @@ header .colapse {
|
|||
margin-left: 0;
|
||||
}
|
||||
|
||||
|
||||
#left-sidebar .sidebar-header strong {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#left-sidebar.active .sidebar-header h3 {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#left-sidebar.active .sidebar-header strong {
|
||||
display: block;
|
||||
}
|
||||
|
|
@ -970,4 +938,8 @@ header .colapse {
|
|||
padding: 3px;
|
||||
}
|
||||
|
||||
#resizer {
|
||||
display: none;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -26,8 +26,8 @@
|
|||
<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>
|
||||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)`;
|
||||
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 + "% ";
|
||||
}
|
||||
} else {
|
||||
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)
|
||||
|
|
|
|||
Loading…
Reference in a new issue