diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.html b/src/app/components/creator/room-creator-page/room-creator-page.component.html index 253c7528b9077f1e9a9a4bbf51ad563196eeef8a..84f0766bbfeca2287e96a19a7933b4a7d8734056 100644 --- a/src/app/components/creator/room-creator-page/room-creator-page.component.html +++ b/src/app/components/creator/room-creator-page/room-creator-page.component.html @@ -20,9 +20,6 @@ </button> </mat-card-title> <mat-card-subtitle fxLayoutAlign="center"> - <mat-icon *ngIf="moderationEnabled" class="gavel"> - gavel - </mat-icon> <span class="room-short-id"> {{ 'room-page.session-id' | translate}}: {{ room.shortId }} </span> @@ -105,7 +102,7 @@ <mat-icon matBadge="{{moderatorCommentCounter > 0 ? moderatorCommentCounter : null}}" class="main-icon" [ngClass]="{'smallerIcon' : deviceType === 'mobile'}" - matTooltip="{{ 'room-page.session-moderation-board' | translate}}">visibility_off + matTooltip="{{ 'room-page.session-moderation-board' | translate}}">gavel </mat-icon> <h3>{{ 'room-page.moderating-stream' | translate}}</h3> </button> diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.scss b/src/app/components/creator/room-creator-page/room-creator-page.component.scss index 3175e508a2c8921dac2bce4a5c8fe1877f305fb2..670e8dabe67fbe37a8af4fdeb77d889be295efe6 100644 --- a/src/app/components/creator/room-creator-page/room-creator-page.component.scss +++ b/src/app/components/creator/room-creator-page/room-creator-page.component.scss @@ -111,7 +111,7 @@ mat-expansion-panel { .gavel { margin: 0.9em 0.25em 0 0; - color: var(--on-surface); + color: var(--red); } .question-button-div { diff --git a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html index e41c74dc5c36e13c62bf52337bd2a8706f481a53..550f63f65f5bba5213bd8e1a46d95015c8236ed9 100644 --- a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html +++ b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.html @@ -13,10 +13,6 @@ <h2 class="oldtypo-h2">»{{room.name}}«</h2> </mat-card-title> <mat-card-subtitle fxLayoutAlign="center"> - <mat-icon *ngIf="moderationEnabled" - class="gavel"> - gavel - </mat-icon> <span class="room-short-id"> {{ 'room-page.session-id' | translate}}: {{ room.shortId }} </span> @@ -63,7 +59,7 @@ <mat-icon matBadge="{{moderatorCommentCounter > 0 ? moderatorCommentCounter : null}}" class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}" - matTooltip="{{ 'room-page.session-moderation-board' | translate}}">visibility_off + matTooltip="{{ 'room-page.session-moderation-board' | translate}}">gavel </mat-icon> <h3>{{ 'room-page.moderating-stream' | translate}}</h3> </button> diff --git a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss index 7723c0971055b484a2fe1c8a20686790350d4dc7..8b5a41a1f5afe6a39d8bf251d88067da2cda3d10 100644 --- a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss +++ b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss @@ -131,7 +131,7 @@ mat-expansion-panel { .gavel { margin: 0.9em 0.25em 0 0; - color: var(--on-surface); + color: var(--red); } ::ng-deep .mat-badge-content { diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.scss b/src/app/components/participant/room-participant-page/room-participant-page.component.scss index 0ff3603617a4abd6aed79393c40fd517c23a9f35..22d1073a9bbebd7f69b65827612206b611777159 100644 --- a/src/app/components/participant/room-participant-page/room-participant-page.component.scss +++ b/src/app/components/participant/room-participant-page/room-participant-page.component.scss @@ -92,7 +92,8 @@ mat-grid-tile { .gavel { margin: 0.9em 0.25em 0 0; - color: var(--on-surface); + color: var(--red); + transform: scale(1.8); } .room-short-id { diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html index ea2e4385d534c5abe56637dcb572f65ae5b1867a..b2ed57a850f5ed57217cf667f764a4b9b86c8cec 100644 --- a/src/app/components/shared/comment/comment.component.html +++ b/src/app/components/shared/comment/comment.component.html @@ -324,8 +324,8 @@ *ngIf="comment.tag && comment.tag !== ''" class="comment-tags"> <mat-icon svgIcon="comment_tag"></mat-icon> - <span> - {{comment.tag}} + <span style="padding-left: 5px"> + {{comment.tag}} </span> </div> <div class="user-number" @@ -369,8 +369,8 @@ *ngIf="comment.questionerName" class="questioner-name"> <mat-icon>account_circle</mat-icon> - <span> - {{comment.questionerName}} + <span style="padding-left: 5px"> + {{comment.questionerName}} </span> </div> <button mat-icon-button diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss index 54210399d84560176417cd8e0bc512a02727d888..461458aabf39d5a1d55e2bb63f95aa550fafa895 100644 --- a/src/app/components/shared/comment/comment.component.scss +++ b/src/app/components/shared/comment/comment.component.scss @@ -127,7 +127,7 @@ mat-card-content > :first-child { .gavel { color: var(--primary) !important; - transform: scale(1.5) !important; + transform: scale(1.3) !important; } .moderator { diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html index f0e6149f81e8ffd90b2e803274e6aecff31219da..e067a3155f83459344da884de9022ba75f6876f9 100644 --- a/src/app/components/shared/header/header.component.html +++ b/src/app/components/shared/header/header.component.html @@ -49,7 +49,7 @@ *ngIf="moderationEnabled && router.url.includes('comments')" class="moderation-enabled" fxLayoutAlign="center center"> - <mat-icon matTooltip="{{ 'header.moderation-enabled' | translate }}"> + <mat-icon style="color: red" matTooltip="{{ 'header.moderation-enabled' | translate }}"> gavel </mat-icon> </span> diff --git a/src/assets/i18n/ars-lib/de.json b/src/assets/i18n/ars-lib/de.json index bbd3038ca3e2432b2a5e15b948833f0b39829284..76138595a5773d636ef5fd0246b1a9bdccda21ea 100644 --- a/src/assets/i18n/ars-lib/de.json +++ b/src/assets/i18n/ars-lib/de.json @@ -1,6 +1,6 @@ { "paginator": { - "itemsPerPageLabel": "Anzahl Kommentare", + "itemsPerPageLabel": "Fragen pro Seite", "nextPageLabel": "Nächste", "previousPageLabel": "Vorherige", "firstPageLabel": "Erste", diff --git a/src/assets/i18n/ars-lib/en.json b/src/assets/i18n/ars-lib/en.json index 85f1d80c9480ec4ea22a8b7e3cbb66ed828e253f..3fc195471bfed6b7d8a3bd0f07d73979e45b9816 100644 --- a/src/assets/i18n/ars-lib/en.json +++ b/src/assets/i18n/ars-lib/en.json @@ -1,6 +1,6 @@ { "paginator": { - "itemsPerPageLabel": "Number of Comments", + "itemsPerPageLabel": "Questions per page", "nextPageLabel": "Next", "previousPageLabel": "Previous", "firstPageLabel": "First", diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json index 4afc38db9763275d74ae20a9d2d09c8bd3da7e80..e74c9da0f7bfae25a8c2f46ac54b01033722d189 100644 --- a/src/assets/i18n/creator/de.json +++ b/src/assets/i18n/creator/de.json @@ -352,7 +352,7 @@ "session-moderation-board": "Zum Moderationsboard", "settings-comment-moderation": "Fragen moderieren", "settings-comment-moderation-description": "Du oder einer deiner Moderatoren können Fragen aus der Anzeige verbannen.", - "settings-direct-send": "Alle Fragen veröffentlichen", + "settings-direct-send": "Fragen unmoderiert veröffentlichen", "settings-direct-send-description": "Jede Frage wird sofort veröffentlicht. Schalte diese Option ab, wenn du jede Frage einzeln freigeben willst.", "sure": "Bist du sicher?", "tag-new": "Neue Fragenkategorie:", diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json index b034018ecbe05e2aa7a103ba0d31eebd0ec0d6a5..cfa418b990cee7c93a56d8ac3b823aa3cff5615a 100644 --- a/src/assets/i18n/creator/en.json +++ b/src/assets/i18n/creator/en.json @@ -353,7 +353,7 @@ "session-moderation-board": "To the moderation board", "settings-comment-moderation": "Moderate questions", "settings-comment-moderation-description": "You or one of your moderators can ban questions from the display.", - "settings-direct-send": "Release all questions", + "settings-direct-send": "Release questions unmoderated", "settings-direct-send-description": "Every question is published immediately. Disable this option if you want to publish each question individually.", "sure": "Are you sure?", "tag-new": "New question tag:", diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json index 017bb337592534ecc0caadc9cf3bb804ffe5c031..519c684954e6b4868cfe34510b2020bd36ff587b 100644 --- a/src/assets/i18n/home/de.json +++ b/src/assets/i18n/home/de.json @@ -87,7 +87,7 @@ "logout": "Abmelden", "block": "Fragenstellen sperren", "unlock": "Fragenstellen freigeben", - "moderation-enabled": "Die Sitzung wird moderiert.", + "moderation-enabled": "Die Fragenliste wird moderiert.", "QR": "QR-Code der Sitzung in Vollansicht", "my-account": "Optionen", "my-guest-account": "Gastkonto", @@ -191,7 +191,7 @@ "introductionTitle": "Einführung in »frag.jetzt«", "feedbackLink": "Du hast einen Bug gefunden? Du hättest gern ein weiteres Feature? Der Link führt dich in den Feedback-Raum. Die Tour wird in diesem Raum fortgesetzt.", "feedbackLinkTitle": "Raum für Feedback", - "optionHeader": "Hier befindet sich das Hauptmenü von »frag.jetzt«. Neben den Optionen der aktuellen Seite findest du hier auch allgemeine Funktionen, darunter die FAQ.", + "optionHeader": "Hier befindet sich das Hauptmenü von »frag.jetzt«. Neben den Optionen der aktuellen Seite findest du hier auch allgemeine Funktionen, darunter die Raumübersicht.", "optionHeaderTitle": "Optionen" }, "login": { diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json index 8cd82cc6c9b4a5c826ffd1c6b2ee47a64a2271e1..8d18f3db4c4b2f20c73224d48cadde4f24a25b47 100644 --- a/src/assets/i18n/home/en.json +++ b/src/assets/i18n/home/en.json @@ -74,7 +74,7 @@ "logged-out": "You are logged out now.", "login": "Log in", "logout": "Log out", - "moderation-enabled": "The session will be moderated.", + "moderation-enabled": "The question list will be moderated.", "QR": "QR code of the session in full view", "my-account": "Options", "my-guest-account": "Guest Account", @@ -192,7 +192,7 @@ "introductionTitle": "Introduction to »frag.jetzt«", "feedbackLink": "You found a bug? You would like to have another feature? The link leads you to the feedback room. The tour will continue in this room.", "feedbackLinkTitle": "Feedback room", - "optionHeader": "This is the main menu of »frag.jetzt«. In addition to the options of the current page, you will also find general functions here such as the FAQ.", + "optionHeader": "This is the main menu of »frag.jetzt«. In addition to the options of the current page, you will also find general functions here such as the room list.", "optionHeaderTitle": "Options" }, "login": { diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json index 49c22ff5b8f84898132c390aeef737d1042f024a..838bd3af7cb51c876d0d5b1a5ce870a275b451d5 100644 --- a/src/assets/i18n/participant/de.json +++ b/src/assets/i18n/participant/de.json @@ -222,7 +222,7 @@ "bonus-token": "Tokens für Bonuspunkte", "bonus-token-header": "Tokens für Bonuspunkte", "delete": "Frage löschen", - "moderation-enabled": "Die Sitzung wird moderiert.", + "moderation-enabled": "Die Fragenliste wird moderiert.", "sure": "Bist du sicher?" }, "question-wall": { diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json index 338531855130278b4d9956f523e9a5c58ce0ff98..a40ead797e79b46a803be9e938456b0a276b2118 100644 --- a/src/assets/i18n/participant/en.json +++ b/src/assets/i18n/participant/en.json @@ -230,7 +230,7 @@ "session-id": "Key code", "bonus-token": "Tokens for bonus stars", "bonus-token-header": "Tokens for bonus stars", - "moderation-enabled": "The Session will be moderated.", + "moderation-enabled": "The question list will be moderated.", "sure": "Are you sure?" }, "question-wall": {