A lot of changes
This commit is contained in:
WolverinDEV
parent
e9384bcf18
commit
69d39991e4
41 changed files with 1576 additions and 749 deletions
|
|
@ -1,5 +1,4 @@
|
|||
<?php
|
||||
|
||||
$GLOBALS["COOKIE_NAME_USER_DATA"] = "user_data";
|
||||
$GLOBALS["COOKIE_NAME_USER_SIGN"] = "user_sign";
|
||||
|
||||
|
|
@ -8,20 +7,13 @@
|
|||
if($host == "WolverinDEV")
|
||||
$localhost = true;
|
||||
|
||||
|
||||
/*
|
||||
openssl genrsa -des3 -out forum_private.pem 2048
|
||||
openssl rsa -in forum_private.pem -outform PEM -pubout -out forum_public.pem
|
||||
openssl rsa -in forum_private.pem -out private_unencrypted.pem -outform PEM #Export the private key as unencripted
|
||||
*/
|
||||
function authPath() {
|
||||
if (file_exists("auth")) {
|
||||
return "auth/";
|
||||
} else return "";
|
||||
}
|
||||
|
||||
function mainPath()
|
||||
{
|
||||
function mainPath() {
|
||||
global $localhost;
|
||||
if ($localhost) {
|
||||
return "../";
|
||||
|
|
@ -66,40 +58,6 @@
|
|||
return ((int)$mt[1]) * 1000 + ((int)round($mt[0] * 1000));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $user \XF\Entity\User
|
||||
* @return array
|
||||
*/
|
||||
function generateUserData($user)
|
||||
{
|
||||
$user_data = array();
|
||||
|
||||
$user_data["user_id"] = $user->user_id;
|
||||
$user_data["user_name"] = $user->username;
|
||||
$user_data["user_group"] = $user->user_group_id;
|
||||
$user_data["user_groups"] = $user->secondary_group_ids;
|
||||
|
||||
$user_data["trophy_points"] = $user->trophy_points;
|
||||
$user_data["register_date"] = $user->register_date;
|
||||
$user_data["is_staff"] = $user->is_staff;
|
||||
$user_data["is_admin"] = $user->is_admin;
|
||||
$user_data["is_super_admin"] = $user->is_super_admin;
|
||||
$user_data["is_banned"] = $user->is_banned;
|
||||
|
||||
$user_data["data_age"] = milliseconds();
|
||||
|
||||
$data = json_encode($user_data);
|
||||
|
||||
|
||||
$file = realpath("./certs/private_unencrypted.pem");
|
||||
$pkeyid = openssl_pkey_get_private("file://" . $file);
|
||||
if (!$pkeyid) die("Could not open private key! Message: " . openssl_error_string() . " (" . $file . ")");
|
||||
if (!openssl_sign($data, $signature, $pkeyid, OPENSSL_ALGO_SHA256)) die("Could not sign user data");
|
||||
openssl_free_key($pkeyid);
|
||||
|
||||
return ["data" => $data, "sign" => base64_encode($signature)];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $username
|
||||
* @param $password
|
||||
|
|
@ -129,7 +87,7 @@
|
|||
$user = $loginService->validate($password, $error);
|
||||
if ($user) {
|
||||
$response["success"] = true;
|
||||
$allowed = true;
|
||||
$allowed = false;
|
||||
foreach ($allowedXFGroups as $id) {
|
||||
foreach ($user->secondary_group_ids as $assigned)
|
||||
if ($assigned == $id) {
|
||||
|
|
@ -158,12 +116,6 @@
|
|||
$response["sessionName"] = $session->getCookieName();
|
||||
$response["sessionId"] = $session->getSessionId();
|
||||
$response["user_name"] = $user->username;
|
||||
|
||||
$user_data = generateUserData($user);
|
||||
$response["cookie_name_data"] = $GLOBALS["COOKIE_NAME_USER_DATA"];
|
||||
$response["cookie_name_sign"] = $GLOBALS["COOKIE_NAME_USER_SIGN"];
|
||||
$response["user_data"] = $user_data["data"];
|
||||
$response["user_sign"] = $user_data["sign"];
|
||||
} catch (Exception $error) {
|
||||
$response["success"] = false;
|
||||
$response["msg"] = $error->getMessage();
|
||||
|
|
@ -199,10 +151,10 @@
|
|||
}
|
||||
|
||||
/**
|
||||
* @param null $sessionId
|
||||
* @return int 0 = Success | 1 = Invalid coocie | 2 = invalid session
|
||||
*/
|
||||
function test_session($sessionId = null)
|
||||
{
|
||||
function test_session($sessionId = null) {
|
||||
$app = getXF();
|
||||
if(!$app) return -1;
|
||||
|
||||
|
|
@ -217,8 +169,7 @@
|
|||
return 0;
|
||||
}
|
||||
|
||||
function redirectOnInvalidSession()
|
||||
{
|
||||
function redirectOnInvalidSession() {
|
||||
$app = getXF();
|
||||
if(!$app) return;
|
||||
|
||||
|
|
@ -246,9 +197,11 @@
|
|||
getXF(); /* Initialize XF */
|
||||
}
|
||||
|
||||
if(!$_INCLIDE_ONLY) {
|
||||
if(!defined("_AUTH_API_ONLY")) {
|
||||
$app = getXF();
|
||||
if(!$app) return;
|
||||
if(!$app) {
|
||||
die("failed to start app");
|
||||
}
|
||||
|
||||
if (isset($_GET["type"])) {
|
||||
error_log("Got authX request!");
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* Created by PhpStorm.
|
||||
* User: wolverindev
|
||||
* Date: 16.03.18
|
||||
* Time: 17:03
|
||||
*/
|
||||
phpinfo();
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
<?php
|
||||
include_once('auth.php');
|
||||
|
||||
$session = test_session();
|
||||
if($session == 0) {
|
||||
header('Location: ' . mainPath() . 'index.php');
|
||||
|
|
|
|||
|
|
@ -991,46 +991,59 @@ $client_info_avatar_size: 10em;
|
|||
|
||||
align-self: center;
|
||||
|
||||
border-radius: 50%;
|
||||
overflow: hidden;
|
||||
|
||||
.avatar {
|
||||
overflow: hidden;
|
||||
|
||||
width: $client_info_avatar_size;
|
||||
height: $client_info_avatar_size;
|
||||
|
||||
border-radius: 50%;
|
||||
}
|
||||
}
|
||||
|
||||
.container-avatar-edit {
|
||||
position: absolute;
|
||||
|
||||
display: inline-block;
|
||||
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
|
||||
z-index: 2;
|
||||
|
||||
text-align: center;
|
||||
|
||||
> img {
|
||||
cursor: pointer;
|
||||
|
||||
width: $client_info_avatar_size;
|
||||
height: $client_info_avatar_size;
|
||||
|
||||
padding: calc(#{$client_info_avatar_size} / 6);
|
||||
|
||||
overflow: hidden;
|
||||
opacity: 0;
|
||||
|
||||
&:hover {
|
||||
opacity: .75;
|
||||
}
|
||||
@include transition(opacity $button_hover_animation_time ease-in-out);
|
||||
}
|
||||
|
||||
.container-avatar-edit {
|
||||
position: absolute;
|
||||
|
||||
display: none;
|
||||
|
||||
left: 0;
|
||||
right: 0;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
|
||||
z-index: 2;
|
||||
|
||||
text-align: center;
|
||||
|
||||
> img {
|
||||
cursor: pointer;
|
||||
|
||||
width: $client_info_avatar_size;
|
||||
height: $client_info_avatar_size;
|
||||
|
||||
padding: calc(#{$client_info_avatar_size} / 6);
|
||||
|
||||
overflow: hidden;
|
||||
opacity: 0;
|
||||
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
@include transition(opacity $button_hover_animation_time ease-in-out);
|
||||
}
|
||||
}
|
||||
|
||||
&.editable {
|
||||
.container-avatar-edit {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.container-avatar-edit:hover + .avatar {
|
||||
opacity: .5;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.client-name {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,15 @@
|
|||
@import "mixin";
|
||||
|
||||
$separator_thickness: 5px;
|
||||
$small_device: 650px;
|
||||
$animation_length: .5s;
|
||||
|
||||
|
||||
.app {
|
||||
min-width: 350px;
|
||||
min-width: 600px;
|
||||
min-height: 330px;
|
||||
|
||||
padding: 5px;
|
||||
|
||||
.container-app-main {
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
|
|
@ -67,6 +70,8 @@ $animation_length: .5s;
|
|||
> .channel-tree {
|
||||
padding-top: 5px;
|
||||
|
||||
min-height: 5em;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
|
@ -194,13 +199,7 @@ $animation_length: .5s;
|
|||
top: 0;
|
||||
|
||||
overflow: auto;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 400px), only screen and (max-height: 400px) {
|
||||
.app-container {
|
||||
overflow: auto;
|
||||
}
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
@media only screen and (max-width: $small_device) {
|
||||
|
|
@ -220,11 +219,7 @@ $animation_length: .5s;
|
|||
|
||||
$animation_seperator_length: .1s;
|
||||
.container-seperator {
|
||||
-moz-transition: all $animation_seperator_length ease-in;
|
||||
-o-transition: all $animation_seperator_length ease-in;
|
||||
-webkit-transition: all $animation_seperator_length ease-in;
|
||||
transition: all $animation_seperator_length ease-in;
|
||||
|
||||
@include transition(all $animation_seperator_length ease-in-out);
|
||||
background: #1e1e1e;
|
||||
|
||||
flex-grow: 0;
|
||||
|
|
@ -245,10 +240,7 @@ $animation_seperator_length: .1s;
|
|||
}
|
||||
|
||||
&.seperator-selected {
|
||||
-moz-transition: all $animation_seperator_length ease-in;
|
||||
-o-transition: all $animation_seperator_length ease-in;
|
||||
-webkit-transition: all $animation_seperator_length ease-in;
|
||||
transition: all $animation_seperator_length ease-in;
|
||||
@include transition(all $animation_seperator_length ease-in-out);
|
||||
|
||||
background-color: #707070;
|
||||
}
|
||||
|
|
@ -287,24 +279,4 @@ html, body {
|
|||
|
||||
body {
|
||||
background: #1e1e1e !important;
|
||||
}
|
||||
|
||||
footer {
|
||||
position: fixed;
|
||||
width: 100%;
|
||||
bottom: 0px;
|
||||
left: 0px;
|
||||
right: 0px;
|
||||
height: 25px;
|
||||
background-color: lightgray;
|
||||
|
||||
display: flex;
|
||||
}
|
||||
|
||||
footer .container {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
position: relative;
|
||||
vertical-align: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
|
@ -5,6 +5,12 @@
|
|||
text-align: center;
|
||||
color: #999999;
|
||||
|
||||
.container-left {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.container-right {
|
||||
text-align: left;
|
||||
padding-left: 2em;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,28 @@
|
|||
@import "properties";
|
||||
@import "mixin";
|
||||
|
||||
.modal-icon-select {
|
||||
@include user-select(none);
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
width: 50em;
|
||||
|
||||
/*
|
||||
.right, .left {
|
||||
.header {
|
||||
text-transform: uppercase;
|
||||
color: #557edc;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
.container-icons {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
|
@ -41,11 +61,16 @@
|
|||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
|
||||
background-color: whitesmoke;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
background-color: $color_list_background;
|
||||
border: 1px $color_list_border solid;
|
||||
|
||||
border-radius: $border_radius_large;
|
||||
|
||||
padding: .5em;
|
||||
|
||||
&.container-icons-local {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.icon-container, .icon {
|
||||
margin-left: 1px;
|
||||
|
|
@ -57,11 +82,15 @@
|
|||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
border-radius: .1em;
|
||||
|
||||
background-color: #00000011;
|
||||
border: 1px solid black;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
border-radius: .1em;
|
||||
|
||||
background-color: #00330011;
|
||||
border: 1px solid red;
|
||||
}
|
||||
|
|
@ -82,8 +111,11 @@
|
|||
left: 0;
|
||||
right: 0;
|
||||
|
||||
font-size: 1.1em;
|
||||
color: hsla(0, 0%, 40%, 1);
|
||||
|
||||
position: absolute;
|
||||
background-color: grey;
|
||||
background-color: #00000045;
|
||||
|
||||
cursor: not-allowed;
|
||||
|
||||
|
|
@ -118,16 +150,27 @@
|
|||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
justify-content: space-between;
|
||||
|
||||
.spacer {
|
||||
min-width: 0;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
}
|
||||
|
||||
.btn {
|
||||
button {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
flex-shrink: 1;
|
||||
|
||||
width: 8em;
|
||||
min-width: 4em;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
margin-right: 1em;
|
||||
}
|
||||
|
||||
.button-select {
|
||||
|
|
@ -136,10 +179,24 @@
|
|||
display: flex;
|
||||
align-items: center;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
|
||||
.selected-item-container {
|
||||
height: 16px;
|
||||
vertical-align: sub;
|
||||
a, div {
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
> div {
|
||||
font-size: 16px;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
margin-left: .5rem;
|
||||
|
||||
> div {
|
||||
display: flex;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -150,17 +207,18 @@
|
|||
}
|
||||
|
||||
.modal-icon-upload {
|
||||
user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
-webkit-user-select: none;
|
||||
@include user-select(none);
|
||||
|
||||
width: 50em;
|
||||
min-width: 300px;
|
||||
|
||||
padding: 0!important;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.container-select {
|
||||
padding: 1em;
|
||||
min-height: 130px;
|
||||
|
||||
display: flex;
|
||||
|
|
@ -176,36 +234,44 @@
|
|||
min-height: 130px;
|
||||
overflow-y: auto;
|
||||
|
||||
margin-right: 5px;
|
||||
margin-right: 1em;
|
||||
|
||||
border: gray solid 1px;
|
||||
border-radius: 2px;
|
||||
background-color: $color_list_background;
|
||||
border: 1px $color_list_border solid;
|
||||
|
||||
border-radius: $border_radius_large;
|
||||
|
||||
padding: .5em;
|
||||
display: block;
|
||||
|
||||
.icon-container {
|
||||
display: inline-block;
|
||||
|
||||
height: 18px;
|
||||
width: 18px;
|
||||
|
||||
image {
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
}
|
||||
|
||||
margin: 1px;
|
||||
padding: 1px;
|
||||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
padding: 0;
|
||||
border-radius: .1em;
|
||||
|
||||
background-color: #00000011;
|
||||
border: 1px solid black;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
padding: 0;
|
||||
border-radius: .1em;
|
||||
|
||||
background-color: #00330011;
|
||||
border: 1px solid red;
|
||||
}
|
||||
|
||||
&:hover, &.selected {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
|
||||
margin: -1px 0px;
|
||||
}
|
||||
|
||||
> img {
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -224,36 +290,67 @@
|
|||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-start;
|
||||
|
||||
> button:not(:first-of-type) {
|
||||
margin-top: .5em;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-upload {
|
||||
-webkit-box-shadow: 0px -5px 5px 0px rgba(0,0,0,0.25);
|
||||
-moz-box-shadow: 0px -5px 5px 0px rgba(0,0,0,0.25);
|
||||
box-shadow: 0px -5px 2px 0px rgba(0, 0, 0, 0.25);
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
margin-top: 5px;
|
||||
border-top: 1px solid darkgray;
|
||||
padding-top: 5px;
|
||||
padding: .5em 1em 1em;
|
||||
|
||||
.container-error, .container-success {
|
||||
width: 100%;
|
||||
min-height: 60px;
|
||||
display: inline-block;
|
||||
|
||||
.error-message, .message {
|
||||
border: 2px solid;
|
||||
border-radius: $border_radius_middle;
|
||||
|
||||
&.container-error {
|
||||
border-color: #8000007F;
|
||||
background-color: #80000040;
|
||||
}
|
||||
|
||||
&.container-success {
|
||||
margin-top: .5em;
|
||||
|
||||
border-color: #328f3340;
|
||||
background-color: #328f3320;
|
||||
}
|
||||
|
||||
padding: .5em;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
> * {
|
||||
align-self: center;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
button {
|
||||
float: right;
|
||||
display: inline-block;
|
||||
width: 6em;
|
||||
}
|
||||
}
|
||||
|
||||
.container-success {
|
||||
margin-top: 5px;
|
||||
min-height: 100px;
|
||||
&.hidden {
|
||||
opacity: 0;
|
||||
height: 0;
|
||||
min-height: 0;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
@include transition(.25s ease-in-out);
|
||||
}
|
||||
|
||||
.container-info {
|
||||
|
|
@ -263,13 +360,17 @@
|
|||
}
|
||||
|
||||
.container-process {
|
||||
margin-top: .5em;
|
||||
|
||||
width: 100%;
|
||||
min-height: 100px;
|
||||
|
||||
overflow-y: auto;
|
||||
|
||||
border: gray solid 1px;
|
||||
border-radius: 2px;
|
||||
background-color: $color_list_background;
|
||||
border: 1px $color_list_border solid;
|
||||
|
||||
border-radius: $border_radius_large;
|
||||
|
||||
.upload-entry {
|
||||
display: flex;
|
||||
|
|
@ -286,11 +387,13 @@
|
|||
|
||||
align-self: center;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
> img {
|
||||
height: 16px;
|
||||
width: 16px;
|
||||
|
||||
vertical-align: unset;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -300,19 +403,53 @@
|
|||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-start;
|
||||
|
||||
min-width: 2em;
|
||||
|
||||
margin: 2px 5px 2px 3px;
|
||||
height: 16px;
|
||||
|
||||
overflow: hidden;
|
||||
font-size: .75rem;
|
||||
|
||||
background-color: #222222;
|
||||
border: 1px solid hsla(0, 0%, 10%, 1);
|
||||
border-radius: .25rem;
|
||||
|
||||
.progress-bar {
|
||||
height: 100%;
|
||||
|
||||
&.bg-danger {
|
||||
background-color: #8000007F;
|
||||
}
|
||||
|
||||
&.bg-success {
|
||||
background-color: #328f337F;
|
||||
}
|
||||
|
||||
@include transition(width 1s ease-in-out, background-color $button_hover_animation_time ease-in-out);
|
||||
}
|
||||
|
||||
.progress-message {
|
||||
align-self: center;
|
||||
text-align: center;
|
||||
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
min-width: 1em;
|
||||
line-height: normal;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,61 @@
|
|||
@import "mixin";
|
||||
@import "properties";
|
||||
|
||||
.modal-invite {
|
||||
user-select: none;
|
||||
|
||||
padding: .5em!important;
|
||||
@include user-select(none);
|
||||
|
||||
.general-properties {
|
||||
flex: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
> .form-group:first-of-type {
|
||||
flex-grow: 1;
|
||||
margin-right: 5px;
|
||||
.form-group {
|
||||
flex: 0;
|
||||
}
|
||||
|
||||
.container-settings {
|
||||
flex: 0;
|
||||
|
||||
margin-bottom: .5em;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
label {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-start;
|
||||
|
||||
> * {
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
a {
|
||||
margin-left: .5em;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.text-output {
|
||||
border-radius: 2px;
|
||||
padding: 5px;
|
||||
background: #00000012;
|
||||
min-height: 120px;
|
||||
background-color: $color_list_background;
|
||||
border: 1px $color_list_border solid;
|
||||
|
||||
border-radius: $border_radius_large;
|
||||
|
||||
padding: .5em;
|
||||
min-height: 5em;
|
||||
|
||||
width: 100%;
|
||||
resize: none;
|
||||
|
||||
color: #999999;
|
||||
|
||||
@include user-select(text);
|
||||
}
|
||||
|
||||
.buttons {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
|
||||
width: 100%;
|
||||
max-height: 90vh;
|
||||
min-height: 20em;
|
||||
height: 100000000px; /* enforce max height */
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
@import "properties";
|
||||
@import "mixin";
|
||||
|
||||
.query-create {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
|
@ -51,109 +54,303 @@
|
|||
}
|
||||
}
|
||||
|
||||
.query-management {
|
||||
height: 100%;
|
||||
.modal-body.modal-query-manage {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
flex-direction: row!important;
|
||||
justify-content: stretch;
|
||||
|
||||
.header, .footer {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
padding: 1em!important;
|
||||
|
||||
min-width: 25em!important; /* 23em to be exact */
|
||||
min-height: 20em!important;
|
||||
|
||||
width: 60em; /* recommend width */
|
||||
height: 50em;
|
||||
|
||||
@include user-select(none);
|
||||
|
||||
.container {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
min-width: 20em;
|
||||
min-height: 10em;
|
||||
|
||||
.header {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.buttons {
|
||||
flex-grow: 0;
|
||||
}
|
||||
|
||||
.search {
|
||||
margin-left: 5px;
|
||||
flex-grow: 1;
|
||||
|
||||
input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.query-list {
|
||||
margin-top: 5px;
|
||||
.left, .right {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
display: flex;
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.column {
|
||||
&.column-username {
|
||||
width: calc(50% - 75px)
|
||||
}
|
||||
|
||||
&.column-unique-id {
|
||||
width: calc(50% - 75px)
|
||||
}
|
||||
|
||||
&.column-bound-server {
|
||||
width: 150px;
|
||||
flex-grow: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.query-list-header {
|
||||
> .title {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
margin-bottom: .5em;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.column {
|
||||
border: 1px solid lightgray;
|
||||
text-align: center;
|
||||
a {
|
||||
font-weight: bold;
|
||||
color: #e0e0e0;
|
||||
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
font-size: 1.05em;
|
||||
min-width: 5em;
|
||||
|
||||
align-self: flex-end;
|
||||
line-height: normal;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
button {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 1;
|
||||
|
||||
height: 2em;
|
||||
font-size: .9em;
|
||||
|
||||
width: 10em;
|
||||
min-width: 5em;
|
||||
|
||||
align-self: center;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.query-list-entries-container {
|
||||
.left {
|
||||
margin-right: .4em;
|
||||
min-width: 10em;
|
||||
|
||||
.container-list {
|
||||
flex-grow: 1;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: start;
|
||||
overflow-y: auto;
|
||||
min-height: 250px;
|
||||
justify-content: stretch;
|
||||
|
||||
.entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
border-radius: 0.2em;
|
||||
border: 1px solid #1f2122;
|
||||
background-color: #28292b;
|
||||
|
||||
.column {
|
||||
margin-left: 2px;
|
||||
.container-entries {
|
||||
flex-shrink: 1;
|
||||
flex-grow: 1;
|
||||
|
||||
min-height: 5em;
|
||||
|
||||
position: relative;
|
||||
|
||||
overflow-x: hidden;
|
||||
overflow-y: auto;
|
||||
@include chat-scrollbar-vertical();
|
||||
|
||||
.container-empty, .container-error {
|
||||
position: absolute;
|
||||
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
text-align: center;
|
||||
font-size: 2em;
|
||||
|
||||
background-color: #28292b;
|
||||
color: hsla(0, 0%, 30%, 1);
|
||||
}
|
||||
|
||||
cursor: pointer;
|
||||
.container-error {
|
||||
color: #732626;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
background-color: blue;
|
||||
.entry {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-start;
|
||||
|
||||
flex-shrink: 1;
|
||||
min-width: 4em;
|
||||
|
||||
padding-left: .5em;
|
||||
padding-right: .5em;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
background-color: #2c2d2f;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
background-color: #1a1a1b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.scrollbar {
|
||||
.column-username {
|
||||
width: calc(50% - 75px + 30px)
|
||||
.container-search {
|
||||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
|
||||
padding: 0 .5em;
|
||||
|
||||
border-top: 1px solid #1f2122;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
button {
|
||||
flex-grow: 0;
|
||||
flex-shrink: 1;
|
||||
|
||||
height: 2em;
|
||||
min-width: 2em;
|
||||
|
||||
align-self: center;
|
||||
margin-top: .8em;
|
||||
|
||||
margin-right: .5em;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.column-unique-id {
|
||||
width: calc(50% - 75px + 30px)
|
||||
.form-group {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
min-width: 5em;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.footer {
|
||||
margin-top: 5px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
.right {
|
||||
min-width: 10em;
|
||||
margin-left: .4em;
|
||||
|
||||
.container-details {
|
||||
flex-grow: 1;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: stretch;
|
||||
|
||||
.detail {
|
||||
flex-shrink: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: flex-start;
|
||||
|
||||
margin-bottom: 1em;
|
||||
|
||||
.title, .title a {
|
||||
text-transform: uppercase;
|
||||
color: #557edc;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.value {
|
||||
@include user-select(text);
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
&.unique-id {
|
||||
.title {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-start;
|
||||
|
||||
.button {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
width: 1.2em;
|
||||
height: 1.2em;
|
||||
|
||||
align-self: center;
|
||||
margin-left: .25em;
|
||||
|
||||
cursor: pointer;
|
||||
border-radius: .2em;
|
||||
|
||||
&:hover {
|
||||
background: #28292b;
|
||||
}
|
||||
|
||||
margin-bottom: .2em; /* "text sub" */
|
||||
|
||||
> div {
|
||||
align-self: center;
|
||||
}
|
||||
|
||||
@include transition($button_hover_animation_time ease-in-out);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.spacer { flex-grow: 1; flex-shrink: 1; min-height: 0; }
|
||||
|
||||
.buttons {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
|
||||
button {
|
||||
flex-shrink: 1;
|
||||
min-width: 5em;
|
||||
|
||||
height: 2em;
|
||||
font-size: .9em;
|
||||
|
||||
width: 14em;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
&:not(:first-of-type) {
|
||||
margin-left: 1em;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.container-seperator {
|
||||
background: transparent;
|
||||
}
|
||||
}
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
flex-shrink: 1;
|
||||
flex-grow: 1;
|
||||
|
||||
min-width: 25em;
|
||||
min-width: 20em;
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
|
@ -152,6 +152,15 @@
|
|||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: flex-start;
|
||||
|
||||
a {
|
||||
flex-shrink: 1;
|
||||
min-width: 0;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -164,7 +173,7 @@
|
|||
.container-button {
|
||||
margin-right: 1em;
|
||||
|
||||
flex-shrink: 1;
|
||||
flex-shrink: 1e8;
|
||||
min-width: 5em;
|
||||
|
||||
display: flex;
|
||||
|
|
@ -185,6 +194,8 @@
|
|||
|
||||
.right {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
min-width: 10em;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,6 @@
|
|||
@import "properties";
|
||||
@import "mixin";
|
||||
|
||||
$color_list_border: #161616;
|
||||
$color_list_background: #28292b;
|
||||
$color_list_hover: #2c2d2f;
|
||||
$color_list_selected: #1a1a1b;
|
||||
|
||||
.modal-body.modal-settings {
|
||||
padding: 0!important;
|
||||
|
||||
|
|
@ -338,6 +333,9 @@ $color_list_selected: #1a1a1b;
|
|||
.header {
|
||||
height: 3em;
|
||||
|
||||
flex-grow: 0;
|
||||
flex-shrink: 0;
|
||||
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
|
@ -362,6 +360,9 @@ $color_list_selected: #1a1a1b;
|
|||
flex-shrink: 0;
|
||||
flex-grow: 0;
|
||||
|
||||
height: 2em;
|
||||
align-self: flex-end;
|
||||
|
||||
margin-left: 1em;
|
||||
min-width: 8em;
|
||||
}
|
||||
|
|
@ -466,6 +467,9 @@ $color_list_selected: #1a1a1b;
|
|||
.left {
|
||||
margin-right: 1em;
|
||||
|
||||
min-height: 0;
|
||||
max-height: 100%;
|
||||
|
||||
.body {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
|
|
|||
49
shared/css/static/modal-volume.scss
Normal file
49
shared/css/static/modal-volume.scss
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
@import "mixin";
|
||||
|
||||
.modal-body.modal-volume {
|
||||
@include user-select(none);
|
||||
|
||||
.info {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
.htmltag-client {
|
||||
color: #999!important;
|
||||
margin-left: .25em;
|
||||
}
|
||||
|
||||
div {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
}
|
||||
|
||||
.value {
|
||||
margin-left: .25em;
|
||||
}
|
||||
}
|
||||
|
||||
.container-slider {
|
||||
margin-top: 1em;
|
||||
}
|
||||
|
||||
.buttons {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: stretch;
|
||||
|
||||
margin-top: 2em;
|
||||
|
||||
.spacer {
|
||||
flex-grow: 1;
|
||||
flex-shrink: 1;
|
||||
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
button:not(:last-of-type) {
|
||||
margin-right: 1em;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -135,6 +135,9 @@
|
|||
max-width: 100%;
|
||||
min-width: 20em; /* may adjust if needed */
|
||||
|
||||
max-height: calc(100vh - 10em);
|
||||
min-height: 5em;
|
||||
|
||||
overflow-y: auto;
|
||||
overflow-x: auto;
|
||||
}
|
||||
|
|
@ -198,11 +201,12 @@
|
|||
flex-grow: 0;
|
||||
|
||||
&.modal-header-error {
|
||||
background-color: #ce0000;
|
||||
//background-color: #ce0000;
|
||||
background-color: hsla(0, 100%, 25%, 1);
|
||||
}
|
||||
|
||||
&.modal-header-info {
|
||||
background-color: #03a9f4;
|
||||
background-color: hsla(199, 98%, 20%, 1);
|
||||
}
|
||||
|
||||
&.modal-header-warning, &.modal-header-info, &.modal-header-error {
|
||||
|
|
@ -307,6 +311,10 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
.modal-body.modal-info, .modal-body.modal-error {
|
||||
justify-content: center;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -346,6 +354,12 @@
|
|||
|
||||
line-height: 1;
|
||||
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
|
||||
max-width: 100%;
|
||||
|
||||
&.bmd-label-floating {
|
||||
will-change: left, top, contents;
|
||||
color: #999999;
|
||||
|
|
|
|||
|
|
@ -7,4 +7,9 @@ $border_radius_small: .1em;
|
|||
$border_radius_middle: .15em;
|
||||
$border_radius_large: .2em;
|
||||
|
||||
$button_hover_animation_time: .25s
|
||||
$button_hover_animation_time: .25s;
|
||||
|
||||
$color_list_border: #161616;
|
||||
$color_list_background: #28292b;
|
||||
$color_list_hover: #2c2d2f;
|
||||
$color_list_selected: #1a1a1b;
|
||||
|
|
@ -8,6 +8,20 @@
|
|||
if(gethostname() == "WolverinDEV")
|
||||
$localhost = true;
|
||||
?>
|
||||
<?php
|
||||
if(!$localhost) {
|
||||
/* Web Testing stuff */
|
||||
define("_AUTH_API_ONLY", true);
|
||||
if(file_exists("./auth.php"))
|
||||
include "./auth.php";
|
||||
else if(file_exists("./auth/auth.php"))
|
||||
include "./auth/auth.php";
|
||||
else
|
||||
die("Missing auth handler");
|
||||
redirectOnInvalidSession();
|
||||
|
||||
}
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
|
|
@ -59,7 +73,7 @@
|
|||
<meta name="format-detection" content="telephone=no">
|
||||
|
||||
<!-- Global site tag (gtag.js) - Google Analytics -->
|
||||
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-113151733-4"></script>
|
||||
<script defer async src="https://www.googletagmanager.com/gtag/js?id=UA-113151733-4"></script>
|
||||
<script>
|
||||
window.dataLayer = window.dataLayer || [];
|
||||
|
||||
|
|
@ -121,32 +135,30 @@
|
|||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!-- No javascript error -->
|
||||
<noscript>
|
||||
<div class="fulloverlay no-js">
|
||||
<div class="container">
|
||||
<img src="img/script.svg" height="128px">
|
||||
<h1>Please enable JavaScript</h1>
|
||||
<h3>TeaSpeak web could not run without it!</h3>
|
||||
<h3>Its like you, without coffee</h3>
|
||||
</div>
|
||||
</div>
|
||||
</noscript>
|
||||
|
||||
<!-- loader setup -->
|
||||
<div id="style">
|
||||
<link rel="stylesheet" href="css/loader/loader.css">
|
||||
</div>
|
||||
|
||||
<meta name="app-loader-target" content="app">
|
||||
<div id="scripts">
|
||||
<script type="application/javascript" src="loader/loader_app.min.js" defer></script>
|
||||
<script type="application/javascript" src="loader/loader_app.js" defer></script>
|
||||
<script type="application/javascript" src="loader/loader.js?_<?php echo time() ?>" defer></script>
|
||||
<script type="application/javascript" src="loader/loader_app.min.js" async defer></script>
|
||||
<script type="application/javascript" src="loader/loader_app.js" async defer></script>
|
||||
<script type="application/javascript" src="loader/loader.js?_<?php echo time() ?>" async defer></script>
|
||||
</div>
|
||||
|
||||
<!-- No javascript error -->
|
||||
<div class="fulloverlay no-js">
|
||||
<div class="container">
|
||||
<img src="img/script.svg" height="128px">
|
||||
<h1>Please enable JavaScript</h1>
|
||||
<h3>TeaSpeak web could not run without it!</h3>
|
||||
<h3>Its like you, without coffee</h3>
|
||||
</div>
|
||||
</div>
|
||||
<script type="text/javascript" class="no-js">
|
||||
let elements = document.getElementsByClassName("no-js");
|
||||
while (elements.length > 0) //Removing these elements (even self)
|
||||
elements.item(0).remove();
|
||||
</script>
|
||||
|
||||
<!-- Loading screen -->
|
||||
<div class="loader" id="loader-overlay">
|
||||
<div class="half right"></div>
|
||||
|
|
@ -173,7 +185,8 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<?php if($localhost && true) { ?>
|
||||
<!-- debugging close -->
|
||||
<?php if($localhost && false) { ?>
|
||||
<div id="spoiler-style" style="z-index: 1000000; position: absolute; display: block; background: white; right: 5px; left: 5px; top: 34px;">
|
||||
<!-- <img src="https://www.chromatic-solutions.de/teaspeak/window/connect_opened.png"> -->
|
||||
<!-- <img src="http://puu.sh/DZDgO/9149c0a1aa.png"> -->
|
||||
|
|
@ -218,7 +231,8 @@
|
|||
<!-- <img src="http://puu.sh/E9jTe/b41f6386de.png"> -->
|
||||
<!-- <img src="img/style/ban-list.png"> -->
|
||||
<!-- <img src="http://puu.sh/E9jTe/b41f6386de.png"> -->
|
||||
<img src="https://puu.sh/EhuVH/1e21540589.png">
|
||||
<!-- <img src="https://puu.sh/EhuVH/1e21540589.png"> -->
|
||||
<img src="https://puu.sh/EhvkJ/7551f548e3.png">
|
||||
</div>
|
||||
<button class="toggle-spoiler-style" style="height: 30px; width: 100px; z-index: 100000000; position: absolute; bottom: 2px;">toggle style</button>
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -147,10 +147,12 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="divider"></div>
|
||||
-->
|
||||
<div class="divider"></div>
|
||||
|
||||
<div class="button button-subscribe-mode">
|
||||
<div class="icon_em" title="{{tr 'Toggle channel subscribe mode' /}}"></div>
|
||||
</div>
|
||||
-->
|
||||
|
||||
<!-- the query button -->
|
||||
<div class="button-dropdown btn_query" title="{{tr 'Show/hide server queries' /}}">
|
||||
|
|
@ -2538,9 +2540,27 @@
|
|||
</script>
|
||||
|
||||
<script class="jsrender-template" id="tmpl_change_volume" type="text/html">
|
||||
<div style="display: flex; justify-content: center; vertical-align: center">
|
||||
<input type="range" min="0" max="{{>max_volume}}" value="100" class="volume_slider" style="width: 100%">
|
||||
<div class="display_volume" style="width: 60px; align-self: center; text-align: center">±0 %
|
||||
<div> <!-- for the renderer -->
|
||||
<div class="info">
|
||||
<div>{{tr "Change volume for client "/}} <node key="client"></node> :</div>
|
||||
<a class="value">error: value</a>
|
||||
</div>
|
||||
<div class="container-slider">
|
||||
<div class="filler" style="width: 30%"></div>
|
||||
<div class="thumb container-tooltip" style="left: 30%">
|
||||
<div class="tooltip">
|
||||
<a>86%</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<button class="btn btn-blue button-reset">{{tr "Reset" /}}</button>
|
||||
<div class="spacer"></div>
|
||||
{{if !local}}
|
||||
<button class="btn btn-success button-apply">{{tr "Apply" /}}</button>
|
||||
{{/if}}
|
||||
<button class="btn btn-danger button-cancel">{{tr "Cancel" /}}</button>
|
||||
<button class="btn btn-success button-save">{{tr "Save" /}}</button>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
|
@ -3753,39 +3773,56 @@
|
|||
</div>
|
||||
</script>
|
||||
<script class="jsrender-template" id="tmpl_invite" type="text/html">
|
||||
<div class="modal-invite">
|
||||
<div class="general-properties">
|
||||
<div class="form-group property-type">
|
||||
<label>{{tr "Link type:" /}}</label>
|
||||
<select class="form-control">
|
||||
<option value="0">{{tr "TeaWeb" /}}</option>
|
||||
<option value="1" disabled>{{tr "TeaClient (Not supported yet)" /}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="switch flag-direct-connect">
|
||||
<label>
|
||||
<input type="checkbox">
|
||||
{{tr "Connect directly" /}}
|
||||
</label>
|
||||
</div>
|
||||
<div class="switch flag-resolved-address">
|
||||
<label>
|
||||
<input type="checkbox">
|
||||
{{tr "Use resolved address" /}}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="general-properties">
|
||||
<div class="form-group property-type">
|
||||
<label>{{tr "Link type:" /}}</label>
|
||||
<select class="form-control">
|
||||
<option value="tea-web">{{tr "TeaWeb" /}}</option>
|
||||
<option value="tea-client">{{tr "TeaClient" /}}</option>
|
||||
<option value="teamspeak">{{tr "TeamSpeak" /}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<textarea class="text-output" readonly></textarea>
|
||||
<div class="buttons">
|
||||
<button class="btn btn-primary button-copy">
|
||||
<div class="icon client-copy"></div>
|
||||
{{tr "Copy" /}}
|
||||
</button>
|
||||
<button class="btn btn-primary button-close">{{tr "Close" /}}</button>
|
||||
<label class="container-settings">
|
||||
<label>
|
||||
<div class="checkbox flag-direct-connect">
|
||||
<input type="checkbox">
|
||||
<div class="mark"></div>
|
||||
</div>
|
||||
|
||||
<a>{{tr "Connect directly" /}}</a>
|
||||
<!--
|
||||
<div class="help-tip tip-center tip-small">
|
||||
<p>
|
||||
{{tr "Lets the user directly connect to the server and not open the connect modal" /}}
|
||||
</p>
|
||||
</div>
|
||||
-->
|
||||
</label>
|
||||
<label>
|
||||
<div class="checkbox flag-resolved-address">
|
||||
<input type="checkbox">
|
||||
<div class="mark"></div>
|
||||
</div>
|
||||
|
||||
<a>{{tr "Use resolved address" /}}</a>
|
||||
<!--
|
||||
<div class="help-tip tip-center tip-small">
|
||||
<p>
|
||||
{{tr "Use the resolved server address (IP) instead of the given address" /}}
|
||||
</p>
|
||||
</div>
|
||||
-->
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<textarea class="text-output" readonly></textarea>
|
||||
<div class="buttons">
|
||||
<button class="btn btn-primary button-copy">
|
||||
<div class="icon client-copy"></div>
|
||||
{{tr "Copy" /}}
|
||||
</button>
|
||||
<button class="btn btn-primary button-close">{{tr "Close" /}}</button>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script class="jsrender-template" id="tmpl_query_create" type="text/html">
|
||||
|
|
@ -3828,51 +3865,65 @@
|
|||
</script>
|
||||
|
||||
<script class="jsrender-template" id="tmpl_query_manager" type="text/html">
|
||||
<div class="query-management">
|
||||
<div class="header">
|
||||
<div class="form-group bmd-form-group buttons">
|
||||
<button class="btn btn-success button button-query-create">{{tr "Create account" /}}</button>
|
||||
<button class="btn btn-danger button button-query-delete">{{tr "Delete account" /}}</button>
|
||||
<button class="btn btn-primary button button-query-rename">{{tr "Rename account" /}}</button>
|
||||
<button class="btn btn-primary button button-query-change-password">{{tr "Change password" /}}
|
||||
</button>
|
||||
<div class="container"> <!-- required for the seperator -->
|
||||
<div class="left">
|
||||
<div class="title">
|
||||
<a>{{tr "Account list" /}}</a>
|
||||
<button class="btn btn-success button-create">{{tr "Create account" /}}</button>
|
||||
</div>
|
||||
<div class="form-group search">
|
||||
<label class="bmd-label-floating">{{tr "search" /}}</label>
|
||||
<input class="form-control input input-search" type="text">
|
||||
</div>
|
||||
</div>
|
||||
<div class="query-list">
|
||||
<div class="query-list-header">
|
||||
<div class="column column-username">{{tr "Username" /}}</div>
|
||||
<div class="column column-unique-id">{{tr "Unique ID" /}}</div>
|
||||
<div class="column column-bound-server">{{tr "Bounded Server" /}}</div>
|
||||
</div>
|
||||
<div class="query-list-entries-container">
|
||||
<div class="query-list-entries">
|
||||
<div class="container-list">
|
||||
<div class="container-entries">
|
||||
<div class="container-empty">
|
||||
error: empty
|
||||
</div>
|
||||
<div class="container-error">
|
||||
error: query list
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-search">
|
||||
<button class="btn btn-blue button-update">{{tr "Refresh" /}}</button>
|
||||
<div class="form-group">
|
||||
<label class="bmd-label-floating">{{tr "Search for query" /}}</label>
|
||||
<input type="text" class="form-control filter-input">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="footer">
|
||||
<div class="info">
|
||||
<a>{{tr "loading..." /}}</a>
|
||||
<div class="container-seperator vertical" seperator-id="seperator-query-manage"></div>
|
||||
<div class="right">
|
||||
<div class="title">
|
||||
<a>{{tr "Account details" /}}</a>
|
||||
<button class="btn btn-danger button-delete">{{tr "Delete account" /}}</button>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<button class="btn btn-primary button-refresh">{{tr "Refresh" /}}</button>
|
||||
<div class="container-details">
|
||||
<div class="detail login-name">
|
||||
<a class="title">{{tr "Login name" /}}</a>
|
||||
<a class="value">error: login name</a>
|
||||
</div>
|
||||
<div class="detail unique-id">
|
||||
<div class="title">
|
||||
<a>{{tr "Unique ID" /}}</a>
|
||||
<div class="button button-copy">
|
||||
<div class="icon_em client-copy"></div>
|
||||
</div>
|
||||
</div>
|
||||
<a class="value">error: unique id</a>
|
||||
</div>
|
||||
<div class="detail bound-server">
|
||||
<a class="title">{{tr "Bound server ID" /}}</a>
|
||||
<a class="value">error: bound server</a>
|
||||
</div>
|
||||
|
||||
<div class="spacer"></div>
|
||||
<div class="buttons">
|
||||
<button class="btn btn-blue button-change-password">{{tr "Change password" /}}</button>
|
||||
<button class="btn btn-blue button-rename">{{tr "Rename Account" /}}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
|
||||
<script class="jsrender-template" id="tmpl_query_manager-list_entry" type="text/html">
|
||||
<div class="entry">
|
||||
<div class="column column-username">{{>username}}</div>
|
||||
<div class="column column-unique-id">{{>unique_id}}</div>
|
||||
<div class="column column-bound-server">{{>bounded_server}}</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script class="jsrender-template" id="tmpl_playlist_list" type="text/html">
|
||||
<div class="playlist-management">
|
||||
<div class="header">
|
||||
|
|
@ -4345,87 +4396,83 @@
|
|||
</script>
|
||||
|
||||
<script class="jsrender-template" id="tmpl_icon_select" type="text/html">
|
||||
<div class="modal-icon-select">
|
||||
<div class="container-icons">
|
||||
<div class="group_box">
|
||||
<div class="header">{{tr "Remote" /}}</div>
|
||||
<div class="content">
|
||||
<div class="container-icons-list">
|
||||
<div class="container-icons-remote {{if enable_select || enable_delete}}icon-select{{/if}}"></div>
|
||||
<div class="container-loading">
|
||||
<a>{{tr "loading..." /}}</a>
|
||||
</div>
|
||||
<div class="container-no-permissions">
|
||||
<a>{{tr "You dont have permissions the view the icons" /}}</a>
|
||||
</div>
|
||||
<div class="container-error">
|
||||
<a class="error-message">{{ŧr "An error occured" /}}</a>
|
||||
</div>
|
||||
<div class="container-icons">
|
||||
<div class="left">
|
||||
<div class="header">{{tr "Remote" /}}</div>
|
||||
<div class="content">
|
||||
<div class="container-icons-list">
|
||||
<div class="container-icons-remote {{if enable_select || enable_delete}}icon-select{{/if}}"></div>
|
||||
<div class="container-loading">
|
||||
<a>{{tr "loading..." /}}</a>
|
||||
</div>
|
||||
<div class="container-buttons">
|
||||
{{if enable_upload}}
|
||||
<button class="btn btn-success button-upload">{{tr "Upload" /}}</button>
|
||||
{{/if}}
|
||||
{{if enable_delete}}
|
||||
<button class="btn btn-danger button-delete">{{tr "Delete" /}}</button>
|
||||
{{/if}}
|
||||
<div class="container-no-permissions">
|
||||
<a>{{tr "You dont have permissions the view the icons" /}}</a>
|
||||
</div>
|
||||
<div class="container-error">
|
||||
<a class="error-message">{{ŧr "An error occurred" /}}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="group_box">
|
||||
<div class="header">{{tr "Local" /}}</div>
|
||||
<div class="content">
|
||||
<div class="container-icons-list">
|
||||
<div class="container-icons-local {{if enable_select}}icon-select{{/if}}"></div>
|
||||
</div>
|
||||
<div class="container-buttons">
|
||||
{{if enable_upload}}
|
||||
<button class="btn btn-success button-upload">{{tr "Upload" /}}</button>
|
||||
{{/if}}
|
||||
{{if enable_delete}}
|
||||
<button class="btn btn-danger button-delete">{{tr "Delete" /}}</button>
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-buttons">
|
||||
<button class="btn btn-primary btn-raised button-reload">{{tr "Reload" /}}</button>
|
||||
<div class="spacer"></div>
|
||||
{{if enable_select}}
|
||||
<button class="btn btn-success btn-raised button-select-no-icon">{{tr "Remove icon" /}}</button>
|
||||
<button class="btn btn-success btn-raised button-select"><a>{{tr "Select " /}}</a>
|
||||
<div class="selected-item-container"></div>
|
||||
</button>
|
||||
{{/if}}
|
||||
<div class="right">
|
||||
<div class="header">{{tr "Local" /}}</div>
|
||||
<div class="content">
|
||||
<div class="container-icons-list">
|
||||
<div class="container-icons-local {{if enable_select}}icon-select{{/if}}"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container-buttons">
|
||||
<button class="btn btn-primary btn-raised button-reload">{{tr "Reload" /}}</button>
|
||||
<div class="spacer"></div>
|
||||
{{if enable_select}}
|
||||
<button class="btn btn-success btn-raised button-select-no-icon">{{tr "Remove icon" /}}</button>
|
||||
<button class="btn btn-success btn-raised button-select"><a>{{tr "Select " /}}</a>
|
||||
<div class="selected-item-container"></div>
|
||||
</button>
|
||||
{{/if}}
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script class="jsrender-template" id="tmpl_icon_upload" type="text/html">
|
||||
<div class="modal-icon-upload">
|
||||
<div class="container-select">
|
||||
<div class="container-icons"></div>
|
||||
<div class="container-buttons">
|
||||
<div class="buttons-manage">
|
||||
<button class="btn btn-primary btn-raised button-add">{{tr "Add icon" /}}</button>
|
||||
<button class="btn btn-danger button-remove">{{tr "Remove selected" /}}</button>
|
||||
</div>
|
||||
<button class="btn btn-primary btn-raised button-upload"></button>
|
||||
<div class="container-select">
|
||||
<div class="container-icons"></div>
|
||||
<div class="container-buttons">
|
||||
<div class="buttons-manage">
|
||||
<button class="btn btn-primary btn-raised button-add">{{tr "Add icon" /}}</button>
|
||||
<button class="btn btn-danger button-remove">{{tr "Remove selected" /}}</button>
|
||||
</div>
|
||||
<button class="btn btn-primary btn-raised button-upload"></button>
|
||||
|
||||
<input type="file" class="input-file-upload" multiple/>
|
||||
</div>
|
||||
<input type="file" class="input-file-upload" accept="image/*" multiple/>
|
||||
</div>
|
||||
<div class="container-upload">
|
||||
<div class="container-error alert alert-danger">
|
||||
<div class="error-message">You're not connected. Failed to upload icons</div>
|
||||
<button type="button" class="btn btn-danger btn-raised button-upload-abort">{{tr "abort" /}}
|
||||
</button>
|
||||
</div>
|
||||
<div class="container-process"></div>
|
||||
<div class="container-info">
|
||||
<div class="container-info-uploaded">{{tr "Uploaded icons (total | successfully | error): "
|
||||
/}}
|
||||
</div>
|
||||
<div class="uploaded-statistics"></div>
|
||||
</div>
|
||||
<div class="container-success alert alert-success">
|
||||
<div class="message">Uploaded 10 icons successfully</div>
|
||||
<button type="button" class="btn btn-success btn-raised button-upload-abort">{{tr "okey" /}}
|
||||
</button>
|
||||
</div>
|
||||
<div class="container-upload">
|
||||
<div class="container-error">
|
||||
<div class="error-message">You're not connected. Failed to upload icons</div>
|
||||
<button type="button" class="btn btn-danger btn-raised button-upload-abort">{{tr "abort" /}}
|
||||
</button>
|
||||
</div>
|
||||
<div class="container-process"></div>
|
||||
<div class="container-info">
|
||||
<div class="container-info-uploaded">{{tr "Uploaded icons (total | successfully | error): "
|
||||
/}}
|
||||
</div>
|
||||
<div class="uploaded-statistics"></div>
|
||||
</div>
|
||||
<div class="container-success">
|
||||
<div class="message">Uploaded 10 icons successfully</div>
|
||||
<button type="button" class="btn btn-success btn-raised button-upload-abort">{{tr "okey" /}}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
|
@ -4573,18 +4620,19 @@
|
|||
{{/if}}
|
||||
<h2>{{tr "Special thanks" /}}</h2>
|
||||
<p>
|
||||
"Яedeemer" (Janni K.)
|
||||
"Яedeemer" (Janni K.)<br>
|
||||
Chromatic-Solutions (Sofian) for the lovely dark design
|
||||
</p>
|
||||
<h2>{{tr "Contact" /}}</h2>
|
||||
<p>
|
||||
{{tr "E-Mail:" /}} {{if client}}client{{else}}web{{/if}}@teaspeak.de<br>
|
||||
{{tr "WWW:" /}} <a href="https://teaspeak.de">https://teaspeak.de</a><br>
|
||||
{{tr "Community:" /}} <a href="https://teaspeak.de">https://forum.teaspeak.de</a>
|
||||
{{tr "E-Mail:" /}} <a href="mailto:{{if client}}client{{else}}web{{/if}}.support@teaspeak.de">{{if client}}client{{else}}web{{/if}}.support@teaspeak.de</a><br>
|
||||
{{tr "WWW:" /}} <a href="https://teaspeak.de" target="_blank">https://teaspeak.de</a><br>
|
||||
{{tr "Community:" /}} <a href="https://teaspeak.de" target="_blank">https://forum.teaspeak.de</a>
|
||||
</p>
|
||||
<h2>{{tr "License" /}}</h2>
|
||||
<p>
|
||||
The {{if client}}TeaClient{{else}}TeaWeb{{/if}} application is licensed by MPL-2.0<br>
|
||||
More information here: https://github.com/TeaSpeak/TeaWeb/blob/master/LICENSE.TXT
|
||||
More information here: <a href="https://github.com/TeaSpeak/TeaWeb/blob/master/LICENSE.TXT" target="_blank">https://github.com/TeaSpeak/TeaWeb/blob/master/LICENSE.TXT</a>
|
||||
</p>
|
||||
</div>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -615,7 +615,7 @@ class ConnectionHandler {
|
|||
targetChannel = targetChannel || this.getClient().currentChannel();
|
||||
|
||||
const vconnection = this.serverConnection.voice_connection();
|
||||
const basic_voice_support = this.serverConnection.support_voice() && vconnection.connected();
|
||||
const basic_voice_support = this.serverConnection.support_voice() && vconnection.connected() && targetChannel;
|
||||
const support_record = basic_voice_support && (!targetChannel || vconnection.encoding_supported(targetChannel.properties.channel_codec));
|
||||
const support_playback = basic_voice_support && (!targetChannel || vconnection.decoding_supported(targetChannel.properties.channel_codec));
|
||||
|
||||
|
|
|
|||
|
|
@ -236,7 +236,9 @@ namespace bookmarks {
|
|||
export function add_current_server() {
|
||||
const ch = server_connections.active_connection_handler();
|
||||
if(ch && ch.connected) {
|
||||
createInputModal(tr("Enter bookmarks name"), tr("Please enter the bookmarks name:<br>"), text => true, result => {
|
||||
const ce = ch.getClient();
|
||||
const name = ce ? ce.clientNickName() : undefined;
|
||||
createInputModal(tr("Enter bookmarks name"), tr("Please enter the bookmarks name:<br>"), text => text.length > 0, result => {
|
||||
if(result) {
|
||||
const bookmark = create_bookmark(result as string, bookmarks(), {
|
||||
server_port: ch.serverConnection.remote_address().port,
|
||||
|
|
@ -244,11 +246,13 @@ namespace bookmarks {
|
|||
|
||||
server_password: "",
|
||||
server_password_hash: ""
|
||||
}, this.connection_handler.getClient().clientNickName());
|
||||
}, name);
|
||||
save_bookmark(bookmark);
|
||||
|
||||
control_bar.update_bookmarks();
|
||||
top_menu.rebuild_bookmarks();
|
||||
|
||||
createInfoModal(tr("Server added"), tr("Server has been successfully added to your bookmarks.")).open();
|
||||
}
|
||||
}).open();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ namespace connection {
|
|||
|
||||
for(const entry of json) {
|
||||
const rentry = {} as QueryListEntry;
|
||||
rentry.bounded_server = entry["client_bounded_server"];
|
||||
rentry.bounded_server = parseInt(entry["client_bound_server"]);
|
||||
rentry.username = entry["client_login_name"];
|
||||
rentry.unique_id = entry["client_unique_identifier"];
|
||||
|
||||
|
|
|
|||
|
|
@ -295,6 +295,17 @@ class Settings extends StaticSettings {
|
|||
key: "font_size"
|
||||
};
|
||||
|
||||
static readonly KEY_LAST_INVITE_LINK_TYPE: SettingsKey<string> = {
|
||||
key: "last_invite_link_type",
|
||||
default_value: "tea-web"
|
||||
};
|
||||
|
||||
static readonly FN_INVITE_LINK_SETTING: (name: string) => SettingsKey<string> = name => {
|
||||
return {
|
||||
key: 'invite_link_setting_' + name
|
||||
}
|
||||
};
|
||||
|
||||
static readonly FN_SERVER_CHANNEL_SUBSCRIBE_MODE: (channel_id: number) => SettingsKey<number> = channel => {
|
||||
return {
|
||||
key: 'channel_subscribe_mode_' + channel
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ class ClientEntry {
|
|||
this._tag = undefined;
|
||||
}
|
||||
if(this._audio_handle) {
|
||||
console.warn(tr("Destroying client with an active audio handle. This could cause memory leaks!"));
|
||||
log.warn(LogCategory.AUDIO, tr("Destroying client with an active audio handle. This could cause memory leaks!"));
|
||||
this._audio_handle.abort_replay();
|
||||
this._audio_handle.callback_playback = undefined;
|
||||
this._audio_handle.callback_stopped = undefined;
|
||||
|
|
@ -235,7 +235,7 @@ class ClientEntry {
|
|||
}
|
||||
}
|
||||
|
||||
protected initializeListener(){
|
||||
protected initializeListener() {
|
||||
if(this._listener_initialized) return;
|
||||
this._listener_initialized = true;
|
||||
|
||||
|
|
@ -609,7 +609,7 @@ class ClientEntry {
|
|||
icon_class: "client-volume",
|
||||
name: tr("Change Volume"),
|
||||
callback: () => {
|
||||
Modals.spawnChangeVolume(this._audio_volume, volume => {
|
||||
Modals.spawnChangeVolume(this, true, this._audio_volume, undefined, volume => {
|
||||
this._audio_volume = volume;
|
||||
this.channelTree.client.settings.changeServer("volume_client_" + this.clientUid(), volume);
|
||||
if(this._audio_handle)
|
||||
|
|
@ -1140,12 +1140,14 @@ class LocalClientEntry extends ClientEntry {
|
|||
}
|
||||
|
||||
initializeListener(): void {
|
||||
if(this._listener_initialized)
|
||||
this.tag.off();
|
||||
this._listener_initialized = false; /* could there be a better system */
|
||||
super.initializeListener();
|
||||
this.tag.find(".client-name").addClass("client-name-own");
|
||||
|
||||
this.tag.dblclick(() => {
|
||||
if($.isArray(this.channelTree.currently_selected)) { //Multiselect
|
||||
this.tag.on('dblclick', () => {
|
||||
if(Array.isArray(this.channelTree.currently_selected)) { //Multiselect
|
||||
return;
|
||||
}
|
||||
this.openRename();
|
||||
|
|
@ -1153,8 +1155,6 @@ class LocalClientEntry extends ClientEntry {
|
|||
}
|
||||
|
||||
openRename() : void {
|
||||
const _self = this;
|
||||
|
||||
this.channelTree.client_mover.enabled = false;
|
||||
|
||||
const elm = this.tag.find(".client-name");
|
||||
|
|
@ -1162,30 +1162,30 @@ class LocalClientEntry extends ClientEntry {
|
|||
elm.removeClass("client-name-own");
|
||||
elm.css("background-color", "white");
|
||||
elm.focus();
|
||||
_self.renaming = true;
|
||||
this.renaming = true;
|
||||
|
||||
elm.keypress(function (e) {
|
||||
if(e.keyCode == KeyCode.KEY_RETURN) {
|
||||
$(this).trigger("focusout");
|
||||
elm.on('keypress', event => {
|
||||
if(event.keyCode == KeyCode.KEY_RETURN) {
|
||||
$(event.target).trigger("focusout");
|
||||
return false;
|
||||
}
|
||||
});
|
||||
|
||||
elm.focusout(e => {
|
||||
elm.on('focusout', event => {
|
||||
this.channelTree.client_mover.enabled = true;
|
||||
|
||||
if(!_self.renaming) return;
|
||||
_self.renaming = false;
|
||||
if(!this.renaming) return;
|
||||
this.renaming = false;
|
||||
|
||||
elm.css("background-color", "");
|
||||
elm.removeAttr("contenteditable");
|
||||
elm.addClass("client-name-own");
|
||||
let text = elm.text().toString();
|
||||
if(_self.clientNickName() == text) return;
|
||||
if(this.clientNickName() == text) return;
|
||||
|
||||
elm.text(_self.clientNickName());
|
||||
const old_name = _self.clientNickName();
|
||||
_self.handle.serverConnection.command_helper.updateClient("client_nickname", text).then((e) => {
|
||||
elm.text(this.clientNickName());
|
||||
const old_name = this.clientNickName();
|
||||
this.handle.serverConnection.command_helper.updateClient("client_nickname", text).then((e) => {
|
||||
settings.changeGlobal(Settings.KEY_CONNECT_USERNAME, text);
|
||||
this.channelTree.client.log.log(log.server.Type.CLIENT_NICKNAME_CHANGED, {
|
||||
client: this.log_data(),
|
||||
|
|
@ -1197,7 +1197,7 @@ class LocalClientEntry extends ClientEntry {
|
|||
this.channelTree.client.log.log(log.server.Type.CLIENT_NICKNAME_CHANGE_FAILED, {
|
||||
reason: e.extra_message
|
||||
});
|
||||
_self.openRename();
|
||||
this.openRename();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
@ -1257,7 +1257,9 @@ class MusicClientEntry extends ClientEntry {
|
|||
let trigger_close = true;
|
||||
contextmenu.spawn_context_menu(x, y,
|
||||
...this.contextmenu_info(), {
|
||||
name: tr("<b>Change bot name</b>"),
|
||||
name: (contextmenu.get_provider().html_format_enabled() ? "<b>" : "") +
|
||||
tr("Change bot name") +
|
||||
(contextmenu.get_provider().html_format_enabled() ? "</b>" : ""),
|
||||
icon_class: "client-change_nickname",
|
||||
disabled: false,
|
||||
callback: () => {
|
||||
|
|
@ -1269,7 +1271,7 @@ class MusicClientEntry extends ClientEntry {
|
|||
});
|
||||
|
||||
}
|
||||
}, { width: 400, maxLength: 255 }).open();
|
||||
}, { width: "40em", min_width: "10em", maxLength: 255 }).open();
|
||||
},
|
||||
type: contextmenu.MenuEntryType.ENTRY
|
||||
}, {
|
||||
|
|
@ -1285,7 +1287,7 @@ class MusicClientEntry extends ClientEntry {
|
|||
});
|
||||
|
||||
}
|
||||
}, { width: 400, maxLength: 255 }).open();
|
||||
}, { width: "60em", min_width: "10em", maxLength: 255 }).open();
|
||||
},
|
||||
type: contextmenu.MenuEntryType.ENTRY
|
||||
},
|
||||
|
|
@ -1375,7 +1377,7 @@ class MusicClientEntry extends ClientEntry {
|
|||
icon_class: "client-volume",
|
||||
name: tr("Change local volume"),
|
||||
callback: () => {
|
||||
Modals.spawnChangeVolume(this._audio_handle.get_volume(), volume => {
|
||||
Modals.spawnChangeVolume(this, true, this._audio_handle.get_volume(), undefined, volume => {
|
||||
this.channelTree.client.settings.changeServer("volume_client_" + this.clientUid(), volume);
|
||||
this._audio_handle.set_volume(volume);
|
||||
});
|
||||
|
|
@ -1390,7 +1392,7 @@ class MusicClientEntry extends ClientEntry {
|
|||
if(max_volume < 0)
|
||||
max_volume = 100;
|
||||
|
||||
Modals.spawnChangeRemoteVolume(this.properties.player_volume, max_volume / 100, value => {
|
||||
Modals.spawnChangeVolume(this, false, this.properties.player_volume, max_volume / 100, value => {
|
||||
if(typeof(value) !== "number")
|
||||
return;
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ class ModalProperties {
|
|||
} else this.closeListener = listener;
|
||||
return this;
|
||||
}
|
||||
width: number | string = "60%";
|
||||
width: number | string;
|
||||
min_width?: number | string;
|
||||
height: number | string = "auto";
|
||||
|
||||
|
|
@ -147,9 +147,13 @@ class Modal {
|
|||
Object.assign(properties, this.properties.template_properties);
|
||||
|
||||
const tag = template.renderTag(properties);
|
||||
if(typeof(this.properties.width) !== "undefined")
|
||||
if(typeof(this.properties.width) !== "undefined" && typeof(this.properties.min_width) !== "undefined")
|
||||
tag.find(".modal-content")
|
||||
.css("min-width", this.properties.min_width)
|
||||
.css("width", this.properties.width);
|
||||
else if(typeof(this.properties.width) !== "undefined") //Legacy support
|
||||
tag.find(".modal-content").css("min-width", this.properties.width);
|
||||
if(typeof(this.properties.min_width) !== "undefined")
|
||||
else if(typeof(this.properties.min_width) !== "undefined")
|
||||
tag.find(".modal-content").css("min-width", this.properties.min_width);
|
||||
|
||||
this.close_elements = tag.find(".button-modal-close");
|
||||
|
|
@ -292,7 +296,10 @@ function createErrorModal(header: BodyCreator, message: BodyCreator, props: Moda
|
|||
|
||||
props.header = header;
|
||||
props.body = message;
|
||||
return createModal(props);
|
||||
|
||||
const modal = createModal(props);
|
||||
modal.htmlTag.find(".modal-body").addClass("modal-error");
|
||||
return modal;
|
||||
}
|
||||
|
||||
function createInfoModal(header: BodyCreator, message: BodyCreator, props: ModalProperties | any = { footer: undefined }) {
|
||||
|
|
@ -302,7 +309,9 @@ function createInfoModal(header: BodyCreator, message: BodyCreator, props: Modal
|
|||
props.header = header;
|
||||
props.body = message;
|
||||
|
||||
return createModal(props);
|
||||
const modal = createModal(props);
|
||||
modal.htmlTag.find(".modal-body").addClass("modal-info");
|
||||
return modal;
|
||||
}
|
||||
|
||||
/* extend jquery */
|
||||
|
|
|
|||
|
|
@ -467,8 +467,8 @@ namespace top_menu {
|
|||
item.click(() => {
|
||||
const scon = server_connections.active_connection_handler();
|
||||
if(scon && scon.connected) {
|
||||
if(scon.permissions.neededPermission(PermissionType.B_CLIENT_CREATE_MODIFY_SERVERQUERY_LOGIN).granted(1)) {
|
||||
Modals.spawnQueryManage(scon);
|
||||
if(scon.permissions.neededPermission(PermissionType.B_CLIENT_CREATE_MODIFY_SERVERQUERY_LOGIN).granted(1) || scon.permissions.neededPermission(PermissionType.B_CLIENT_QUERY_CREATE).granted(1)) {
|
||||
Modals.spawnQueryCreate(scon);
|
||||
} else {
|
||||
createErrorModal(tr("You dont have the permission"), tr("You dont have the permission to create a server query login")).open();
|
||||
scon.sound.play(Sound.ERROR_INSUFFICIENT_PERMISSIONS);
|
||||
|
|
|
|||
|
|
@ -2430,8 +2430,7 @@ test
|
|||
else
|
||||
this.handle.handle.fileManager.avatars.generate_chat_tag(undefined, undefined).appendTo(container_avatar);
|
||||
|
||||
const container_avatar_edit = this._html_tag.find(".container-avatar-edit");
|
||||
container_avatar_edit.toggle(client instanceof LocalClientEntry);
|
||||
container_avatar.toggleClass("editable", client instanceof LocalClientEntry);
|
||||
}
|
||||
/* updating the info fields */
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
/// <reference path="../../ConnectionHandler.ts" />
|
||||
/// <reference path="../../ui/elements/modal.ts" />
|
||||
/// <reference path="../../i18n/localize.ts" />
|
||||
/// <reference path="../../proto.ts" />
|
||||
|
||||
namespace Modals {
|
||||
export function openBanList(client: ConnectionHandler) {
|
||||
let modal: Modal;
|
||||
|
|
@ -413,7 +418,11 @@ namespace Modals {
|
|||
return false;
|
||||
}
|
||||
|
||||
tag.show().toggleClass("highlight", highlight_own);
|
||||
tag.show().toggleClass(
|
||||
"highlight",
|
||||
highlight_own &&
|
||||
entry.flag_own
|
||||
);
|
||||
return true;
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -3,145 +3,75 @@
|
|||
/// <reference path="../../proto.ts" />
|
||||
|
||||
namespace Modals {
|
||||
export function spawnChangeVolume(current: number, callback: (number) => void) {
|
||||
let updateCallback: (number) => void;
|
||||
const connectModal = createModal({
|
||||
header: function() {
|
||||
let header = $.spawn("div");
|
||||
header.text(tr("Change volume"));
|
||||
return header;
|
||||
},
|
||||
//TODO: Use the max limit!
|
||||
|
||||
let modal: Modal;
|
||||
export function spawnChangeVolume(client: ClientEntry, local: boolean, current: number, max: number | undefined, callback: (number) => void) {
|
||||
if(modal) modal.close();
|
||||
|
||||
let new_value: number;
|
||||
modal = createModal({
|
||||
header: local ? tr("Change local volume") : tr("Change remote volume"),
|
||||
body: function () {
|
||||
let tag = $("#tmpl_change_volume").renderTag({
|
||||
max_volume: 200
|
||||
client: htmltags.generate_client_object({
|
||||
add_braces: false,
|
||||
client_name: client.clientNickName(),
|
||||
client_unique_id: client.properties.client_unique_identifier,
|
||||
client_id: client.clientId()
|
||||
}),
|
||||
local: local
|
||||
});
|
||||
tag.find(".volume_slider").on("change",_ => updateCallback(tag.find(".volume_slider").val()));
|
||||
tag.find(".volume_slider").on("input",_ => updateCallback(tag.find(".volume_slider").val()));
|
||||
//connect_address
|
||||
return tag;
|
||||
},
|
||||
footer: function () {
|
||||
let tag = $.spawn("div");
|
||||
tag.css("text-align", "right");
|
||||
tag.css("margin-top", "3px");
|
||||
tag.css("margin-bottom", "6px");
|
||||
tag.addClass("modal-button-group");
|
||||
|
||||
|
||||
let buttonReset = $.spawn("button");
|
||||
buttonReset.text(tr("Reset"));
|
||||
buttonReset.on("click", function () {
|
||||
updateCallback(100);
|
||||
});
|
||||
tag.append(buttonReset);
|
||||
|
||||
|
||||
let buttonCancel = $.spawn("button");
|
||||
buttonCancel.text(tr("Cancel"));
|
||||
buttonCancel.on("click", function () {
|
||||
updateCallback(current * 100);
|
||||
connectModal.close();
|
||||
});
|
||||
tag.append(buttonCancel);
|
||||
|
||||
|
||||
let buttonOk = $.spawn("button");
|
||||
buttonOk.text(tr("OK"));
|
||||
buttonOk.on("click", function () {
|
||||
connectModal.close();
|
||||
});
|
||||
tag.append(buttonOk);
|
||||
return tag;
|
||||
|
||||
const container_value = tag.find(".info .value");
|
||||
const set_value = value => {
|
||||
const number = value > 100 ? value - 100 : 100 - value;
|
||||
container_value.html((value == 100 ? "±" : value > 100 ? "+" : "-") + number + "%");
|
||||
|
||||
new_value = value / 100;
|
||||
if(local) callback(new_value);
|
||||
};
|
||||
set_value(current * 100);
|
||||
|
||||
const slider_tag = tag.find(".container-slider");
|
||||
const slider = sliderfy(slider_tag, {
|
||||
initial_value: current * 100,
|
||||
step: 1,
|
||||
max_value: 200,
|
||||
min_value: 0,
|
||||
|
||||
unit: '%'
|
||||
});
|
||||
slider_tag.on('change', event => set_value(parseInt(slider_tag.attr("value"))));
|
||||
|
||||
tag.find(".button-save").on('click', event => {
|
||||
if(typeof(new_value) !== "undefined") callback(new_value);
|
||||
modal.close();
|
||||
});
|
||||
|
||||
tag.find(".button-cancel").on('click', event => {
|
||||
callback(current);
|
||||
modal.close();
|
||||
});
|
||||
|
||||
tag.find(".button-reset").on('click', event => {
|
||||
slider.value(100);
|
||||
});
|
||||
|
||||
tag.find(".button-apply").on('click', event => {
|
||||
callback(new_value);
|
||||
new_value = undefined;
|
||||
});
|
||||
|
||||
return tag.children();
|
||||
},
|
||||
footer: null,
|
||||
|
||||
width: 600
|
||||
});
|
||||
updateCallback = value => {
|
||||
connectModal.htmlTag.find(".volume_slider").val(value);
|
||||
let display = connectModal.htmlTag.find(".display_volume");
|
||||
let number = (value - 100);
|
||||
display.html((number == 0 ? "±" : number > 0 ? "+" : "") + number + " %");
|
||||
callback(value / 100);
|
||||
};
|
||||
connectModal.open();
|
||||
updateCallback(current * 100);
|
||||
}
|
||||
|
||||
/* Units are between 0 and 1 */
|
||||
export function spawnChangeRemoteVolume(current: number, max_value: number, callback: (value: number) => void) {
|
||||
let update_volume: (number) => void;
|
||||
let current_value = current; /* between 0 and 100! */
|
||||
|
||||
const modal = createModal({
|
||||
header: function() {
|
||||
let header = $.spawn("div");
|
||||
header.text(tr("Change volume"));
|
||||
return header;
|
||||
},
|
||||
body: function () {
|
||||
let tag = $("#tmpl_change_volume").renderTag({
|
||||
max_volume: Math.ceil(max_value * 100)
|
||||
});
|
||||
tag.find(".volume_slider").on("change",_ => update_volume(tag.find(".volume_slider").val()));
|
||||
tag.find(".volume_slider").on("input",_ => update_volume(tag.find(".volume_slider").val()));
|
||||
//connect_address
|
||||
return tag;
|
||||
},
|
||||
footer: function () {
|
||||
let tag = $.spawn("div");
|
||||
tag.css("text-align", "right");
|
||||
tag.css("margin-top", "3px");
|
||||
tag.css("margin-bottom", "6px");
|
||||
tag.addClass("modal-button-group");
|
||||
|
||||
{
|
||||
let button_apply = $.spawn("button");
|
||||
button_apply.text(tr("Apply"));
|
||||
button_apply.on("click", () => {
|
||||
callback(current_value / 100);
|
||||
});
|
||||
tag.append(button_apply);
|
||||
}
|
||||
|
||||
{
|
||||
let button_reset = $.spawn("button");
|
||||
button_reset.text(tr("Reset"));
|
||||
button_reset.on("click", () => update_volume(max_value * 100));
|
||||
tag.append(button_reset);
|
||||
}
|
||||
|
||||
|
||||
{
|
||||
let button_cancel = $.spawn("button");
|
||||
button_cancel.text(tr("Cancel"));
|
||||
button_cancel.on("click", () => modal.close());
|
||||
tag.append(button_cancel);
|
||||
}
|
||||
|
||||
|
||||
{
|
||||
let button_ok = $.spawn("button");
|
||||
button_ok.text(tr("OK"));
|
||||
button_ok.on("click", () => {
|
||||
callback(current_value / 100);
|
||||
modal.close();
|
||||
});
|
||||
tag.append(button_ok);
|
||||
}
|
||||
return tag;
|
||||
},
|
||||
|
||||
width: 600
|
||||
});
|
||||
update_volume = value => {
|
||||
modal.htmlTag.find(".volume_slider").val(value);
|
||||
|
||||
const tag_display = modal.htmlTag.find(".display_volume");
|
||||
tag_display.html(value + " %");
|
||||
current_value = value;
|
||||
};
|
||||
|
||||
modal.close_listener.push(() => modal = undefined);
|
||||
modal.open();
|
||||
update_volume(current * 100);
|
||||
modal.htmlTag.find(".modal-body").addClass("modal-volume");
|
||||
}
|
||||
}
|
||||
|
|
@ -11,17 +11,19 @@ namespace Modals {
|
|||
header: tr("Icons"),
|
||||
footer: undefined,
|
||||
body: () => {
|
||||
const template = $("#tmpl_icon_select").renderTag({
|
||||
return $("#tmpl_icon_select").renderTag({
|
||||
enable_select: !!callback_icon,
|
||||
|
||||
enable_upload: allow_manage,
|
||||
enable_delete: allow_manage
|
||||
});
|
||||
},
|
||||
|
||||
return template;
|
||||
}
|
||||
min_width: "20em"
|
||||
});
|
||||
|
||||
modal.htmlTag.find(".modal-body").addClass("modal-icon-select");
|
||||
|
||||
const button_select = modal.htmlTag.find(".button-select");
|
||||
const button_delete = modal.htmlTag.find(".button-delete").prop("disabled", true);
|
||||
const button_upload = modal.htmlTag.find(".button-upload").prop("disabled", !allow_manage);
|
||||
|
|
@ -29,11 +31,15 @@ namespace Modals {
|
|||
const container_loading = modal.htmlTag.find(".container-loading").hide();
|
||||
const container_no_permissions = modal.htmlTag.find(".container-no-permissions").hide();
|
||||
const container_error = modal.htmlTag.find(".container-error").hide();
|
||||
|
||||
const selected_container = modal.htmlTag.find(".selected-item-container");
|
||||
|
||||
const container_icons = modal.htmlTag.find(".container-icons");
|
||||
const container_icons_remote = container_icons.find(".container-icons-remote");
|
||||
const container_icons_local = container_icons.find(".container-icons-local");
|
||||
|
||||
const update_local_icons = (icons: number[]) => {
|
||||
const container_icons = modal.htmlTag.find(".container-icons .container-icons-local");
|
||||
container_icons.empty();
|
||||
container_icons_local.empty();
|
||||
|
||||
for(const icon_id of icons) {
|
||||
const tag = client.fileManager.icons.generateTag(icon_id, {animate: false}).attr('title', "Icon " + icon_id);
|
||||
|
|
@ -53,7 +59,7 @@ namespace Modals {
|
|||
if(icon_id == selected_icon)
|
||||
tag.trigger('click');
|
||||
}
|
||||
tag.appendTo(container_icons);
|
||||
tag.appendTo(container_icons_local);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -71,8 +77,6 @@ namespace Modals {
|
|||
};
|
||||
|
||||
client.fileManager.requestFileList("/icons").then(icons => {
|
||||
const container_icons = modal.htmlTag.find(".container-icons");
|
||||
const container_icons_remote = container_icons.find(".container-icons-remote");
|
||||
const container_icons_remote_parent = container_icons_remote.parent();
|
||||
container_icons_remote.detach().empty();
|
||||
|
||||
|
|
@ -90,7 +94,7 @@ namespace Modals {
|
|||
|
||||
for(const icon of chunk) {
|
||||
const icon_id = parseInt(icon.name.substr("icon_".length));
|
||||
if(icon_id == NaN) {
|
||||
if(Number.isNaN(icon_id)) {
|
||||
log.warn(LogCategory.GENERAL, tr("Received an unparsable icon within icon list (%o)"), icon);
|
||||
continue;
|
||||
}
|
||||
|
|
@ -270,13 +274,13 @@ namespace Modals {
|
|||
} catch(error) {
|
||||
console.log("Image failed to load (%o)", error);
|
||||
console.error(tr("Failed to load file %s: Image failed to load"), file.name);
|
||||
createErrorModal(tr("Icon upload failed"), tra("Failed to upload icon {}.<br>Failed to load image", file.name)).open();
|
||||
createErrorModal(tr("Icon upload failed"), tra("Failed to upload icon {}.{:br:}Failed to load image", file.name)).open();
|
||||
icon.state = "error";
|
||||
}
|
||||
|
||||
const width_error = message => {
|
||||
console.error(tr("Failed to load file %s: Invalid bounds: %s"), file.name, message);
|
||||
createErrorModal(tr("Icon upload failed"), tra("Failed to upload icon {}.<br>Image is too large ({})", file.name, message)).open();
|
||||
createErrorModal(tr("Icon upload failed"), tra("Failed to upload icon {}.{:br:}Image is too large ({})", file.name, message)).open();
|
||||
icon.state = "error";
|
||||
};
|
||||
|
||||
|
|
@ -376,6 +380,9 @@ namespace Modals {
|
|||
|
||||
let upload_key: transfer.UploadKey;
|
||||
try {
|
||||
await new Promise(resolve => setTimeout(resolve, 1000));
|
||||
throw "test error";;
|
||||
|
||||
upload_key = await client.fileManager.upload_file({
|
||||
channel: undefined,
|
||||
channel_password: undefined,
|
||||
|
|
@ -431,12 +438,12 @@ namespace Modals {
|
|||
const modal = createModal({
|
||||
header: tr("Upload Icons"),
|
||||
footer: undefined,
|
||||
body: () => {
|
||||
const template = $("#tmpl_icon_upload").renderTag();
|
||||
return template;
|
||||
},
|
||||
closeable: false
|
||||
body: () => $("#tmpl_icon_upload").renderTag(),
|
||||
closeable: false,
|
||||
|
||||
min_width: "20em"
|
||||
});
|
||||
modal.htmlTag.find(".modal-body").addClass("modal-icon-upload");
|
||||
|
||||
const button_upload = modal.htmlTag.find(".button-upload");
|
||||
const button_delete = modal.htmlTag.find(".button-remove").prop("disabled", true);
|
||||
|
|
@ -548,7 +555,7 @@ namespace Modals {
|
|||
|
||||
const show_critical_error = message => {
|
||||
container_error.find(".error-message").text(message);
|
||||
container_error.show();
|
||||
container_error.removeClass("hidden");
|
||||
};
|
||||
|
||||
const finish_upload = () => {
|
||||
|
|
@ -563,7 +570,8 @@ namespace Modals {
|
|||
button_upload.prop("disabled", false);
|
||||
button_upload.prop("disabled", false);
|
||||
container_upload.hide();
|
||||
container_error.hide();
|
||||
container_error.addClass("hidden");
|
||||
container_error.addClass("hidden");
|
||||
modal.set_closeable(true);
|
||||
};
|
||||
|
||||
|
|
@ -616,7 +624,8 @@ namespace Modals {
|
|||
"Succeeded icons: " + succeed_count + "<br>" +
|
||||
"Failed icons: " + failed_count
|
||||
);
|
||||
container_success.css({opacity: 0}).show().animate({opacity: 1}, 250, () => container_success.css({opacity: undefined}));
|
||||
|
||||
container_success.removeClass("hidden");
|
||||
};
|
||||
|
||||
button_upload.on('click', event => {
|
||||
|
|
@ -631,9 +640,9 @@ namespace Modals {
|
|||
|
||||
button_upload_abort.on('click', event => finish_upload());
|
||||
|
||||
container_success.hide();
|
||||
container_error.addClass("hidden");
|
||||
container_success.addClass("hidden");
|
||||
container_upload.hide();
|
||||
container_error.hide();
|
||||
}
|
||||
|
||||
modal.open();
|
||||
|
|
|
|||
|
|
@ -3,53 +3,215 @@
|
|||
/// <reference path="../../proto.ts" />
|
||||
|
||||
namespace Modals {
|
||||
type URLGeneratorSettings = {
|
||||
flag_direct: boolean,
|
||||
flag_resolved: boolean
|
||||
}
|
||||
|
||||
const DefaultGeneratorSettings: URLGeneratorSettings = {
|
||||
flag_direct: true,
|
||||
flag_resolved: false
|
||||
};
|
||||
|
||||
type URLGenerator = {
|
||||
generate: (properties: {
|
||||
address: ServerAddress,
|
||||
resolved_address: ServerAddress
|
||||
} & URLGeneratorSettings) => string;
|
||||
|
||||
setting_available: (key: keyof URLGeneratorSettings) => boolean;
|
||||
};
|
||||
|
||||
const build_url = (base, params) => {
|
||||
if(Object.keys(params).length == 0)
|
||||
return base;
|
||||
|
||||
return base + "?" + Object.keys(params)
|
||||
.map(e => e + "=" + encodeURIComponent(params[e]))
|
||||
.join("&");
|
||||
};
|
||||
|
||||
//TODO: Server password
|
||||
const url_generators: {[key: string]:URLGenerator} = {
|
||||
"tea-web": {
|
||||
generate: properties => {
|
||||
const address = properties.resolved_address ? properties.resolved_address : properties.address;
|
||||
const address_str = address.host + (address.port === 9987 ? "" : address.port);
|
||||
const parameter = "connect_default=" + (properties.flag_direct ? 1 : 0) + "&connect_address=" + encodeURIComponent(address_str);
|
||||
|
||||
let pathbase = "";
|
||||
if(document.location.protocol !== 'https:') {
|
||||
/*
|
||||
* Seems to be a test environment or the TeaClient for localhost where we dont have to use https.
|
||||
*/
|
||||
pathbase = "https://web.teaspeak.de/";
|
||||
} else if(document.location.hostname === "localhost" || document.location.host.startsWith("127.")) {
|
||||
pathbase = "https://web.teaspeak.de/";
|
||||
} else {
|
||||
pathbase = document.location.origin + document.location.pathname;
|
||||
}
|
||||
return pathbase + "?" + parameter;
|
||||
},
|
||||
setting_available: setting => {
|
||||
return {
|
||||
flag_direct: true,
|
||||
flag_resolved: true
|
||||
}[setting] || false;
|
||||
}
|
||||
},
|
||||
"tea-client": {
|
||||
generate: properties => {
|
||||
const address = properties.resolved_address ? properties.resolved_address : properties.address;
|
||||
|
||||
|
||||
let parameters = {
|
||||
connect_default: properties.flag_direct ? 1 : 0
|
||||
};
|
||||
|
||||
if(address.port != 9987)
|
||||
parameters["port"] = address.port;
|
||||
|
||||
return build_url("teaclient://" + address.host + "/", parameters);
|
||||
},
|
||||
setting_available: setting => {
|
||||
return {
|
||||
flag_direct: true,
|
||||
flag_resolved: true
|
||||
}[setting] || false;
|
||||
}
|
||||
},
|
||||
"teamspeak": {
|
||||
generate: properties => {
|
||||
const address = properties.resolved_address ? properties.resolved_address : properties.address;
|
||||
|
||||
let parameters = {};
|
||||
if(address.port != 9987)
|
||||
parameters["port"] = address.port;
|
||||
|
||||
/*
|
||||
ts3server://<host>?
|
||||
port=9987
|
||||
nickname=UserNickname
|
||||
password=serverPassword
|
||||
channel=MyDefaultChannel
|
||||
cid=channelID
|
||||
channelpassword=defaultChannelPassword
|
||||
token=TokenKey
|
||||
addbookmark=MyBookMarkLabel
|
||||
*/
|
||||
return build_url("ts3server://" + address.host + "/", parameters);
|
||||
},
|
||||
setting_available: setting => {
|
||||
return {
|
||||
flag_direct: false,
|
||||
flag_resolved: true
|
||||
}[setting] || false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export function spawnInviteEditor(connection: ConnectionHandler) {
|
||||
let modal: Modal;
|
||||
modal = createModal({
|
||||
header: tr("Invalid URL creator"),
|
||||
header: tr("Invite URL creator"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_invite").renderTag();
|
||||
|
||||
template.find(".button-close").on('click', event => modal.close());
|
||||
return template;
|
||||
},
|
||||
footer: undefined
|
||||
footer: undefined,
|
||||
min_width: "20em",
|
||||
width: "50em"
|
||||
});
|
||||
|
||||
const container_url = modal.htmlTag.find(".text-output");
|
||||
modal.htmlTag.find(".modal-body").addClass("modal-invite");
|
||||
|
||||
const button_copy = modal.htmlTag.find(".button-copy");
|
||||
const input_type = modal.htmlTag.find(".property-type select");
|
||||
const label_output = modal.htmlTag.find(".text-output");
|
||||
|
||||
const invite_settings = [
|
||||
{
|
||||
key: "flag_direct",
|
||||
node: modal.htmlTag.find(".flag-direct-connect input"),
|
||||
value: node => node.prop('checked'),
|
||||
set_value: (node, value) => node.prop('checked', value == "1"),
|
||||
disable: (node, flag) => node.prop('disabled', flag)
|
||||
.firstParent('.checkbox').toggleClass('disabled', flag)
|
||||
},
|
||||
|
||||
{
|
||||
key: "flag_resolved",
|
||||
node: modal.htmlTag.find(".flag-resolved-address input"),
|
||||
value: node => node.prop('checked'),
|
||||
set_value: (node, value) => node.prop('checked', value == "1"),
|
||||
disable: (node, flag) => node.prop('disabled', flag)
|
||||
.firstParent('.checkbox').toggleClass('disabled', flag)
|
||||
}
|
||||
];
|
||||
|
||||
const update_buttons = () => {
|
||||
const generator = url_generators[input_type.val() as string];
|
||||
if(!generator) {
|
||||
for(const s of invite_settings)
|
||||
s.disable(s.node, true);
|
||||
return;
|
||||
}
|
||||
|
||||
for(const s of invite_settings)
|
||||
s.disable(s.node, !generator.setting_available(s.key as any));
|
||||
};
|
||||
|
||||
const update_link = () => {
|
||||
const generator = url_generators[input_type.val() as string];
|
||||
if(!generator) {
|
||||
button_copy.prop('disabled', true);
|
||||
label_output.text(tr("Missing link generator"));
|
||||
return;
|
||||
}
|
||||
button_copy.prop('disabled', false);
|
||||
|
||||
const properties = {
|
||||
address: connection.channelTree.server.remote_address,
|
||||
resolved_address: connection.channelTree.client.serverConnection.remote_address()
|
||||
};
|
||||
for(const s of invite_settings)
|
||||
properties[s.key] = s.value(s.node);
|
||||
|
||||
label_output.text(generator.generate(properties as any));
|
||||
};
|
||||
|
||||
|
||||
for(const s of invite_settings) {
|
||||
s.node.on('change keyup', () => {
|
||||
settings.changeGlobal(Settings.FN_INVITE_LINK_SETTING(s.key), s.value(s.node));
|
||||
update_link()
|
||||
});
|
||||
|
||||
s.set_value(s.node, settings.global(Settings.FN_INVITE_LINK_SETTING(s.key), DefaultGeneratorSettings[s.key]));
|
||||
}
|
||||
|
||||
input_type.on('change', () => {
|
||||
settings.changeGlobal(Settings.KEY_LAST_INVITE_LINK_TYPE, input_type.val());
|
||||
update_buttons();
|
||||
update_link();
|
||||
}).val(settings.global(Settings.KEY_LAST_INVITE_LINK_TYPE));
|
||||
|
||||
button_copy.on('click', event => {
|
||||
container_url.select();
|
||||
label_output.select();
|
||||
document.execCommand('copy');
|
||||
});
|
||||
|
||||
let flag_direct_connect = true;
|
||||
let flag_resolved_address = false;
|
||||
const update_link = () => {
|
||||
const address = flag_resolved_address ? this.channelTree.client.serverConnection.remote_address() : connection.channelTree.server.remote_address;
|
||||
const parameter = "connect_default=" + (flag_direct_connect ? 1 : 0) + "&connect_address=" + encodeURIComponent(address.host + (address.port === 9987 ? "" : address.port));
|
||||
const url = document.location.origin + document.location.pathname + "?" + parameter;
|
||||
container_url.text(url);
|
||||
};
|
||||
|
||||
{
|
||||
const input_direct_connect = modal.htmlTag.find(".flag-direct-connect input") as JQuery<HTMLInputElement>;
|
||||
input_direct_connect.on('change', event => {
|
||||
flag_direct_connect = input_direct_connect[0].checked;
|
||||
update_link();
|
||||
});
|
||||
input_direct_connect[0].checked = flag_direct_connect;
|
||||
}
|
||||
{
|
||||
const input = modal.htmlTag.find(".flag-resolved-address input") as JQuery<HTMLInputElement>;
|
||||
input.on('change', event => {
|
||||
flag_resolved_address = input[0].checked;
|
||||
update_link();
|
||||
});
|
||||
input[0].checked = flag_resolved_address;
|
||||
}
|
||||
|
||||
update_buttons();
|
||||
update_link();
|
||||
modal.open();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
<option value="tea-web">{{tr "TeaWeb" /}}</option>
|
||||
<option value="tea-client">{{tr "TeaClient" /}}</option>
|
||||
<option value="teamspeak">{{tr "TeamSpeak" /}}</option>
|
||||
*/
|
||||
|
|
@ -69,6 +69,11 @@ namespace Modals {
|
|||
}
|
||||
|
||||
export function spawnPlaylistEdit(client: ConnectionHandler, playlist: Playlist) {
|
||||
{
|
||||
createErrorModal(tr("Not implemented"), tr("Playlist editing hasn't yet been implemented")).open();
|
||||
return;
|
||||
}
|
||||
|
||||
let modal: Modal;
|
||||
let changed_properties = {};
|
||||
let changed_permissions = {};
|
||||
|
|
|
|||
|
|
@ -1,9 +1,16 @@
|
|||
/// <reference path="../../ui/elements/modal.ts" />
|
||||
/// <reference path="../../i18n/localize.ts" />
|
||||
/// <reference path="../../ConnectionHandler.ts" />
|
||||
/// <reference path="../../proto.ts" />
|
||||
|
||||
namespace Modals {
|
||||
export function spawnPlaylistManage(client: ConnectionHandler) {
|
||||
{
|
||||
createErrorModal(tr("Not implemented"), tr("Playlist management hasn't yet been implemented")).open();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
let modal: Modal;
|
||||
let selected_playlist: Playlist;
|
||||
let available_playlists: Playlist[];
|
||||
|
|
|
|||
|
|
@ -19,34 +19,31 @@ namespace Modals {
|
|||
return;
|
||||
}
|
||||
|
||||
//client_login_password
|
||||
const single_handler: connection.SingleCommandHandler = {
|
||||
function: command => {
|
||||
const json = command.arguments[0];
|
||||
function: command => {
|
||||
const json = command.arguments[0];
|
||||
|
||||
spawnQueryCreated({
|
||||
username: name,
|
||||
password: json.client_login_password
|
||||
}, true);
|
||||
spawnQueryCreated({
|
||||
username: name,
|
||||
password: json.client_login_password
|
||||
}, true);
|
||||
|
||||
if(callback_created)
|
||||
callback_created(name, json.client_login_password);
|
||||
return true;
|
||||
}
|
||||
if(callback_created)
|
||||
callback_created(name, json.client_login_password);
|
||||
return true;
|
||||
},
|
||||
command: "notifyquerycreated"
|
||||
};
|
||||
connection.serverConnection.command_handler_boss().register_single_handler(single_handler);
|
||||
connection.serverConnection.send_command("querycreate", {
|
||||
client_login_name: name
|
||||
}).catch(error => {
|
||||
connection.serverConnection.command_handler_boss().remove_single_handler(single_handler);
|
||||
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Unable to create account"), tr("Failed to create account<br>Message: ") + error).open();
|
||||
});
|
||||
}).then(() => connection.serverConnection.command_handler_boss().remove_single_handler(single_handler));
|
||||
|
||||
modal.close();
|
||||
//TODO create account
|
||||
});
|
||||
return template;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
/// <reference path="../../proto.ts" />
|
||||
|
||||
namespace Modals {
|
||||
/*
|
||||
export function spawnQueryManage(client: ConnectionHandler) {
|
||||
let modal: Modal;
|
||||
let selected_query: QueryListEntry;
|
||||
|
|
@ -57,7 +58,7 @@ namespace Modals {
|
|||
let template = $("#tmpl_query_manager").renderTag();
|
||||
template = $.spawn("div").append(template);
|
||||
|
||||
/* first open the modal */
|
||||
/* first open the modal
|
||||
setTimeout(() => {
|
||||
const entry_container = template.find(".query-list-entries-container");
|
||||
if(entry_container.hasScrollBar())
|
||||
|
|
@ -158,4 +159,258 @@ namespace Modals {
|
|||
update_list();
|
||||
modal.open();
|
||||
}
|
||||
*/
|
||||
|
||||
//tmpl_query_manager
|
||||
export function spawnQueryManage(client: ConnectionHandler) {
|
||||
let modal: Modal;
|
||||
|
||||
modal = createModal({
|
||||
header: tr("Manage query accounts"),
|
||||
body: () => {
|
||||
let template = $("#tmpl_query_manager").renderTag();
|
||||
|
||||
let current_server: number;
|
||||
let selected_query: QueryListEntry;
|
||||
let filter_callbacks: ((text: string) => boolean)[] = [];
|
||||
const container_list = template.find(".container-list .container-entries");
|
||||
const container_list_empty = container_list.find(".container-empty");
|
||||
const container_list_error = container_list.find(".container-error");
|
||||
|
||||
const detail_name = template.find(".detail.login-name .value");
|
||||
const detail_unique_id = template.find(".detail.unique-id .value");
|
||||
const detail_bound_server = template.find(".detail.bound-server .value");
|
||||
|
||||
const detail_unique_id_copy = template.find(".detail.unique-id .button-copy");
|
||||
|
||||
const input_filter = template.find(".filter-input");
|
||||
|
||||
const button_create = template.find(".button-create");
|
||||
const button_delete = template.find(".button-delete");
|
||||
const button_rename = template.find(".button-rename");
|
||||
const button_change_password = template.find(".button-change-password");
|
||||
const button_update = template.find(".button-update");
|
||||
|
||||
const permission_create = client.permissions.neededPermission(PermissionType.B_CLIENT_QUERY_CREATE).granted(1);
|
||||
const permission_delete = client.permissions.neededPermission(PermissionType.B_CLIENT_QUERY_DELETE).granted(1);
|
||||
const permission_delete_own = client.permissions.neededPermission(PermissionType.B_CLIENT_QUERY_DELETE_OWN).granted(1);
|
||||
const permission_rename = client.permissions.neededPermission(PermissionType.B_CLIENT_QUERY_RENAME).granted(1);
|
||||
const permission_rename_own = client.permissions.neededPermission(PermissionType.B_CLIENT_QUERY_RENAME_OWN).granted(1);
|
||||
const permission_password = client.permissions.neededPermission(PermissionType.B_CLIENT_QUERY_CHANGE_PASSWORD).granted(1);
|
||||
const permission_password_own = client.permissions.neededPermission(PermissionType.B_CLIENT_QUERY_CHANGE_OWN_PASSWORD).granted(1);
|
||||
const permission_password_global = client.permissions.neededPermission(PermissionType.B_CLIENT_QUERY_CHANGE_PASSWORD_GLOBAL).granted(1);
|
||||
button_create.prop('disabled', !permission_create);
|
||||
|
||||
const set_error = (error: string | undefined) => {
|
||||
if(typeof(error) === "string")
|
||||
container_list_error.text(error).show();
|
||||
else
|
||||
container_list_error.hide();
|
||||
};
|
||||
|
||||
const update_list = (selected_entry: string | undefined) => {
|
||||
button_update.prop('disabled', true);
|
||||
container_list_empty.text(tr("loading...")).show();
|
||||
set_error(undefined);
|
||||
set_selected(undefined, false);
|
||||
filter_callbacks = [];
|
||||
container_list.find(".entry").remove();
|
||||
|
||||
client.serverConnection.command_helper.current_virtual_server_id().then(server_id => {
|
||||
current_server = server_id;
|
||||
|
||||
client.serverConnection.command_helper.request_query_list(server_id).then(result => {
|
||||
if(!result || !result.queries.length) {
|
||||
container_list_empty.text(tr("No queries available"));
|
||||
return;
|
||||
}
|
||||
|
||||
for(const entry of result.queries) {
|
||||
const tag = $.spawn("div").addClass("entry").text(entry.username + " (" + entry.unique_id + ")");
|
||||
tag.on('click', event => {
|
||||
container_list.find(".selected").removeClass("selected");
|
||||
tag.addClass("selected");
|
||||
set_selected(entry, false);
|
||||
});
|
||||
container_list.append(tag);
|
||||
if(entry.username === selected_entry) tag.trigger('click');
|
||||
|
||||
const text_mesh = (entry.username + " " + entry.unique_id + " " + entry.bounded_server).toLowerCase();
|
||||
filter_callbacks.push(text => {
|
||||
if(typeof(text) === "undefined" || text_mesh.indexOf(text) != -1) {
|
||||
tag.show();
|
||||
return true;
|
||||
} else {
|
||||
tag.hide();
|
||||
return false;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
update_filter();
|
||||
container_list_empty.hide();
|
||||
button_update.prop('disabled', false);
|
||||
}).catch(error => {
|
||||
button_update.prop('disabled', false);
|
||||
if(error instanceof CommandResult && error.id === ErrorID.PERMISSION_ERROR) {
|
||||
set_error(tr("No permissions"));
|
||||
return;
|
||||
}
|
||||
log.error(LogCategory.CLIENT, tr("Failed to request the query list: %o"), error);
|
||||
set_error(tr("Failed to request list"));
|
||||
});
|
||||
}).catch(error => {
|
||||
button_update.prop('disabled', false);
|
||||
log.error(LogCategory.CLIENT, tr("Failed to get own virtual server id: %o"), error);
|
||||
set_error(tr("Failed to query server id"));
|
||||
});
|
||||
};
|
||||
|
||||
const set_selected = (entry: QueryListEntry | undefined, force: boolean) => {
|
||||
if(entry === selected_query && !force) return;
|
||||
selected_query = entry;
|
||||
|
||||
if(!selected_query) {
|
||||
detail_name.text("-");
|
||||
detail_unique_id.text("-");
|
||||
detail_bound_server.text("-");
|
||||
|
||||
button_delete.prop('disabled', true);
|
||||
button_rename.prop('disabled', true);
|
||||
button_change_password.prop('disabled', true);
|
||||
} else {
|
||||
detail_name.text(selected_query.username);
|
||||
detail_unique_id.text(selected_query.unique_id);
|
||||
if(selected_query.bounded_server == 0)
|
||||
detail_bound_server.text(tr("On the instance"));
|
||||
else if(selected_query.bounded_server === current_server)
|
||||
detail_bound_server.text(tr("On the current server"));
|
||||
else
|
||||
detail_bound_server.text(selected_query.bounded_server.toString());
|
||||
|
||||
button_delete.prop('disabled', !permission_delete && !(selected_query.unique_id === client.getClient().properties.client_unique_identifier && permission_delete_own));
|
||||
button_rename.prop('disabled', !permission_rename && !(selected_query.unique_id === client.getClient().properties.client_unique_identifier && permission_rename_own));
|
||||
if(selected_query.bounded_server != 0) {
|
||||
button_change_password.prop('disabled', !permission_password && !(selected_query.unique_id === client.getClient().properties.client_unique_identifier && permission_password_own));
|
||||
} else {
|
||||
button_change_password.prop('disabled', !permission_password_global && !(selected_query.unique_id === client.getClient().properties.client_unique_identifier && permission_password_own));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const update_filter = () => {
|
||||
let value = input_filter.val() as string;
|
||||
if(!value) value = undefined;
|
||||
else value = value.toLowerCase();
|
||||
|
||||
const shown = filter_callbacks.filter(e => e(value)).length;
|
||||
if(shown > 0) {
|
||||
container_list_empty.hide();
|
||||
} else {
|
||||
container_list_empty.text(tr("No accounts found")).show();
|
||||
}
|
||||
};
|
||||
input_filter.on('change keyup', update_filter);
|
||||
|
||||
/* all buttons */
|
||||
{
|
||||
detail_unique_id_copy.on('click', event => {
|
||||
if(!selected_query) return;
|
||||
|
||||
copy_to_clipboard(selected_query.unique_id);
|
||||
createInfoModal(tr("Unique ID copied"), tr("The unique id has been successfully copied to your clipboard.")).open();
|
||||
});
|
||||
|
||||
button_create.on('click', event => {
|
||||
Modals.spawnQueryCreate(client, (user, pass) => update_list(user));
|
||||
});
|
||||
|
||||
button_delete.on('click', event => {
|
||||
if(!selected_query) return;
|
||||
|
||||
Modals.spawnYesNo(tr("Are you sure?"), tr("Do you really want to delete this account?"), result => {
|
||||
if(result) {
|
||||
client.serverConnection.send_command("querydelete", {
|
||||
client_login_name: selected_query.username
|
||||
}).then(() => {
|
||||
createInfoModal(tr("Account successfully deleted"), tr("The query account has been successfully deleted!")).open();
|
||||
update_list(undefined);
|
||||
}).catch(error => {
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Unable to delete account"), MessageHelper.formatMessage(tr("Failed to delete account{:br:}Message: {}"), error)).open();
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
button_rename.on('click', () => {
|
||||
if(!selected_query) return;
|
||||
|
||||
createInputModal(tr("Change account name"), tr("Enter the new name for the login:"), text => text.length >= 3, result => {
|
||||
if(result) {
|
||||
client.serverConnection.send_command("queryrename", {
|
||||
client_login_name: selected_query.username,
|
||||
client_new_login_name: result
|
||||
}).then(() => {
|
||||
createInfoModal(tr("Account successfully renamed"), tr("The query account has been renamed!")).open();
|
||||
update_list(result as string);
|
||||
}).catch(error => {
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Unable to rename account"), MessageHelper.formatMessage(tr("Failed to rename account{:br:}Message: {}"), error)).open();
|
||||
});
|
||||
}
|
||||
}).open();
|
||||
});
|
||||
|
||||
button_change_password.on('click', () => {
|
||||
if(!selected_query) return;
|
||||
|
||||
createInputModal(tr("Change account's password"), tr("Enter a new password (leave blank for auto generation):"), text => true, result => {
|
||||
if(result !== false) {
|
||||
const single_handler: connection.SingleCommandHandler = {
|
||||
command: "notifyquerypasswordchanges",
|
||||
function: command => {
|
||||
Modals.spawnQueryCreated({
|
||||
username: command.arguments[0]["client_login_name"],
|
||||
password: command.arguments[0]["client_login_password"]
|
||||
}, false);
|
||||
|
||||
return true;
|
||||
}
|
||||
};
|
||||
client.serverConnection.command_handler_boss().register_single_handler(single_handler);
|
||||
|
||||
client.serverConnection.send_command("querychangepassword", {
|
||||
client_login_name: selected_query.username,
|
||||
client_login_password: result
|
||||
}).catch(error => {
|
||||
client.serverConnection.command_handler_boss().remove_single_handler(single_handler);
|
||||
if(error instanceof CommandResult)
|
||||
error = error.extra_message || error.message;
|
||||
createErrorModal(tr("Unable to change password"), MessageHelper.formatMessage(tr("Failed to change password{:br:}Message: {}"), error)).open();
|
||||
});
|
||||
}
|
||||
}).open();
|
||||
});
|
||||
|
||||
button_update.on('click', event => update_list(selected_query ? selected_query.username : undefined));
|
||||
}
|
||||
|
||||
modal.close_listener.push(() => filter_callbacks = undefined);
|
||||
|
||||
set_selected(undefined, true);
|
||||
update_list(undefined);
|
||||
template.dividerfy();
|
||||
return template;
|
||||
},
|
||||
footer: null,
|
||||
|
||||
min_width: "25em"
|
||||
});
|
||||
|
||||
modal.htmlTag.find(".modal-body").addClass("modal-query-manage");
|
||||
modal.open();
|
||||
}
|
||||
}
|
||||
|
|
@ -260,6 +260,7 @@ class ServerEntry {
|
|||
type: contextmenu.MenuEntryType.ENTRY,
|
||||
icon_class: 'client-iconsview',
|
||||
name: tr("View avatars"),
|
||||
visible: false, //TODO: Enable again as soon the new design is finished
|
||||
callback: () => Modals.spawnAvatarList(this.channelTree.client)
|
||||
},
|
||||
contextmenu.Entry.CLOSE(() => trigger_close ? on_close() : {})
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ const loader_javascript = {
|
|||
} else {
|
||||
/* test if js/proto.js is available. If so we're in debug mode */
|
||||
const request = new XMLHttpRequest();
|
||||
request.open('GET', 'js/proto.js', true);
|
||||
request.open('GET', "js/proto.js?_ts=" + Date.now(), true);
|
||||
|
||||
await new Promise((resolve, reject) => {
|
||||
request.onreadystatechange = () => {
|
||||
|
|
@ -73,18 +73,6 @@ const loader_javascript = {
|
|||
}
|
||||
},
|
||||
load_scripts: async () => {
|
||||
/*
|
||||
if(window.require !== undefined) {
|
||||
console.log("Loading node specific things");
|
||||
const remote = require('electron').remote;
|
||||
module.paths.push(remote.app.getAppPath() + "/node_modules");
|
||||
module.paths.push(remote.app.getAppPath() + "/app");
|
||||
module.paths.push(remote.getGlobal("browser-root") + "js/");
|
||||
window.$ = require("assets/jquery.min.js");
|
||||
require("native/loader_adapter.js");
|
||||
}
|
||||
*/
|
||||
|
||||
if(!window.require) {
|
||||
await loader.load_script(["vendor/jquery/jquery.min.js"]);
|
||||
} else {
|
||||
|
|
@ -100,20 +88,6 @@ const loader_javascript = {
|
|||
}
|
||||
await loader.load_script(["vendor/DOMPurify/purify.min.js"]);
|
||||
|
||||
/* bootstrap material design and libs */
|
||||
//await loader.load_script(["vendor/popper/popper.js"]);
|
||||
|
||||
//depends on popper
|
||||
//await loader.load_script(["vendor/bootstrap-material/bootstrap-material-design.js"]);
|
||||
|
||||
/*
|
||||
loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
|
||||
name: "materialize body",
|
||||
priority: 10,
|
||||
function: async () => { $(document).ready(function() { $('body').bootstrapMaterialDesign(); }); }
|
||||
});
|
||||
*/
|
||||
|
||||
await loader.load_script("vendor/jsrender/jsrender.min.js");
|
||||
await loader.load_scripts([
|
||||
["vendor/xbbcode/src/parser.js"],
|
||||
|
|
@ -368,6 +342,7 @@ const loader_style = {
|
|||
"css/static/modal-connect.css",
|
||||
"css/static/modal-channel.css",
|
||||
"css/static/modal-query.css",
|
||||
"css/static/modal-volume.css",
|
||||
"css/static/modal-invite.css",
|
||||
"css/static/modal-playlist.css",
|
||||
"css/static/modal-banlist.css",
|
||||
|
|
|
|||
24
todo.txt
24
todo.txt
|
|
@ -1,26 +1,7 @@
|
|||
- Modals
|
||||
- Settings (X)
|
||||
- Query
|
||||
- List
|
||||
- Username
|
||||
- Unique ID
|
||||
- Bounded server
|
||||
Buttons:
|
||||
- Create
|
||||
- Delete
|
||||
- Rename
|
||||
- Change password
|
||||
|
||||
- Refresh
|
||||
- "Ban Client" dialog
|
||||
- Entity info (Popup)
|
||||
- Server (Bandwidth (MH))
|
||||
- Channel
|
||||
- Icon Select
|
||||
- Icon upload
|
||||
- Avatar list
|
||||
- Invite buddy
|
||||
- Change volume
|
||||
- Music System
|
||||
|
||||
- Ban Liste
|
||||
- Übersicht
|
||||
|
|
@ -136,4 +117,5 @@ Fix these icons: https://img.did.science/Screenshot_20-11-06.png
|
|||
- Application Options
|
||||
- Crash
|
||||
- Focus crash window on crash
|
||||
- Add a notification (Like the browser notifications)
|
||||
- Add a notification (Like the browser notifications)
|
||||
Connection state sometimes does not update
|
||||
|
|
@ -4,9 +4,6 @@ html, body {
|
|||
height: 100%;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
|
||||
//min-height: 250px;
|
||||
//min-width: 250px;
|
||||
}
|
||||
|
||||
.app-container {
|
||||
|
|
|
|||
1
web/environment/development/js/connection/ServerConnection.js
Symbolic link
1
web/environment/development/js/connection/ServerConnection.js
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
/home/wolverindev/TeaSpeak/Web-Client/web/js/connection/ServerConnection.js
|
||||
1
web/environment/release/js/client.min.js
vendored
Symbolic link
1
web/environment/release/js/client.min.js
vendored
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
/home/wolverindev/TeaSpeak/Web-Client/web/generated/client.min.js
|
||||
|
|
@ -232,7 +232,7 @@ namespace connection {
|
|||
this._connected = false;
|
||||
|
||||
if(this._voice_connection)
|
||||
this._voice_connection.dropSession();
|
||||
this._voice_connection.drop_rtp_session();
|
||||
}
|
||||
|
||||
private handle_socket_message(data) {
|
||||
|
|
@ -264,7 +264,7 @@ namespace connection {
|
|||
this.do_ping();
|
||||
this.updateConnectionState(ConnectionState.CONNECTED);
|
||||
if(this._voice_connection)
|
||||
this._voice_connection.createSession(); /* FIXME: Move it to a handler boss and not here! */
|
||||
this._voice_connection.start_rtc_session(); /* FIXME: Move it to a handler boss and not here! */
|
||||
}
|
||||
group.end();
|
||||
} else if(json["type"] === "WebRTC") {
|
||||
|
|
|
|||
|
|
@ -122,6 +122,12 @@ namespace audio {
|
|||
dataChannel: RTCDataChannel;
|
||||
|
||||
private _type: VoiceEncodeType = VoiceEncodeType.NATIVE_ENCODE;
|
||||
|
||||
/*
|
||||
* To ensure we're not sending any audio because the settings activates the input,
|
||||
* we self mute the audio stream
|
||||
*/
|
||||
local_audio_mute: GainNode;
|
||||
local_audio_stream: MediaStreamAudioDestinationNode;
|
||||
|
||||
static codec_pool: codec.CodecPool[];
|
||||
|
|
@ -149,7 +155,7 @@ namespace audio {
|
|||
|
||||
destroy() {
|
||||
clearInterval(this.send_task);
|
||||
this.dropSession();
|
||||
this.drop_rtp_session();
|
||||
this.acquire_voice_recorder(undefined, true).catch(error => {
|
||||
log.warn(LogCategory.VOICE, tr("Failed to release voice recorder: %o"), error);
|
||||
}).then(() => {
|
||||
|
|
@ -200,8 +206,14 @@ namespace audio {
|
|||
return;
|
||||
}
|
||||
|
||||
if(!this.local_audio_stream)
|
||||
if(!this.local_audio_stream) {
|
||||
this.local_audio_stream = audio.player.context().createMediaStreamDestination();
|
||||
}
|
||||
if(!this.local_audio_mute) {
|
||||
this.local_audio_mute = audio.player.context().createGain();
|
||||
this.local_audio_mute.connect(this.local_audio_stream);
|
||||
this.local_audio_mute.gain.value = 1;
|
||||
}
|
||||
}
|
||||
|
||||
private setup_js() {
|
||||
|
|
@ -235,16 +247,16 @@ namespace audio {
|
|||
await recorder.input.set_consumer({
|
||||
type: audio.recorder.InputConsumerType.NODE,
|
||||
callback_node: node => {
|
||||
if(!this.local_audio_stream)
|
||||
if(!this.local_audio_stream || !this.local_audio_mute)
|
||||
return;
|
||||
|
||||
node.connect(this.local_audio_stream);
|
||||
node.connect(this.local_audio_mute);
|
||||
},
|
||||
callback_disconnect: node => {
|
||||
if(!this.local_audio_stream)
|
||||
if(!this.local_audio_mute)
|
||||
return;
|
||||
|
||||
node.disconnect(this.local_audio_stream);
|
||||
node.disconnect(this.local_audio_mute);
|
||||
}
|
||||
} as audio.recorder.NodeInputConsumer);
|
||||
} else {
|
||||
|
|
@ -266,7 +278,7 @@ namespace audio {
|
|||
this.setup_native();
|
||||
else
|
||||
this.setup_js();
|
||||
this.createSession();
|
||||
this.start_rtc_session();
|
||||
}
|
||||
|
||||
voice_playback_support() : boolean {
|
||||
|
|
@ -315,11 +327,14 @@ namespace audio {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
createSession() {
|
||||
private _audio_player_waiting = false;
|
||||
start_rtc_session() {
|
||||
if(!audio.player.initialized()) {
|
||||
log.info(LogCategory.VOICE, tr("Audio player isn't initialized yet. Waiting for gesture."));
|
||||
audio.player.on_ready(() => this.createSession());
|
||||
if(!this._audio_player_waiting) {
|
||||
this._audio_player_waiting = true;
|
||||
audio.player.on_ready(() => this.start_rtc_session());
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -331,7 +346,7 @@ namespace audio {
|
|||
else
|
||||
this.setup_js();
|
||||
|
||||
this.dropSession();
|
||||
this.drop_rtp_session();
|
||||
this._ice_use_cache = true;
|
||||
|
||||
|
||||
|
|
@ -354,17 +369,17 @@ namespace audio {
|
|||
this.rtcPeerConnection.onicecandidate = this.on_local_ice_candidate.bind(this);
|
||||
if(this.local_audio_stream) { //May a typecheck?
|
||||
this.rtcPeerConnection.addStream(this.local_audio_stream.stream);
|
||||
log.info(LogCategory.VOICE, tr("Adding stream (%o)!"), this.local_audio_stream.stream);
|
||||
log.info(LogCategory.VOICE, tr("Adding native audio stream (%o)!"), this.local_audio_stream.stream);
|
||||
}
|
||||
|
||||
this.rtcPeerConnection.createOffer(sdpConstraints).then(offer => {
|
||||
this.on_local_offer_created(offer);
|
||||
}).catch(error => {
|
||||
log.error(LogCategory.VOICE, tr("Could not create ice offer! error: %o"), error);
|
||||
});
|
||||
this.rtcPeerConnection.createOffer(sdpConstraints)
|
||||
.then(offer => this.on_local_offer_created(offer))
|
||||
.catch(error => {
|
||||
log.error(LogCategory.VOICE, tr("Could not create ice offer! error: %o"), error);
|
||||
});
|
||||
}
|
||||
|
||||
dropSession() {
|
||||
drop_rtp_session() {
|
||||
if(this.dataChannel) {
|
||||
this.dataChannel.close();
|
||||
this.dataChannel = undefined;
|
||||
|
|
@ -418,14 +433,13 @@ namespace audio {
|
|||
});
|
||||
log.error(LogCategory.NETWORKING, tr("Failed to setup voice bridge (%s). Allow reconnect: %s"), json["reason"], json["allow_reconnect"]);
|
||||
if(json["allow_reconnect"] == true) {
|
||||
this.createSession();
|
||||
this.start_rtc_session();
|
||||
}
|
||||
//TODO handle fail specially when its not allowed to reconnect
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Listeners
|
||||
private on_local_ice_candidate(event: RTCPeerConnectionIceEvent) {
|
||||
if (event) {
|
||||
//if(event.candidate && event.candidate.protocol !== "udp")
|
||||
|
|
@ -509,6 +523,7 @@ namespace audio {
|
|||
const chandler = this.connection.client;
|
||||
if(!chandler.connected)
|
||||
return false;
|
||||
|
||||
if(chandler.client_status.input_muted)
|
||||
return false;
|
||||
|
||||
|
|
@ -544,6 +559,15 @@ namespace audio {
|
|||
|
||||
private handle_local_voice_started() {
|
||||
const chandler = this.connection.client;
|
||||
if(chandler.client_status.input_muted) {
|
||||
/* evail hack due to the settings :D */
|
||||
log.warn(LogCategory.VOICE, tr("Received local voice started event, even thou we're muted! Do not send any voice."));
|
||||
if(this.local_audio_mute)
|
||||
this.local_audio_mute.gain.value = 0;
|
||||
return;
|
||||
}
|
||||
if(this.local_audio_mute)
|
||||
this.local_audio_mute.gain.value = 1;
|
||||
log.info(LogCategory.VOICE, tr("Local voice started"));
|
||||
|
||||
const ch = chandler.getClient();
|
||||
|
|
@ -577,7 +601,7 @@ namespace audio {
|
|||
|
||||
unregister_client(client: connection.voice.VoiceClient): Promise<void> {
|
||||
if(!(client instanceof audio.js.VoiceClientController))
|
||||
throw "Invalid client";
|
||||
throw "Invalid client type";
|
||||
|
||||
this._audio_clients.remove(client);
|
||||
return Promise.resolve();
|
||||
|
|
@ -634,12 +658,6 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
|
|||
new audio.js.codec.CodecPool(5, tr("Opus Music"), CodecType.OPUS_MUSIC)
|
||||
];
|
||||
|
||||
if(native_client) {
|
||||
audio.js.VoiceConnection.codec_pool[0].initialize(2);
|
||||
audio.js.VoiceConnection.codec_pool[1].initialize(2);
|
||||
audio.js.VoiceConnection.codec_pool[2].initialize(2);
|
||||
audio.js.VoiceConnection.codec_pool[3].initialize(2);
|
||||
}
|
||||
audio.js.VoiceConnection.codec_pool[4].initialize(2);
|
||||
audio.js.VoiceConnection.codec_pool[5].initialize(2);
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue