Skip to content

Commit 2a01d31

Browse files
breitybreity
committed
Update styles and terminology, remove FlexLayoutusage
1 parent 946261a commit 2a01d31

File tree

3 files changed

+66
-57
lines changed

3 files changed

+66
-57
lines changed

‎src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<div class="idea-descriptions notice-bg-bg">
2-
<h5 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="4px">
3-
<span i18n>Idea descriptions</span>
2+
<h5 class="flex flex-row items-center gap-1 !text-xl">
3+
<span i18n>Idea Names</span>
44
<button
55
mat-icon-button
66
color="primary"
7-
matTooltip="Add a new idea description"
7+
matTooltip="Add a new idea name"
88
i18n-matTooltip
99
matTooltipPosition="after"
1010
(click)="addNewIdeaDescription(true)"
1111
>
1212
<mat-icon>add_circle</mat-icon>
1313
</button>
14-
<span fxFlex></span>
14+
<span class="flex-1"></span>
1515
</h5>
1616
<ul>
1717
@for (
@@ -20,41 +20,42 @@ <h5 fxLayout="row" fxLayoutAlign="start center" fxLayoutGap="4px">
2020
let ideaIndex = $index, first = $first, last = $last
2121
) {
2222
<li class="idea">
23-
<mat-card appearance="outlined" class="idea-content" fxLayout="row wrap" fxLayoutGap="8px">
24-
<div
25-
class="text-secondary"
26-
fxLayout="column"
27-
fxLayoutAlign="start center"
28-
fxLayoutGap="22px"
29-
>
30-
<span class="mat-subtitle-1">{{ ideaIndex + 1 }}</span>
31-
</div>
32-
<div fxLayout="column" fxLayoutAlign="center start" fxLayoutGap="8px" fxFlex>
33-
<mat-form-field class="idea-input form-field-no-hint" appearance="fill">
34-
<mat-label i18n>Idea name</mat-label>
35-
<input matInput [(ngModel)]="idea.name" (ngModelChange)="inputChanged.next($event)" />
36-
</mat-form-field>
37-
<mat-form-field class="idea-input form-field-no-hint" appearance="fill">
38-
<mat-label i18n>Student-friendly description</mat-label>
39-
<textarea
40-
matInput
41-
[(ngModel)]="idea.text"
42-
(ngModelChange)="inputChanged.next($event)"
43-
cdkTextareaAutosize
23+
<mat-card appearance="outlined" class="idea-content">
24+
<div class="flex flex-row flex-wrap gap-2">
25+
<div class="text-secondary flex flex-col items-center">
26+
<span class="mat-subtitle-1">{{ ideaIndex + 1 }}</span>
27+
</div>
28+
<div class="flex flex-col items-start gap-2 flex-1">
29+
<mat-form-field class="idea-input form-field-no-hint" appearance="fill">
30+
<mat-label i18n>Idea ID</mat-label>
31+
<input
32+
matInput
33+
[(ngModel)]="idea.name"
34+
(ngModelChange)="inputChanged.next($event)"
35+
/>
36+
</mat-form-field>
37+
<mat-form-field class="idea-input form-field-no-hint" appearance="fill">
38+
<mat-label i18n>User-Friendly Name</mat-label>
39+
<textarea
40+
matInput
41+
[(ngModel)]="idea.text"
42+
(ngModelChange)="inputChanged.next($event)"
43+
cdkTextareaAutosize
44+
>
45+
</textarea>
46+
</mat-form-field>
47+
</div>
48+
<div class="flex flex-col items-center">
49+
<button
50+
mat-icon-button
51+
i18n-matTooltip
52+
matTooltip="Delete idea description"
53+
matTooltipPosition="before"
54+
(click)="deleteIdeaDescription(ideaIndex)"
4455
>
45-
</textarea>
46-
</mat-form-field>
47-
</div>
48-
<div fxLayout="column" fxLayoutAlign="start center">
49-
<button
50-
mat-icon-button
51-
i18n-matTooltip
52-
matTooltip="Delete idea description"
53-
matTooltipPosition="before"
54-
(click)="deleteIdeaDescription(ideaIndex)"
55-
>
56-
<mat-icon>clear</mat-icon>
57-
</button>
56+
<mat-icon>clear</mat-icon>
57+
</button>
58+
</div>
5859
</div>
5960
</mat-card>
6061
</li>

‎src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { MatInputModule } from '@angular/material/input';
1212
import { MatTooltipModule } from '@angular/material/tooltip';
1313
import { Subject, Subscription } from 'rxjs';
1414
import { TeacherProjectService } from '../../../../services/teacherProjectService';
15+
import { MatButtonModule } from '@angular/material/button';
1516

1617
@Component({
1718
imports: [
@@ -21,6 +22,7 @@ import { TeacherProjectService } from '../../../../services/teacherProjectServic
2122
MatCardModule,
2223
MatInputModule,
2324
MatFormFieldModule,
25+
MatButtonModule,
2426
MatIconModule,
2527
MatTooltipModule
2628
],

‎src/messages.xlf‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16555,33 +16555,29 @@ Are you ready to receive feedback on this answer?</source>
1655516555
<context context-type="linenumber">284</context>
1655616556
</context-group>
1655716557
</trans-unit>
16558-
<trans-unit id="f5004e5c554bf88457668bcd9b8e8a9074464699" datatype="html">
16559-
<source>Idea Descriptions</source>
16558+
<trans-unit id="c92bbbb092016ebd6979696276584c747b1e783a" datatype="html">
16559+
<source>Idea Names</source>
1656016560
<context-group purpose="location">
1656116561
<context context-type="sourcefile">src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html</context>
1656216562
<context context-type="linenumber">3</context>
1656316563
</context-group>
1656416564
</trans-unit>
16565-
<trans-unit id="402675d4fcc4e288214237ba9744bec97c3262a3" datatype="html">
16566-
<source>Add a new idea description</source>
16565+
<trans-unit id="43212a5b92071b738c8bbb58a3cf4fb72bbeca54" datatype="html">
16566+
<source>Add a new idea name</source>
1656716567
<context-group purpose="location">
1656816568
<context context-type="sourcefile">src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html</context>
1656916569
<context context-type="linenumber">7</context>
1657016570
</context-group>
16571-
<context-group purpose="location">
16572-
<context context-type="sourcefile">src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html</context>
16573-
<context context-type="linenumber">67</context>
16574-
</context-group>
1657516571
</trans-unit>
16576-
<trans-unit id="dac72cc0628c562413f9f404e042ba24ce8d6930" datatype="html">
16577-
<source>Idea #</source>
16572+
<trans-unit id="672eecf8a642d581669798f480109acd8d6d81c7" datatype="html">
16573+
<source>Idea ID</source>
1657816574
<context-group purpose="location">
1657916575
<context context-type="sourcefile">src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html</context>
16580-
<context context-type="linenumber">34</context>
16576+
<context context-type="linenumber">30</context>
1658116577
</context-group>
1658216578
</trans-unit>
16583-
<trans-unit id="6df2ec0ef5de4351acab5ffa0c0d4285e127473a" datatype="html">
16584-
<source>Student-Friendly Description</source>
16579+
<trans-unit id="d9fbeb79d29910e52d4c95efc110f2b88790794b" datatype="html">
16580+
<source>User-Friendly Name</source>
1658516581
<context-group purpose="location">
1658616582
<context context-type="sourcefile">src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html</context>
1658716583
<context context-type="linenumber">38</context>
@@ -16594,15 +16590,18 @@ Are you ready to receive feedback on this answer?</source>
1659416590
<context context-type="linenumber">52</context>
1659516591
</context-group>
1659616592
</trans-unit>
16597-
<trans-unit id="7484685939884481783" datatype="html">
16598-
<source>Are you sure you want to delete this feedback rule?</source>
16593+
<trans-unit id="402675d4fcc4e288214237ba9744bec97c3262a3" datatype="html">
16594+
<source>Add a new idea description</source>
1659916595
<context-group purpose="location">
16600-
<context context-type="sourcefile">src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.ts</context>
16601-
<context context-type="linenumber">70</context>
16596+
<context context-type="sourcefile">src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.html</context>
16597+
<context context-type="linenumber">68</context>
1660216598
</context-group>
16599+
</trans-unit>
16600+
<trans-unit id="7728068163356050294" datatype="html">
16601+
<source>Are you sure you want to delete this idea description?</source>
1660316602
<context-group purpose="location">
16604-
<context context-type="sourcefile">src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.ts</context>
16605-
<context context-type="linenumber">83</context>
16603+
<context context-type="sourcefile">src/assets/wise5/components/common/cRater/edit-crater-idea-descriptions/edit-crater-idea-descriptions.component.ts</context>
16604+
<context context-type="linenumber">87</context>
1660616605
</context-group>
1660716606
</trans-unit>
1660816607
<trans-unit id="5596810972110629301" datatype="html">
@@ -16654,6 +16653,13 @@ Are you ready to receive feedback on this answer?</source>
1665416653
<context context-type="linenumber">76</context>
1665516654
</context-group>
1665616655
</trans-unit>
16656+
<trans-unit id="7484685939884481783" datatype="html">
16657+
<source>Are you sure you want to delete this feedback rule?</source>
16658+
<context-group purpose="location">
16659+
<context context-type="sourcefile">src/assets/wise5/components/common/feedbackRule/edit-feedback-rules/edit-feedback-rules.component.ts</context>
16660+
<context context-type="linenumber">83</context>
16661+
</context-group>
16662+
</trans-unit>
1665716663
<trans-unit id="82efdf880fe90640388310171d05401a6fc62663" datatype="html">
1665816664
<source>Note: this term currently only works in the Dialog Guidance component.</source>
1665916665
<context-group purpose="location">

0 commit comments

Comments
 (0)