diff --git a/src/app/components/creator/home-creator-page/home-creator-page.component.html b/src/app/components/creator/home-creator-page/home-creator-page.component.html
index b6d80569da72ba0f390b1cd7f604548eaf1940f8..fb8fa396a107d4f768b4d7be01abd84592cb649a 100644
--- a/src/app/components/creator/home-creator-page/home-creator-page.component.html
+++ b/src/app/components/creator/home-creator-page/home-creator-page.component.html
@@ -1,6 +1,8 @@
<div fxLayout="column" fxLayoutAlign="start" fxLayoutGap="20px" fxFill>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="5px">
- <button mat-raised-button (click)="openCreateRoomDialog()">{{ 'home-page.create-session' | translate }}</button>
+ <button mat-raised-button (click)="openCreateRoomDialog()">
+ <mat-icon>add</mat-icon>
+ {{ 'home-page.create-session' | translate }}</button>
</div>
<div fxLayout="row" fxLayoutAlign="center">
<app-room-list></app-room-list>
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 e7bc4b5095040b4609ce613a9802218a565d5494..e7e11dfb1841912801f32e4ce46c612a98be37fa 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
@@ -31,13 +31,6 @@
</mat-expansion-panel>
</mat-card-content>
<mat-grid-list cols="2" rowHeight="2:1">
- <mat-grid-tile colspan="1" rowspan="1">
- <button mat-icon-button
- routerLink="/creator/room/{{ room.shortId }}/create-content">
- <mat-icon>note_add</mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.create-content' | translate}}</h3>
- </button>
- </mat-grid-tile>
<mat-grid-tile>
<button mat-icon-button
routerLink="/creator/room/{{ room.shortId }}/comments">
@@ -45,19 +38,26 @@
<h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.comments' | translate}}</h3>
</button>
</mat-grid-tile>
+ <mat-grid-tile>
+ <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/feedback-barometer">
+ <mat-icon class="smallerIcon">thumbs_up_down
+ </mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.live-feedback' | translate}}</h3>
+ </button>
+ </mat-grid-tile>
</mat-grid-list>
<mat-grid-list cols="2" rowHeight="2:1">
<mat-grid-tile>
- <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/statistics">
- <mat-icon>insert_chart</mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.answer-statistics' | translate}}</h3>
+ <button mat-icon-button
+ routerLink="/creator/room/{{ room.shortId }}/create-content">
+ <mat-icon>note_add</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.create-content' | translate}}</h3>
</button>
</mat-grid-tile>
<mat-grid-tile>
- <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/feedback-barometer">
- <mat-icon class="smallerIcon">thumbs_up_down
- </mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.live-feedback' | translate}}</h3>
+ <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/statistics">
+ <mat-icon>insert_chart</mat-icon>
+ <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.answer-statistics' | translate}}</h3>
</button>
</mat-grid-tile>
</mat-grid-list>
diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
index 137d1da26b1ce13fb400438f11dd0b51406c48e9..92a0a692e5c27483574cb917dbf023a3b584ff52 100644
--- a/src/app/components/shared/comment-list/comment-list.component.html
+++ b/src/app/components/shared/comment-list/comment-list.component.html
@@ -2,7 +2,7 @@
<mat-label fxLayoutAlign="center center">
<mat-icon class="search-icon">search</mat-icon>
</mat-label>
- <input #searchBox placeholder="{{ 'comment-list-page.search' | translate }}"
+ <input #searchBox placeholder="{{ 'comment-list.search' | translate }}"
(input)="searchComments(searchBox.value)">
<button mat-icon-button class="searchBarButton close" *ngIf="searchBox.value"
(click)="hideCommentsList=false; searchBox.value=''">
@@ -13,16 +13,17 @@
<div class="button-bar" fxLayoutAlign="center center">
<button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value && userRole === 1 && comments.length > 0"
- [matTooltip]="'Export comments'" (click)="openExportDialog()">
+ matTooltip="{{ 'comment-list.export-comments' | translate }}" (click)="openExportDialog()">
<mat-icon class="searchBarIcon">cloud_download</mat-icon>
</button>
- <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value" (click)="openCreateDialog()">
+ <button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value" (click)="openCreateDialog()"
+ matTooltip="{{ 'comment-list.add-comment' | translate }}">
<mat-icon class="searchBarIcon">add_circle</mat-icon>
</button>
<button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value && comments.length > 0"
- [matMenuTriggerFor]="filterMenu">
+ [matMenuTriggerFor]="filterMenu" matTooltip="{{ 'comment-list.filter-comments' | translate }}">
<mat-icon class="searchBarIcon">sort</mat-icon>
</button>
</div>
diff --git a/src/app/components/shared/comment-list/comment-list.component.ts b/src/app/components/shared/comment-list/comment-list.component.ts
index 07252e03cfef15ac7929811d73fc5c3d5eb3d9a3..2329ff52678e6dfedc0c8eda99bea56772595ced 100644
--- a/src/app/components/shared/comment-list/comment-list.component.ts
+++ b/src/app/components/shared/comment-list/comment-list.component.ts
@@ -29,6 +29,7 @@ export class CommentListComponent implements OnInit {
hideCommentsList = false;
filteredComments: Comment[];
userRole: UserRole;
+ deviceType: string;
constructor(private commentService: CommentService,
private translateService: TranslateService,
@@ -52,6 +53,7 @@ export class CommentListComponent implements OnInit {
this.getComments();
this.translateService.use(localStorage.getItem('currentLang'));
this.userRole = this.authenticationService.getRole();
+ this.deviceType = localStorage.getItem('deviceType');
}
getComments(): void {
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index 78a035810f80b2bc74be269604bdb65e2bb38c5d..3beb681859663641cbdda66627873a5e8f1acd95 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -11,19 +11,15 @@
{{comment.timestamp | date: 'h:mm:ss a, M/d/yy'}}
</ng-template>
</div>
- <button mat-icon-button *ngIf="comment.correct || !isStudent" [disabled]="isStudent" (click)="setCorrect(comment)"
- [matTooltip]="comment.correct ? 'Unmark as correct' : 'Mark as correct'">
+ <button mat-icon-button *ngIf="comment.correct || !isStudent" [disabled]="isStudent" (click)="setCorrect(comment)">
<mat-icon [ngClass]="{true : 'correct-icon', false: 'not-marked'}[comment.correct]">check_circle</mat-icon>
</button>
<button mat-icon-button *ngIf="comment.favorite || !isStudent" [disabled]="isStudent"
- (click)="setFavorite(comment)"
- [matTooltip]="comment.favorite ? 'Mark as not favorite' : 'Mark as favorite'">
+ (click)="setFavorite(comment)">
<mat-icon [ngClass]="{true: 'favorite-icon', false: 'not-marked'}[comment.favorite]">favorite_border</mat-icon>
</button>
- <button mat-icon-button [disabled]="isStudent" (click)="setRead(comment)"
- [matTooltip]="comment.read ? 'Mark as unread' : 'Mark as read'">
- <mat-icon class="icon" [ngClass]="{'read-icon': comment.read,
- 'not-marked' : !comment.read}">visibility
+ <button mat-icon-button [disabled]="isStudent" (click)="setRead(comment)">
+ <mat-icon class="icon" [ngClass]="{'read-icon': comment.read, 'not-marked' : !comment.read}">visibility
</mat-icon>
</button>
</div>
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 07c51d408ea949dcf1a82b51a6514ad63bbfa77a..75e17bba205f3b53ef1aabb229e44b79cbec0f2f 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -1,11 +1,10 @@
<mat-toolbar class="mat-elevation-z4">
<mat-toolbar-row>
- <button *ngIf="router.url !== '/home'" (click)="goBack()" mat-icon-button>
+ <button mat-icon-button *ngIf="router.url !== '/home'" (click)="goBack()"
+ matTooltip="{{'header.back' | translate}}">
<mat-icon class="header-icons" aria-label="Go back">keyboard_arrow_left</mat-icon>
</button>
<span class="fill-remaining-space"></span>
- <span *ngIf="router.url !== '/home'" class="app-title" (click)="goToHomepage()">ARSnova</span>
- <span class="fill-remaining-space"></span>
<mat-menu class="color-menu" #themeMenu="matMenu" [overlapTrigger]="false">
<mat-grid-list cols="2">
@@ -39,7 +38,7 @@
</mat-menu>
<button mat-icon-button [matMenuTriggerFor]="themeMenu">
- <mat-icon class="header-icons">palette</mat-icon>
+ <mat-icon class="header-icons" matTooltip="{{'header.change-theme' | translate}}">palette</mat-icon>
</button>
<mat-menu #langMenu="matMenu" [overlapTrigger]="false">
@@ -48,7 +47,7 @@
</mat-menu>
<button mat-icon-button [matMenuTriggerFor]="langMenu">
- <mat-icon class="header-icons">language</mat-icon>
+ <mat-icon class="header-icons" matTooltip="{{'header.change-language' | translate}}">language</mat-icon>
</button>
<mat-menu #loginMenu="matMenu" [overlapTrigger]="false">
@@ -60,27 +59,29 @@
<mat-icon class="sessions">turned_in</mat-icon>
<span>{{'header.visited-sessions' | translate}}</span>
</button>
- <button mat-menu-item (click)="logout()">
+ <button mat-menu-item (click)="logout()">
<mat-icon color="warn">exit_to_app</mat-icon>
<span>{{ 'header.logout' | translate }}</span>
</button>
</mat-menu>
<mat-menu #userMenu="matMenu" [overlapTrigger]="false">
- <button mat-menu-item (click)=login(true)>
- <mat-icon>record_voice_over</mat-icon>
- <span>{{ 'login-page.creator' | translate }}</span>
- </button>
- <button mat-menu-item (click)=login(false)>
- <mat-icon>supervisor_account</mat-icon>
- <span>{{ 'login-page.participant' | translate }}</span>
- </button>
+ <button mat-menu-item (click)=login(true)>
+ <mat-icon>record_voice_over</mat-icon>
+ <span>{{ 'login-page.creator' | translate }}</span>
+ </button>
+ <button mat-menu-item (click)=login(false)>
+ <mat-icon>supervisor_account</mat-icon>
+ <span>{{ 'login-page.participant' | translate }}</span>
+ </button>
</mat-menu>
- <button mat-icon-button *ngIf="!user" [matMenuTriggerFor]="userMenu">
+ <button mat-icon-button *ngIf="!user" [matMenuTriggerFor]="userMenu"
+ matTooltip="{{'header.login' | translate}}">
<mat-icon class="header-icons">account_box</mat-icon>
</button>
- <button mat-icon-button *ngIf="user" [matMenuTriggerFor]="loginMenu">
+ <button mat-icon-button *ngIf="user" [matMenuTriggerFor]="loginMenu"
+ matTooltip="{{'header.my-account' | translate}}">
<mat-icon class="header-icons">account_box</mat-icon>
</button>
</mat-toolbar-row>
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index ff04dd4b82978107fdae01b211f8ed3093322bec..eb32ec070a1d6a4226c9806404c341228f2ee0a0 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -94,8 +94,10 @@
"really": "Wollen sie wirklich alle Kommentare dieser Session löschen?",
"no-comments": "Es wurden noch keine Kommentare erstellt ..."
},
- "comment-list-page": {
+ "comment-list": {
"search": "Suchen",
- "cancel": "Abbrechen"
+ "export-comments": "Kommentare exportieren",
+ "filter-comments": "Kommentare Sortieren",
+ "add-comment": "Kommentar erstellen"
}
}
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 50e6bcb68a12a99817f02328b99dc06f17de919c..c6fb0b52cf7853c3d6b1d10ccc48b437a475ef36 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -94,8 +94,10 @@
"really": "Do you really want to delete all comments of this session?",
"no-comments": "No comments have been created yet ..."
},
- "comment-list-page": {
+ "comment-list": {
"search": "Search",
- "cancel": "Cancel"
+ "export-comments": "Export comments",
+ "filter-comments": "Sort comments",
+ "add-comment": "Create comment"
}
}
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 7d5899df57300df974694a12dca978fb400e81d2..ca8ed1c1175f0a4fb8ce69463b08608e810f7824 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -8,8 +8,10 @@
"back": "Zurück",
"my-sessions": "Meine Sessions",
"visited-sessions": "Besuchte Sessions",
- "default": "ARSnova",
- "dark": "Nacht"
+ "change-theme": "Theme ändern",
+ "change-language": "Sprache ändern",
+ "login": "Login",
+ "my-account": "Mein Account"
},
"login-page": {
"creator": "Dozent/in",
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index 3691c26bfc340bc8f875c63ab7fa3c2e73721a65..d8cdb9223e5c9a447e83ec0a803084a5b4c299b1 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -8,8 +8,10 @@
"back": "Back",
"my-sessions": "My Sessions",
"visited-sessions": "Visited Sessions",
- "default": "ARSnova",
- "dark": "Night"
+ "change-theme": "Change theme",
+ "change-language": "Change language",
+ "login": "Login",
+ "my-account": "My account"
},
"login-page": {
"creator": "Lecturer",
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 0c25a7baadb452a93190cd92f96168f2139fb031..83c4bcc6e3ee7d165408c3e6fd90bcb806d86b89 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -24,9 +24,10 @@
"error-both-fields": "Bitte füllen Sie alle Felder aus.",
"no-comments": "Es wurden noch keine Kommentare erstellt ..."
},
- "comment-list-page": {
+ "comment-list": {
"search": "Suchen",
- "cancel": "Abbrechen"
+ "filter-comments": "Kommentare Sortieren",
+ "add-comment": "Kommentar erstellen"
},
"answer": {
"submit": "Absenden",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index b98e799cb3b2decd47402464b429c8ca477d5b06..64552a26aed6509cce9d23097b3902c8a4067de9 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -24,9 +24,10 @@
"error-both-fields": "Please fill in all fields.",
"no-comments": "No comments have been created yet ..."
},
- "comment-list-page": {
+ "comment-list": {
"search": "Search",
- "cancel": "Cancel"
+ "filter-comments": "Sort comments",
+ "add-comment": "Create comment"
},
"answer": {
"submit": "Submit",