Skip to content

Commit 2b15eb5

Browse files
authored
Merge pull request #83 from microsoft/dev
Merging feature improvement to multi-select, better printing, and dependabot updates
2 parents 5f78c15 + e0f4590 commit 2b15eb5

File tree

6 files changed

+30
-5
lines changed

6 files changed

+30
-5
lines changed

src/app/app.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
[fixedInViewport]="true"
1515
[fixedTopGap]="64"
1616
position="end"
17-
hasBackdrop="true" (keydown)="closeSidenav()">
17+
hasBackdrop="true" (keydown)="closeSidenav()">
1818
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('about')">Project Charter</button></div>
1919
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('howto')">How to use this site</button></div>
2020
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('download')">Download Data</button></div>
2121
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('contribute')">Data Contribution</button></div>
2222
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('changelog')">Change Log</button></div>
2323
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('credits')">Credits</button></div>
2424
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('disclaimer')">Disclaimer</button></div>
25+
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('feedback')">Send Feedback</button></div>
2526
<div class="padded-container"><a href="https://github.com/microsoft/data-protection-mapping-project" target="_blank"><img class="centered-image" src="assets/icons/github-black.svg" alt="GitHub Repository" /></a></div>
2627
<div class="padded-container"><a href="https://www.linkedin.com/company/dpmap" target="_blank"><img class="centered-image" src="assets/icons/LinkedIn_logo_In-Black.svg" alt="Project Linkedin Page" /></a></div>
2728
</mat-sidenav>

src/app/app.module.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
6868
import { FlexLayoutModule } from '@angular/flex-layout';
6969
import { injectHighlightBodyPipe, injectHighlightSectionPipe, getCommentTextPipe } from './pipes/HighlightPipe';
7070
import { getNodeColorPipe, getNodeIconPipe, getNodeIconAltPipe, getBodyPipe, getSectionPipe, getConnectionsTextPipe } from './pipes/NodePipe';
71-
import { formatDatePipe } from './pipes/FormatDatePipe'
71+
import { formatDatePipe } from './pipes/FormatDatePipe'
72+
import { FeedbackDialogComponent } from './dialogs/feedback-dialog.component';
7273

7374
@NgModule({
7475
imports: [
@@ -130,6 +131,7 @@ import { formatDatePipe } from './pipes/FormatDatePipe'
130131
PurchaseDialogComponent,
131132
ErrorsDialogComponent,
132133
CharterContentComponent,
134+
FeedbackDialogComponent,
133135
MultiSelectRegsDialogComponent
134136
],
135137
declarations: [
@@ -151,6 +153,7 @@ import { formatDatePipe } from './pipes/FormatDatePipe'
151153
GraphComponent,
152154
CharterContentComponent,
153155
MultiSelectRegsDialogComponent,
156+
FeedbackDialogComponent,
154157

155158
injectHighlightBodyPipe,
156159
injectHighlightSectionPipe,

src/app/dialogs.service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { HowToDialogComponent } from './dialogs/howto-dialog.component';
1111
import { ErrorsDialogComponent } from './dialogs/errors-dialog.component';
1212
import { PurchaseDialogComponent } from './dialogs/purchase-dialog.component';
1313
import { MultiSelectRegsDialogComponent } from './dialogs/multi-select-regs-dialog.component';
14+
import { FeedbackDialogComponent } from './dialogs/feedback-dialog.component';
1415

1516
import { CookieService } from 'ngx-cookie-service';
1617

@@ -39,6 +40,7 @@ export class DialogsService {
3940
case 'purchase': dialogType = PurchaseDialogComponent; break;
4041
case 'errors': dialogType = ErrorsDialogComponent; break;
4142
case 'multi-select-reg': dialogType = MultiSelectRegsDialogComponent; break;
43+
case 'feedback': dialogType = FeedbackDialogComponent; break;
4244

4345
}
4446

src/app/dialogs/credits-dialog.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<h2 mat-dialog-title>Credits</h2>
1+
<h2 mat-dialog-title>Credits</h2>
22
<mat-dialog-content class="mat-typography">
33
<ul style="list-style-type:none">
44
<li><span><strong>Project Sponsor:</strong> Microsoft</span></li>
55
<li><span><strong>Project Lead:</strong> Alex Li</span></li>
66
<li><span><strong>Original Mapping Contributors:</strong> ISO/IEC JTC 1 SC27 for GDPR; Alex Li, Alec Christie and his Digital Law team (currently at Mills Oakley)</span></li>
7-
<li><span><strong>Data Curators:</strong> Alex Li, Lanx Goh, and Eric Lachaud</span></li>
8-
<li><span><strong>Code Committers:</strong> Alex Li and Benjamin Wong</span></li>
7+
<li><span><strong>Data Curators:</strong> Joyce Chua, Eric Lachaud, Alex Li, and James Wong</span></li>
8+
<li><span><strong>Code Committers:</strong> Alex Li</span></li>
99
</ul>
1010
</mat-dialog-content>
1111
<mat-dialog-actions align="end">
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<h2 mat-dialog-title>Feedback</h2>
2+
<mat-dialog-content class="mat-typography">
3+
<p>
4+
Data Protection Mapping Project welcomes all feedback from the community.
5+
</p>
6+
<p>Please let us know what you think and how we can improve by <a href="https://www.linkedin.com/company/dpmap" target="_blank">LinkedIn</a> or email to <a href="mailto:c8b7f414.microsoft.com@amer.teams.ms">c8b7f414.microsoft.com@amer.teams.ms</a></p>
7+
</mat-dialog-content>
8+
<mat-dialog-actions align="end">
9+
<button mat-button [mat-dialog-close]="true" cdkFocusInitial>Ok</button>
10+
</mat-dialog-actions>
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { Component, OnInit, Input } from '@angular/core';
2+
3+
@Component({
4+
selector: 'feedback-dialog',
5+
templateUrl: './feedback-dialog.component.html'
6+
})
7+
export class FeedbackDialogComponent {
8+
9+
}

0 commit comments

Comments
 (0)