Skip to content

Commit

Permalink
Merge branch 'designer-ui-bugfixes' into 'main'
Browse files Browse the repository at this point in the history
Designer UI bugfixes

See merge request reportcreator/reportcreator!356
  • Loading branch information
MWedl committed Nov 30, 2023
2 parents fc4cb29 + 673ab36 commit 38fd8f1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 4 deletions.
8 changes: 8 additions & 0 deletions frontend/src/components/Design/LayoutComponentForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
v-model="form.headline.text"
label="Headline"
:disabled="props.disabled"
spellcheck="false"
class="mb-4"
/>
<s-select
Expand Down Expand Up @@ -49,6 +50,7 @@
label="Markdown Variable"
hint="Variable name of report or finding field (e.g. report.executive_summary, finding.description)"
:disabled="props.disabled"
spellcheck="false"
class="mb-4"
/>
</div>
Expand All @@ -64,19 +66,22 @@
v-model="form.chart.caption"
label="Caption"
:disabled="props.disabled"
spellcheck="false"
class="mb-4"
/>
</div>
<div v-if="form.form === 'footer-create'">
<s-text-field
v-model="form.footer.textLeft"
label="Footer Text Left (optional)"
spellcheck="false"
class="mb-4"
:disabled="props.disabled"
/>
<s-text-field
v-model="form.footer.textCenter"
label="Footer Text Center (optional)"
spellcheck="false"
class="mb-4"
:disabled="props.disabled"
/>
Expand Down Expand Up @@ -108,6 +113,7 @@
v-model="form.header.backgroundColor"
label="Header background color (optional)"
hint="CSS value: #ff0000 or rgb(255, 0, 0) or red"
spellcheck="false"
class="mb-4"
:disabled="props.disabled"
/>
Expand All @@ -116,6 +122,7 @@
<s-text-field
v-model="form.toc.headline"
label="Headline"
spellcheck="false"
class="mb-4"
:disabled="props.disabled"
/>
Expand All @@ -139,6 +146,7 @@
v-model="form.findingList.headline"
label="Chapter Headline"
:disabled="props.disabled"
spellcheck="false"
class="mb-4"
/>
<s-select
Expand Down
10 changes: 6 additions & 4 deletions frontend/src/components/Design/designer-components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,9 @@ export class FindingsChapterComponent extends DesignerComponentBase {
htmlHeader = trimLeadingWhitespace(`
<table class="finding-header">
<thead>
<th colspan="2" class="finding-header-key text-center"><h2 :id="finding.id" class="in-toc">{{ finding.title }}</h2></th>
<tr>
<th colspan="2" class="finding-header-key text-center"><h2 :id="finding.id" class="in-toc">{{ finding.title }}</h2></th>
</tr>
</thead>
<tbody>
<tr>
Expand All @@ -565,9 +567,9 @@ export class FindingsChapterComponent extends DesignerComponentBase {
<td>
<markdown v-if="finding.affected_components.length == 1" :text="finding.affected_components[0]" class="markdown-inline" />
<ul v-else class="location-ul">
<template v-for="component in finding.affected_components">
<li><markdown :text="component" class="markdown-inline" /></li>
</template>
<li v-for="component in finding.affected_components">
<markdown :text="component" class="markdown-inline" />
</li>
</ul>
</td>
</tr>
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/Markdown/Field.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ function onControlClick() {
.v-field__input {
padding: 0 1px !important;
cursor: initial !important;
row-gap: 0;
}
</style>

0 comments on commit 38fd8f1

Please sign in to comment.