From fb430af88073542bc231b7f02da650c2fab3e2fe Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Sat, 19 Oct 2019 17:13:40 +0200 Subject: [PATCH] Some small additions --- auth/js/auth.ts | 2 +- shared/css/static/control_bar.scss | 1 + shared/css/static/frame-chat.scss | 8 +- shared/css/static/modal-channelinfo.scss | 2 +- shared/css/static/modal-permissions.scss | 125 +++++++++++++++++- shared/css/static/modal-settings.scss | 12 ++ shared/html/index.php | 2 +- shared/html/templates.html | 58 ++++++-- shared/js/ConnectionHandler.ts | 25 ++-- shared/js/FileManager.ts | 2 +- shared/js/connection/CommandHandler.ts | 5 +- .../connection/ServerConnectionDeclaration.ts | 3 + shared/js/permission/PermissionManager.ts | 9 +- shared/js/profiles/ConnectionProfile.ts | 15 ++- shared/js/profiles/Identity.ts | 2 +- shared/js/profiles/identities/NameIdentity.ts | 4 +- .../profiles/identities/TeaForumIdentity.ts | 4 +- .../profiles/identities/TeamSpeakIdentity.ts | 4 +- shared/js/settings.ts | 5 + shared/js/ui/channel.ts | 2 +- shared/js/ui/client.ts | 12 +- shared/js/ui/frames/chat.ts | 55 +++++++- shared/js/ui/frames/chat_frame.ts | 14 +- shared/js/ui/modal/ModalConnect.ts | 22 +-- shared/js/ui/modal/ModalCreateChannel.ts | 41 +++--- shared/js/ui/modal/ModalIconSelect.ts | 3 - shared/js/ui/modal/ModalSettings.ts | 30 ++++- .../modal/permission/HTMLPermissionEditor.ts | 83 +++++++++++- todo.txt | 4 +- 29 files changed, 466 insertions(+), 88 deletions(-) diff --git a/auth/js/auth.ts b/auth/js/auth.ts index c3c7c006..431bcad1 100644 --- a/auth/js/auth.ts +++ b/auth/js/auth.ts @@ -31,7 +31,7 @@ function submitLogin(user: string, pass: string) { return; } if (data["allowed"] == false) { - loginFailed("You're not allowed for the closed alpha!"); + loginFailed("You're not allowed for the closed beta!"); return; } $("#login").hide(500); diff --git a/shared/css/static/control_bar.scss b/shared/css/static/control_bar.scss index fbaca182..fab2f75d 100644 --- a/shared/css/static/control_bar.scss +++ b/shared/css/static/control_bar.scss @@ -90,6 +90,7 @@ $border_color_activated: rgba(255, 255, 255, .75); width: 1.5em; } + overflow: hidden; padding: .25em; } } diff --git a/shared/css/static/frame-chat.scss b/shared/css/static/frame-chat.scss index 21179ac6..0cf6b033 100644 --- a/shared/css/static/frame-chat.scss +++ b/shared/css/static/frame-chat.scss @@ -922,7 +922,7 @@ $client_info_avatar_size: 10em; } } - .no-permissions, .private-conversation { + .no-permissions, .private-conversation, .not-supported { flex-grow: 0; flex-shrink: 0; @@ -1308,13 +1308,13 @@ $client_info_avatar_size: 10em; .container-private-conversations, .container-channel-chat { .container-message .emoji { - height: 1em; - width: 1em; + height: 1.1em; + width: 1.1em; margin-left: .1em; margin-right: .1em; - vertical-align: text-top; + vertical-align: text-bottom; } } } diff --git a/shared/css/static/modal-channelinfo.scss b/shared/css/static/modal-channelinfo.scss index eecd39d7..73eb9e43 100644 --- a/shared/css/static/modal-channelinfo.scss +++ b/shared/css/static/modal-channelinfo.scss @@ -8,7 +8,7 @@ min-width: 30em!important; max-height: calc(100vh - 10em); - padding: 0em!important; + padding: 0 !important; .row { flex-grow: 0; diff --git a/shared/css/static/modal-permissions.scss b/shared/css/static/modal-permissions.scss index 383d40f8..b7e10b01 100644 --- a/shared/css/static/modal-permissions.scss +++ b/shared/css/static/modal-permissions.scss @@ -477,6 +477,13 @@ .container-filter { justify-content: stretch; + height: 4em; + + .form-group { + height: 3.5em; + padding-top: 1.25em; + margin-bottom: 0!important; + } .button-toggle-clients { flex-grow: 0; @@ -498,6 +505,8 @@ .container-granted-switch { margin-left: 1em; + margin-bottom: 1em; + position: relative; display: flex; @@ -511,6 +520,8 @@ min-width: 8em; > label { + font-size: .75em; + display: flex; flex-direction: row; justify-content: flex-start; @@ -528,10 +539,122 @@ a { padding-left: .25em; - font-size: 1.45em; + font-size: 1.1em; } } } + + .container-icon-select { + position: relative; + + height: 2.5em; + + border-radius: .2em; + margin-left: 1em; + margin-bottom: 1em; + + display: flex; + flex-direction: row; + justify-content: flex-end; + align-self: flex-end; + + cursor: pointer; + background-color: #121213; + border: 1px solid #0d0d0d; + + .icon-preview { + height: 100%; + width: 3em; + + border: none; + border-right: 1px solid #0d0d0d; + + display: flex; + flex-direction: column; + justify-content: space-around; + + > div { + align-self: center; + } + + > img { + align-self: center; + + width: 1em; + height: 1em; + } + + @include transition(border-color $button_hover_animation_time ease-in-out); + } + + .container-dropdown { + position: relative; + cursor: pointer; + + display: flex; + flex-direction: column; + justify-content: space-around; + + height: 100%; + width: 1.5em; + + .button { + text-align: center; + + .arrow { + border-color: #999999; + } + } + + .dropdown { + display: none; + position: absolute; + width: max-content; + + top: calc(2.5em - 1px); + + flex-direction: column; + justify-content: flex-start; + + background-color: #121213; + border: 1px solid #0d0d0d; + border-radius: .2em 0 .2em .2em; + + right: -1px; + + .entry { + padding: .5em; + + &:not(:last-of-type) { + border: none; + border-bottom: 1px solid #0d0d0d; + } + + &:hover { + background-color: #17171a; + } + } + } + + &:hover { + border-bottom-right-radius: 0; + .dropdown { + display: flex; + } + } + } + + &:hover { + background-color: #17171a; + border-color: hsla(0, 0%, 20%, 1); + + .icon-preview { + border-color: hsla(0, 0%, 20%, 1); + } + } + + @include transition(border-color $button_hover_animation_time ease-in-out); + } } .container-mode { diff --git a/shared/css/static/modal-settings.scss b/shared/css/static/modal-settings.scss index 478a9294..ca37ec90 100644 --- a/shared/css/static/modal-settings.scss +++ b/shared/css/static/modal-settings.scss @@ -126,6 +126,10 @@ } &.general-application { + > div { + margin-top: .25em; + } + .container-font-size { display: flex; flex-direction: row; @@ -313,6 +317,14 @@ } } + &.general-chat { + .container-icon-size { + .value { + margin-left: .5em; + } + } + } + &.audio-microphone, &.audio-speaker, &.audio-sounds, &.identity-forum { flex-direction: row; justify-content: stretch; diff --git a/shared/html/index.php b/shared/html/index.php index 9b10c72b..8783a7b6 100644 --- a/shared/html/index.php +++ b/shared/html/index.php @@ -9,7 +9,7 @@ $localhost = true; ?>
{{tr "Conversation is private. Join the channel to participate!" /}}
+
+
+ {{tr "The target server does not support channel chats." /}}
+ {{tr "You're only able to write in your own channel" /}} +
+
@@ -804,17 +810,14 @@