From 5ce8fc8096fb90049a725dfad2b7ea81a7f00c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20K=C3=A4sler?= <tom.kaesler@mni.thm.de>
Date: Thu, 3 Oct 2019 14:10:30 +0200
Subject: [PATCH] Remove orig files from merge...
---
.../room-creator-page.component.html.orig | 155 ------------------
.../room-creator-page.component.scss.orig | 136 ---------------
2 files changed, 291 deletions(-)
delete mode 100644 src/app/components/creator/room-creator-page/room-creator-page.component.html.orig
delete mode 100644 src/app/components/creator/room-creator-page/room-creator-page.component.scss.orig
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.html.orig b/src/app/components/creator/room-creator-page/room-creator-page.component.html.orig
deleted file mode 100644
index 50741278c..000000000
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.html.orig
+++ /dev/null
@@ -1,155 +0,0 @@
-<div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px" fxFill>
- <div fxLayout="row" fxLayoutAlign="center">
- <mat-progress-spinner *ngIf="isLoading" color="primary" mode="indeterminate"></mat-progress-spinner>
- <mat-card *ngIf="room">
- <div fxLayout="row">
- <span class="corner-icons"></span>
- <span class="fill-remaining-space"></span>
- <mat-card-header fxLayoutAlign="center" fxLayout="row">
- <mat-card-title fxLayoutAlign="center">
- <h1>{{ room.name }}</h1>
- </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.slice(0, 4) }} {{ room.shortId.slice(4, 8) }}
- </span>
- <button id="copy" mat-icon-button (click)="copyShortId()" aria-labelledby= "cloud_download">
- <mat-icon class="copy" matTooltip="{{ 'room-page.copy-session-id' | translate}}">save</mat-icon>
- </button>
- </mat-card-subtitle>
- </mat-card-header>
- <span class="fill-remaining-space"></span>
- <mat-menu #settingsMenu="matMenu" [overlapTrigger]="false" xPosition="before">
- <button mat-menu-item (click)="showSettingsDialog()" aria-labelledby= "edit">
- <mat-icon>edit</mat-icon>
- {{ 'room-page.general' | translate}}
- </button>
- <button mat-menu-item (click)="showCommentsDialog()" aria-labelledby= "insert_comment">
- <mat-icon>insert_comment</mat-icon>
- {{ 'room-page.comments' | translate}}
- </button>
- <button mat-menu-item (click)="showModeratorsDialog()" aria-labelledby= "person">
- <mat-icon>gavel</mat-icon>
- {{ 'room-page.moderators' | translate}}
- </button>
- </mat-menu>
-<<<<<<< HEAD
- <div fxLayout="column">
- <button mat-icon-button class="corner-icons" [matMenuTriggerFor]="settingsMenu">
- <mat-icon class="corner-icon" matTooltip="{{ 'room-page.session-settings' | translate}}">settings</mat-icon>
- </button>
- <button mat-icon-button class="corner-icons" routerLink="/creator/room/{{ room.shortId }}/statistics">
- <mat-icon class="corner-icon" matTooltip="{{ 'room-page.answer-statistics' | translate}}">insert_chart
- </mat-icon>
- </button>
- </div>
-=======
- <button id="settings-menu"
- mat-icon-button class="corner-icons" [matMenuTriggerFor]="settingsMenu" aria-labelledby="settings">
- <mat-icon class="corner-icon" matTooltip="{{ 'room-page.session-settings' | translate}}">settings</mat-icon>
- </button>
->>>>>>> frag/master
- </div>
- <mat-card-content *ngIf="room.description" fxLayoutAlign="center">
- <p>
- {{ room.description.trim() }}
- </p>
- </mat-card-content>
-<<<<<<< HEAD
- <div fxLayout="column" fxLayoutAlign="center">
- <div fxLayout="row">
- <span class="fill-remaining-space"></span>
- <mat-grid-list cols="{{viewModuleCount}}" rowHeight="2:1">
- <mat-grid-tile>
- <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/comments">
- <mat-icon matBadge="{{commentCounter}}" class="main-icon"
- [ngClass]="{'desktop' : deviceType === 'desktop'}">question_answer
- </mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.comments' | translate}}</h3>
- </button>
- </mat-grid-tile>
- <mat-grid-tile *ngIf="moderationEnabled">
- <button mat-icon-button routerLink="/moderator/room/{{ room.shortId }}/moderator/comments">
- <mat-icon matBadge="{{moderatorCommentCounter}}" class="main-icon"
- [ngClass]="{'desktop' : deviceType === 'desktop'}">gavel
- </mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.moderating-stream' | translate}}</h3>
- </button>
- </mat-grid-tile>
- </mat-grid-list>
- <span class="fill-remaining-space"></span>
- </div>
- <div fxLayout="row">
- <span class="fill-remaining-space"></span>
- <mat-grid-list cols="2" rowHeight="2:1" class="second">
- <mat-grid-tile>
- <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/feedback-barometer">
- <mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">thumbs_up_down
- </mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.live-feedback' | translate}}</h3>
- </button>
- </mat-grid-tile>
- <mat-grid-tile>
- <button mat-icon-button routerLink="/creator/room/{{ room.shortId }}/create-content">
- <mat-icon class="main-icon" [ngClass]="{'desktop' : deviceType === 'desktop'}">note_add</mat-icon>
- <h3 *ngIf="deviceType === 'desktop'">{{ 'room-page.create-content' | translate}}</h3>
- </button>
- </mat-grid-tile>
- </mat-grid-list>
- <span class="fill-remaining-space"></span>
- </div>
- </div>
-
- <app-content-groups *ngIf="room && room.contentGroups" [contentGroups]="room.contentGroups"></app-content-groups>
-
-=======
- <div fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px">
- <mat-grid-list cols="{{viewModuleCount}}" rowHeight="1:1" *ngIf="viewModuleCount > 1">
- <mat-grid-tile>
- <button id="question_answer-button" mat-icon-button [disableRipple]="true"
- routerLink="/creator/room/{{ room.shortId }}/comments" aria-labelledby="question_answer">
- <mat-icon matBadge="{{commentCounter}}" class="main-icon"
- [ngClass]="{'desktop' : deviceType === 'desktop'}">question_answer</mat-icon>
- <h2>{{ 'room-page.comments' | translate}}</h2>
- </button>
- </mat-grid-tile>
- <mat-grid-tile *ngIf="moderationEnabled">
- <button id="gavel-button" mat-icon-button [disableRipple]="true"
- routerLink="/moderator/room/{{ room.shortId }}/moderator/comments" aria-labelledby="gavel">
- <mat-icon matBadge="{{moderatorCommentCounter}}" class="main-icon"
- [ngClass]="{'desktop' : deviceType === 'desktop'}">gavel
- </mat-icon>
- <h2>{{ 'room-page.moderating-stream' | translate}}</h2>
- </button>
- </mat-grid-tile>
- </mat-grid-list>
- <div fxLayout="row" fxLayoutAlign="center" *ngIf="viewModuleCount <= 1" class="question-button-div">
- <button id="question_answer-button2" mat-icon-button [disableRipple]="true"
- routerLink="/creator/room/{{ room.shortId }}/comments" aria-labelledby="question_answer">
- <mat-icon matBadge="{{commentCounter}}" class="main-icon"
- [ngClass]="{'desktop' : deviceType === 'desktop'}">question_answer</mat-icon>
- <h2>{{ 'room-page.comments' | translate}}</h2>
- </button>
- </div>
- </div>
->>>>>>> frag/master
- </mat-card>
- <div *ngIf="!isLoading && !room">{{ 'room-page.room-not-found' | translate }}</div>
- </div>
- <button id="live_announcer-button" tabIndex="-1" (click)="announce()" class="visually-hidden">{{ 'room-page.live-announcer' | translate }}</button>
-</div>
-
-<div class="visually-hidden">
- <div id ="cloud_download">{{'room-page.a11y-cloud_download' | translate}}</div>
- <div id ="question_answer">{{'room-page.a11y-question_answer' | translate}}</div>
- <div id ="gavel">{{'room-page.a11y-gavel' | translate}}</div>
- <div id ="settings">{{'room-page.a11y-settings' | translate}}</div>
- <div id ="edit">{{'room-page.a11y-edit' | translate}}</div>
- <div id ="insert_comment">{{'room-page.a11y-insert_comment' | translate}}</div>
- <div id ="person">{{'room-page.a11y-person' | translate}}</div>
-</div>
-
-
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.scss.orig b/src/app/components/creator/room-creator-page/room-creator-page.component.scss.orig
deleted file mode 100644
index 69a8c8efa..000000000
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.scss.orig
+++ /dev/null
@@ -1,136 +0,0 @@
-@import '../../../../styles';
-
-mat-card {
- width: 100%;
- max-width: 800px;
- min-height: 350px;
- max-height: 600px;
- background-color: var(--surface)!important;
- margin-top: 7%;
-}
-
-mat-card-content > :first-child {
- margin: 3% 0 3% 0;
-}
-
-#room-edit-description {
- margin-bottom: 0;
-}
-
-.mat-icon-button {
- width: 60%;
- height: 75%;
- color: var(--primary)!important;
- transition: all 0.3s;
- &:hover {
- transform: scale(1.2)
- }
-}
-
-.desktop {
- font-size: 80px;
- height: 80px;
- width: 80px;
- margin-bottom: 5%;
-}
-
-.corner-icons {
- width: 40px;
- height: 40px;
- margin-bottom: 5%;
-}
-
-.corner-icon {
- font-size: 40px;
- height: 40px;
- width: 40px;
- line-height: 100%;
-}
-
-.main-icon{
- font-size: 60px;
- height: 60px;
- width: 60px;
- line-height: 100%!important;
-}
-
-.room-short-id {
- font-size: larger;
- font-weight: bold;
- color: var(--on-surface)!important;
- margin: 5% 5% 0 0;
-}
-
-mat-grid-list {
-<<<<<<< HEAD
- margin-bottom: 5px !important;
- width: 90%;
-=======
- margin-top: 0;
- max-height: 50%!important;
->>>>>>> frag/master
-}
-
-.second {
- margin-bottom: 20px !important;
-}
-
-h1 {
- font-size: large;
- color: var(--on-surface)!important;
- }
-
-h2 {
- font-size: larger;
- color: var(--on-surface)!important;
-}
-
-p {
- color: var(--on-surface)!important;
-}
-
-mat-card-header {
- min-height: 80px;
- height: 10%!important;
- margin-bottom: 10%!important;
-}
-
-mat-card-title {
- height: 40%;
- min-width: 200px;
-}
-
-mat-card-subtitle {
- height: 30%;
-}
-
-mat-grid-tile {
- height: 100%!important;
- padding-top: 2%!important;
-}
-
-mat-expansion-panel {
- background-color: var(--surface)!important;
- min-width: 200px;
- hyphens: auto;
-}
-
-#copy {
- width: 24px;
- height: 24px;
-}
-
-.copy {
- font-size: 24px;
- color: var(--secondary);
- line-height: 100%;
-}
-
-.gavel {
- margin: 5% 2% 0 0;
- color: var(--on-surface);
-}
-
-.question-button-div {
- margin: 10% 0 10% 0;
-}
--
GitLab