Skip to content

Commit efcc413

Browse files
committed
Remove the frontend annotation-tableau middleman
1 parent e8df728 commit efcc413

6 files changed

Lines changed: 39 additions & 73 deletions

File tree

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,37 @@
1-
<ul ngbNav #nav="ngbNav" [(activeId)]="active" class="nav-tabs flex-nowrap">
2-
<li [ngbNavItem]="1">
3-
<button ngbNavLink>
4-
<fa-icon
5-
[icon]="faSquarePollHorizontal"
6-
class="me-2"
7-
aria-hidden="true"
8-
/>
9-
<span i18n>Syntactic parses</span>
10-
</button>
11-
<ng-template ngbNavContent>
12-
<la-annotation-parse-results />
13-
</ng-template>
14-
</li>
15-
<li [ngbNavItem]="2">
16-
<button ngbNavLink>
17-
<fa-icon [icon]="faTree" class="me-2" aria-hidden="true" />
18-
<span i18n>Tableau / Proof</span>
19-
</button>
20-
<ng-template ngbNavContent>
21-
<la-annotation-tableau />
22-
</ng-template>
23-
</li>
24-
<li [ngbNavItem]="3">
25-
<button ngbNavLink>
26-
<fa-icon [icon]="faPenNib" class="me-2" aria-hidden="true" />
27-
<span i18n>Comments / History</span>
28-
</button>
29-
<ng-template ngbNavContent>
30-
<la-annotation-comments />
31-
</ng-template>
32-
</li>
33-
</ul>
34-
35-
<div [ngbNavOutlet]="nav" class="mt-2"></div>
1+
<ul ngbNav #nav="ngbNav" [(activeId)]="active" class="nav-tabs flex-nowrap">
2+
<li [ngbNavItem]="1">
3+
<button ngbNavLink>
4+
<fa-icon
5+
[icon]="faSquarePollHorizontal"
6+
class="me-2"
7+
aria-hidden="true"
8+
/>
9+
<span i18n>Syntactic parses</span>
10+
</button>
11+
<ng-template ngbNavContent>
12+
<la-annotation-parse-results />
13+
</ng-template>
14+
</li>
15+
<li [ngbNavItem]="2">
16+
<button ngbNavLink>
17+
<fa-icon [icon]="faTree" class="me-2" aria-hidden="true" />
18+
<span i18n>Tableau / Proof</span>
19+
</button>
20+
<ng-template ngbNavContent>
21+
<section>
22+
<la-tableau-svg></la-tableau-svg>
23+
</section>
24+
</ng-template>
25+
</li>
26+
<li [ngbNavItem]="3">
27+
<button ngbNavLink>
28+
<fa-icon [icon]="faPenNib" class="me-2" aria-hidden="true" />
29+
<span i18n>Comments / History</span>
30+
</button>
31+
<ng-template ngbNavContent>
32+
<la-annotation-comments />
33+
</ng-template>
34+
</li>
35+
</ul>
36+
37+
<div [ngbNavOutlet]="nav" class="mt-2"></div>

frontend/src/app/annotate/annotation-menu/annotation-menu.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
faPenNib,
88
} from "@fortawesome/free-solid-svg-icons";
99
import { AnnotationParseResultsComponent } from "../annotation-parse-results/annotation-parse-results.component";
10-
import { AnnotationTableauComponent } from "../annotation-tableau/annotation-tableau.component";
10+
import { TableauSVG } from '../tableau-svg/tableau-svg.component';
1111
import { AnnotationCommentsComponent } from "../annotation-comments/annotation-comments.component";
1212

1313
@Component({
@@ -17,7 +17,7 @@ import { AnnotationCommentsComponent } from "../annotation-comments/annotation-c
1717
NgbNavModule,
1818
FontAwesomeModule,
1919
AnnotationParseResultsComponent,
20-
AnnotationTableauComponent,
20+
TableauSVG,
2121
AnnotationCommentsComponent,
2222
],
2323
templateUrl: "./annotation-menu.component.html",

frontend/src/app/annotate/annotation-tableau/annotation-tableau.component.html

Lines changed: 0 additions & 3 deletions
This file was deleted.

frontend/src/app/annotate/annotation-tableau/annotation-tableau.component.scss

Whitespace-only changes.

frontend/src/app/annotate/annotation-tableau/annotation-tableau.component.spec.ts

Lines changed: 0 additions & 22 deletions
This file was deleted.

frontend/src/app/annotate/annotation-tableau/annotation-tableau.component.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)