Support private non encrypted room

modules/tchap-translations/tchap_translations.json

@@ -15,18 +15,6 @@
         "en": "Access your secure message history and set up secure messaging by entering your verification code.",
         "fr": "Accédez à votre historique de messages chiffrés et mettez en place la messagerie sécurisée en entrant votre code de vérification."
     },
-    "Accessible to all users and to external guests by invitation of an administrator.": {
-        "en": "Accessible to all users and to external guests by invitation of an administrator.",
-        "fr": "Accessible à tous les utilisateurs et aux invités externes sur invitation d'un administrateur."
-    },
-    "Accessible to all users by invitation from an administrator.": {
-        "en": "Accessible to all users by invitation from an administrator.",
-        "fr": "Accessible à tous les utilisateurs sur invitation d'un administrateur."
-    },
-    "Accessible to all users from the forum directory or from a shared link.": {
-        "en": "Accessible to all users from the forum directory or from a shared link.",
-        "fr": "Accessible à tous les utilisateurs à partir de la liste des forums ou d'un lien partagé."
-    },
     "Allow access to this room to all users, even outside \"%(domain)s\" domain": {
         "en": "Allow access to this room to all users, even outside \"%(domain)s\" domain",
         "fr": "Autoriser l'accès à tous les utilisateurs, même ceux qui ne sont pas membres du domaine \"%(domain)s\""
@@ -90,14 +78,12 @@
         "en": "External members cannot be re-invited. If you need to give access to externals, you will have to create a new room.",
         "fr": "Les membres externes ne pourront pas être réinvités. Si vous avez besoin de donner accès aux externes, il faudra créer un nouveau salon."
     },
-    "External users allowed": { "en": "external users allowed", "fr": "ouvert aux externes" },
     "Eye": { "en": "Eye", "fr": "OEil" },
     "restore_key_backup_dialog|key_fetch_in_progress": {
         "en": "Fetching messages from server…",
         "fr": "Récupération des messages depuis le serveur…"
     },
     "Finish": { "en": "Finish", "fr": "Terminer" },
-    "Forum room": { "en": "Public room", "fr": "Forum" },
     "Frequently Asked Questions (FAQ)": { "en": "Frequently Asked Questions (FAQ)", "fr": "Foire Aux Questions (FAQ)" },
     "auth|logout_dialog|skip_key_backup": { "en": "Log out anyway", "fr": "Se déconnecter quand-même" },
     "I renewed the validity of my account": { "en": "Continue", "fr": "Continuer" },
@@ -149,23 +135,6 @@
         "en": "Please tell us what went wrong in the \"Notes\" field.",
         "fr": "Veuillez nous expliquer le problème dans le champ \"Notes\"."
     },
-    "Private discussions accessible to all users of this space and to external guests by invitation of an administrator.": {
-        "en": "Private discussions accessible to all users of this space and to external guests by invitation of an administrator.",
-        "fr": "Discussions privées accessibles à tous les membres de cet espace et aux utilisateurs externes sur invitation d'un administrateur."
-    },
-    "Private discussions accessible to all users of this space.": {
-        "en": "Private discussions accessible to all users of this space.",
-        "fr": "Discussions privées accessibles à tous les membres de cet espace"
-    },
-    "Private room": { "en": "Private room", "fr": "Salon" },
-    "Private room open to external users": {
-        "en": "Private room open to external users",
-        "fr": "Salon ouvert aux externes"
-    },
-    "Public discussion accessible to all users of this space or from a shared link.": {
-        "en": "Public discussion accessible to all users of this space or from a shared link.",
-        "fr": "Discussions publiques accessibles à tous les membres de cet espace ou depuis un lien de partage."
-    },
     "Read the CGU": { "en": "Read the CGU", "fr": "Consultez les modalités d'utilisation" },
     "Read the FAQ": { "en": "Read the FAQ", "fr": "Consultez la FAQ" },
     "Read the Known Issues": { "en": "Read the Known Issues", "fr": "Consultez les problèmes connus" },
@@ -1117,5 +1086,50 @@
     "room_settings|security|history_visibility_warning": {
         "en": "Changes won't affect past messages, only new ones.",
         "fr": "Les changements n'affecteront pas les messages passés, juste les nouveaux."
+    },
+    "tooltip|private_non_encrypted": {
+        "en": "This room is private and non-encrypted",
+        "fr": "Ce salon est privé non chiffré"
+    },
+    "create|private_non_encrypted_title": {
+        "en": "Private room",
+        "fr": "Salon privé"
+    },
+    "create|private_encrypted_title": {
+        "en": "Private secure room",
+        "fr": "Salon privé sécurisé"
+    },
+    "create|private_external_title": {
+        "en": "Private secure room with external guests",
+        "fr": "Salon privé sécurisé avec externes"
+    },
+    "create|public_room": { "en": "Public room", "fr": "Forum" },
+    "badge|external_guests": {
+        "en": "External guests",
+        "fr": "Invités externes"
+    },
+    "create|encrypted": {
+        "en": "End to end encrypted",
+        "fr": "Chiffré de bout en bout"
+    },
+    "create|invitation": {
+        "en": "Accessible only by invitation",
+        "fr": "Accessible uniquement sur invitation"
+    },
+    "create|invitation_external": {
+        "en": "Accessible only by invitation even for external guests",
+        "fr": "Accessible uniquement sur invitation, y compris aux invité externes"
+    },
+    "create|invitation_public": {
+        "en": "Accessible from the list of rooms",
+        "fr": "Accessible depuis la liste des salons"
+    },
+    "create|max_members": {
+        "en": "Max 500 members recommended",
+        "fr": "Conseillé jusqu'à 500 membres "
+    },
+    "create|non_encrypted": {
+        "en": "Not encrypted",
+        "fr": "Non-chiffré"
     }
 }

res/css/_components.pcss

@@ -410,6 +410,7 @@
 @import "./tchap/dialogs/_TchapExportE2eKeysSuccessDialog.pcss";
 @import "./tchap/dialogs/_TchapLogoutDialog.pcss";
 @import "./tchap/dialogs/_TchapServerPickerDialog.pcss";
+@import "./tchap/dialogs/_TchapCreateRoomDialog.pcss";
 @import "./tchap/views/avatars/_TchapDecoratedRoomAvatar.pcss";
 @import "./tchap/views/elements/_ContentScanningStatus.pcss";
 @import "./tchap/views/elements/_TchapRoomTypeSelector.pcss";
@@ -418,5 +419,6 @@
 @import "./tchap/views/rooms/_ContentScanningImageBody.pcss";
 @import "./tchap/views/rooms/_ContentScanningVideoBody.pcss";
 @import "./tchap/views/rooms/_TchapExportMembersButton.pcss";
+@import "./tchap/views/rooms/_BadgeRoomType.pcss";
 @import "./tchap/views/sso/_TchapSSO.pcss";
 /* end :TCHAP: */

res/css/tchap/dialogs/_TchapCreateRoomDialog.pcss

@@ -0,0 +1,8 @@
+.tc_TchapCreateRoomDialog {
+
+    .tc_modal_cancel {
+        background-color: var(--cpd-color-bg-action-secondary-rest) !important;
+        color: var(--cpd-color-text-secondary) !important;
+    }
+
+}

res/css/tchap/views/avatars/_TchapDecoratedRoomAvatar.pcss

@@ -2,30 +2,27 @@
 Copyright 2022 DINUM
 */
 
-.mx_DecoratedRoomAvatar .mx_DecoratedRoomAvatar_icon.mx_DecoratedRoomAvatar_icon_forum::before{
-    background-color: var(--forum-color);
+.mx_DecoratedRoomAvatar .mx_DecoratedRoomAvatar_icon.mx_DecoratedRoomAvatar_icon_private_non_encrypted::before{
+    background-color: var(--timeline-text-color);
+    color: var(--timeline-text-color);
     bottom: -13%;
     right: -30%;
-    width: 140%;
-    height: 140%;
 }
 
 .mx_DecoratedRoomAvatar .mx_DecoratedRoomAvatar_icon.mx_DecoratedRoomAvatar_icon_private::before,
 .mx_ExtraTile .mx_DecoratedRoomAvatar_icon_private::before {
     background-color: var(--private-color);
+    color: var(--private-color);
     bottom: -13%;
     right: -30%;
-    width: 140%;
-    height: 140%;
 }
 
 .mx_DecoratedRoomAvatar .mx_DecoratedRoomAvatar_icon.mx_DecoratedRoomAvatar_icon_external::before,
 .mx_ExtraTile .mx_DecoratedRoomAvatar_icon_external::before {
     background-color: var(--external-color);
+    color:var(--external-color);
     bottom: -13%;
     right: -30%;
-    width: 140%;
-    height: 140%;
 }
 
 /* we have crop decorated icons lock if we don't add this */

res/css/tchap/views/elements/_TchapRoomTypeSelector.pcss

@@ -23,17 +23,6 @@
     .tc_TchapRoomTypeSelector_private {
         .tc_TchapRoomTypeSelector_RadioButton_title {
             color: var(--private-color);
-            &::before {
-                width: 12px;
-                height: 16px;
-                content: "";
-                display: inline-block;
-                vertical-align: sub;
-                background-image: url("@vector-im/compound-design-tokens/icons/padlock-private.svg");
-                background-repeat: no-repeat;
-                background-size: 100%;
-                margin-right: 4px;
-            }
         }
 
         &.tc_TchapRoomTypeSelector_RadioButton_selected {
@@ -44,17 +33,6 @@
     .tc_TchapRoomTypeSelector_external {
         .tc_TchapRoomTypeSelector_RadioButton_title {
             color: var(--external-color);
-            &::before {
-                width: 12px;
-                height: 16px;
-                content: "";
-                display: inline-block;
-                vertical-align: sub;
-                background-image: url("@vector-im/compound-design-tokens/icons/padlock-external.svg");
-                background-repeat: no-repeat;
-                background-size: 100%;
-                margin-right: 4px;
-            }
         }
 
         &.tc_TchapRoomTypeSelector_RadioButton_selected {
@@ -64,32 +42,36 @@
 
     .tc_TchapRoomTypeSelector_forum {
         .tc_TchapRoomTypeSelector_RadioButton_title {
-            color: var(--forum-color);
-            &::before {
-                width: 12px;
-                height: 16px;
-                content: "";
-                display: inline-block;
-                vertical-align: sub;
-                background-image: url("@vector-im/compound-design-tokens/icons/padlock-forum.svg");
-                background-repeat: no-repeat;
-                background-size: 100%;
-                margin-right: 4px;
-            }
+            color: var(--timeline-text-color);
         }
 
         &.tc_TchapRoomTypeSelector_RadioButton_selected {
-            border-color: var(--forum-color);
+            border-color: var(--timeline-text-color);
+        }
+    }
+
+    .tc_TchapRoomTypeSelector_private_non_encrypted {
+        .tc_TchapRoomTypeSelector_RadioButton_title {
+            color: var(--timeline-text-color);
         }
 
-        .mx_SettingsFlag {
-            flex-direction: row;
-            display: flex;
-            align-items: center;
-            margin-top: 10px;
-            .mx_SettingsFlag_label {
-                padding-top: 0px;
-            }
+        &.tc_TchapRoomTypeSelector_RadioButton_selected {
+            border-color: var(--timeline-text-color);
         }
     }
+
+    .mx_SettingsFlag {
+        flex-direction: row;
+        display: flex;
+        align-items: center;
+        margin-top: 10px;
+        .mx_SettingsFlag_label {
+            padding-top: 0px;
+        }
+    }
+
+    ul {
+        margin: 0px;
+        padding-left: 24px;
+    }
 }

res/css/tchap/views/rooms/_BadgeRoomType.pcss

@@ -0,0 +1,27 @@
+.tc_badge {
+
+    span {
+        font-size: smaller;
+        margin-right: 2px;
+        text-transform: uppercase;
+        border-radius: 4px;
+        font-weight: 700;
+
+        &.description {
+            display: none;
+        }
+
+        /* Show text only on larger screens */
+        @media (min-width: 750px) {
+            &.description {
+                display: inline;
+            }
+        }
+    }
+
+    .external {
+        background-color: var(--badge-external-color);
+    }
+
+
+}

res/css/views/rooms/_RoomHeader.pcss

@@ -111,6 +111,19 @@ Please see LICENSE files in the repository root for full details.
     display: -webkit-box;
 }
 
+.tc_RoomHeader_private-non-encrypted {
+    color: var(--timeline-text-color);
+    width: 80px;
+    font-weight: 400;
+    font-size: 0.8125rem;
+    line-height: 0.8125rem;
+    max-height: calc(0.8125rem * 2);
+    overflow: hidden;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    display: -webkit-box;
+}
+
 .mx_RoomHeader .mx_RoomHeader_toggled {
     fill: var(--cpd-color-icon-accent-primary);
 }

res/themes/tchap-dark/css/_tchap_custom_vars.pcss

@@ -1,8 +1,9 @@
 /* variables that are used by the components style
 should be loaded before res/themes/light-custom/css/_custom.pcss */
 :root {
-    --private-color: #eb5757;
+    --private-color: #27ae60;
     --external-color: #f07a12;
+    --badge-external-color: #7c3f12;
     --forum-color: #27ae60;
     --sidebar-button-color: #9999fc;
     --main-title-color: white;

res/themes/tchap-light/css/_tchap_custom_vars.pcss

@@ -6,8 +6,9 @@ body {
     --primary-color: #334ccc;
     --warning-color: #e1000f;
     --confirmation-color: #0dbd8b;
-    --private-color: #eb5757;
+    --private-color: #27ae60;
     --external-color: #f07a12;
+    --badge-external-color: #ffe0c5;
     --forum-color: #27ae60;
     --sidebar-color-50pct: #030c1b4d; /* for modal backdrop*/
     --roomlist-highlights-color: var(--cpd-color-bg-action-secondary-pressed);