Skip to content

Commit 9e9295e

Browse files
committed
SF-3508 Use mat-card to show draft progress in new draft history UI
1 parent af723c5 commit 9e9295e

File tree

2 files changed

+24
-47
lines changed

2 files changed

+24
-47
lines changed

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.html

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -206,34 +206,32 @@ <h1>
206206
@if (isPreviewSupported) {
207207
@if (draftJob != null) {
208208
@if (isDraftInProgress(draftJob) && featureFlags.newDraftHistory.enabled) {
209-
<mat-expansion-panel [expanded]="true" [hideToggle]="true" [disabled]="true">
210-
<mat-expansion-panel-header>
211-
<mat-panel-title>
209+
<mat-card class="draft-progress-card">
210+
<mat-card-header>
211+
<mat-card-title>
212212
@if (isDraftQueued(draftJob)) {
213213
@if (isSyncing()) {
214-
<span class="title">{{ t("draft_syncing") }}</span>
214+
{{ t("draft_syncing") }}
215215
} @else {
216-
<span class="title">{{ t("draft_queued_header") }}</span>
217-
@if (hasDraftQueueDepth(draftJob)) {
218-
<span class="subtitle">{{
219-
t("draft_queued_multiple", { count: draftJob.queueDepth })
220-
}}</span>
221-
}
216+
{{ t("draft_queued_header") }}
222217
}
223218
} @else if (isDraftActive(draftJob)) {
224-
<span class="title">{{ t("draft_active_header") }}</span>
225-
<span class="subtitle">{{
226-
t("draft_percent_complete", { percent: draftJob.percentCompleted | l10nPercent })
227-
}}</span>
219+
{{ t("draft_active_header") }}
228220
} @else if (isDraftFinishing(draftJob)) {
229-
<span class="title"> {{ t("draft_finishing_header") }}</span>
221+
{{ t("draft_finishing_header") }}
230222
}
231-
</mat-panel-title>
232-
<mat-panel-description>
223+
233224
{{ getTranslationScriptureRange(draftJob) }}
234-
</mat-panel-description>
235-
</mat-expansion-panel-header>
236-
<div class="progress-wrapper">
225+
</mat-card-title>
226+
<mat-card-subtitle>
227+
@if (hasDraftQueueDepth(draftJob)) {
228+
{{ t("draft_queued_multiple", { count: draftJob.queueDepth }) }}
229+
} @else if (isDraftActive(draftJob)) {
230+
{{ t("draft_percent_complete", { percent: draftJob.percentCompleted | l10nPercent }) }}
231+
}
232+
</mat-card-subtitle>
233+
</mat-card-header>
234+
<mat-card-content class="progress-wrapper">
237235
<mat-progress-bar
238236
[mode]="
239237
draftJob.percentCompleted === 0 && !isDraftActive(draftJob) ? 'indeterminate' : 'determinate'
@@ -245,8 +243,8 @@ <h1>
245243
{{ t("cancel_generation_button") }}
246244
</button>
247245
}
248-
</div>
249-
</mat-expansion-panel>
246+
</mat-card-content>
247+
</mat-card>
250248
} @else if (!featureFlags.newDraftHistory.enabled) {
251249
@if (isDraftQueued(draftJob)) {
252250
<section>

src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-generation.component.scss

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -181,39 +181,18 @@ section {
181181
gap: 0.5em;
182182
}
183183

184-
mat-expansion-panel-header {
185-
color: var(--mat-expansion-header-text-color, var(--mat-app-on-surface)) !important;
186-
}
187-
188-
mat-panel-title {
189-
display: flex;
190-
align-items: start;
191-
flex-direction: column;
192-
flex: 0 1 auto;
193-
194-
.title {
195-
color: var(
196-
--mat-expansion-header-text-color,
197-
var(--mat-app-on-surface)
198-
); /* Keep the text color, even when disabled */
184+
.draft-progress-card {
185+
mat-card-title {
199186
font-size: 1.1em;
187+
font-weight: 500;
200188
}
201189

202-
.subtitle {
190+
mat-card-subtitle {
203191
font-size: 0.9em;
204192
color: var(--draft-history-entry-subtitle-color);
205193
}
206194
}
207195

208-
mat-panel-description {
209-
font-weight: normal;
210-
display: -webkit-box;
211-
-webkit-box-orient: vertical;
212-
-webkit-line-clamp: 2;
213-
line-clamp: 2;
214-
overflow: hidden;
215-
}
216-
217196
.progress-wrapper {
218197
display: flex;
219198
align-items: center;

0 commit comments

Comments
 (0)