Merge pull request #83 from microsoft/dev

Merging feature improvement to multi-select, better printing, and dependabot updates
This commit is contained in:
Alex Li 2022-04-22 10:48:21 -07:00 коммит произвёл GitHub
Родитель 5f78c1526f e0f4590120
Коммит 2b15eb5bba
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 30 добавлений и 5 удалений

Просмотреть файл

@ -14,7 +14,7 @@
[fixedInViewport]="true"
[fixedTopGap]="64"
position="end"
hasBackdrop="true" (keydown)="closeSidenav()">
hasBackdrop="true" (keydown)="closeSidenav()">
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('about')">Project Charter</button></div>
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('howto')">How to use this site</button></div>
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('download')">Download Data</button></div>
@ -22,6 +22,7 @@
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('changelog')">Change Log</button></div>
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('credits')">Credits</button></div>
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('disclaimer')">Disclaimer</button></div>
<div><button class="menu-button" mat-raised-button (click)="dialogsService.openDialog('feedback')">Send Feedback</button></div>
<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>
<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>
</mat-sidenav>

Просмотреть файл

@ -68,7 +68,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FlexLayoutModule } from '@angular/flex-layout';
import { injectHighlightBodyPipe, injectHighlightSectionPipe, getCommentTextPipe } from './pipes/HighlightPipe';
import { getNodeColorPipe, getNodeIconPipe, getNodeIconAltPipe, getBodyPipe, getSectionPipe, getConnectionsTextPipe } from './pipes/NodePipe';
import { formatDatePipe } from './pipes/FormatDatePipe'
import { formatDatePipe } from './pipes/FormatDatePipe'
import { FeedbackDialogComponent } from './dialogs/feedback-dialog.component';
@NgModule({
imports: [
@ -130,6 +131,7 @@ import { formatDatePipe } from './pipes/FormatDatePipe'
PurchaseDialogComponent,
ErrorsDialogComponent,
CharterContentComponent,
FeedbackDialogComponent,
MultiSelectRegsDialogComponent
],
declarations: [
@ -151,6 +153,7 @@ import { formatDatePipe } from './pipes/FormatDatePipe'
GraphComponent,
CharterContentComponent,
MultiSelectRegsDialogComponent,
FeedbackDialogComponent,
injectHighlightBodyPipe,
injectHighlightSectionPipe,

Просмотреть файл

@ -11,6 +11,7 @@ import { HowToDialogComponent } from './dialogs/howto-dialog.component';
import { ErrorsDialogComponent } from './dialogs/errors-dialog.component';
import { PurchaseDialogComponent } from './dialogs/purchase-dialog.component';
import { MultiSelectRegsDialogComponent } from './dialogs/multi-select-regs-dialog.component';
import { FeedbackDialogComponent } from './dialogs/feedback-dialog.component';
import { CookieService } from 'ngx-cookie-service';
@ -39,6 +40,7 @@ export class DialogsService {
case 'purchase': dialogType = PurchaseDialogComponent; break;
case 'errors': dialogType = ErrorsDialogComponent; break;
case 'multi-select-reg': dialogType = MultiSelectRegsDialogComponent; break;
case 'feedback': dialogType = FeedbackDialogComponent; break;
}

Просмотреть файл

@ -1,11 +1,11 @@
<h2 mat-dialog-title>Credits</h2>
<h2 mat-dialog-title>Credits</h2>
<mat-dialog-content class="mat-typography">
<ul style="list-style-type:none">
<li><span><strong>Project Sponsor:</strong> Microsoft</span></li>
<li><span><strong>Project Lead:</strong> Alex Li</span></li>
<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>
<li><span><strong>Data Curators:</strong> Alex Li, Lanx Goh, and Eric Lachaud</span></li>
<li><span><strong>Code Committers:</strong> Alex Li and Benjamin Wong</span></li>
<li><span><strong>Data Curators:</strong> Joyce Chua, Eric Lachaud, Alex Li, and James Wong</span></li>
<li><span><strong>Code Committers:</strong> Alex Li</span></li>
</ul>
</mat-dialog-content>
<mat-dialog-actions align="end">

Просмотреть файл

@ -0,0 +1,10 @@
<h2 mat-dialog-title>Feedback</h2>
<mat-dialog-content class="mat-typography">
<p>
Data Protection Mapping Project welcomes all feedback from the community.
</p>
<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>
</mat-dialog-content>
<mat-dialog-actions align="end">
<button mat-button [mat-dialog-close]="true" cdkFocusInitial>Ok</button>
</mat-dialog-actions>

Просмотреть файл

@ -0,0 +1,9 @@
import { Component, OnInit, Input } from '@angular/core';
@Component({
selector: 'feedback-dialog',
templateUrl: './feedback-dialog.component.html'
})
export class FeedbackDialogComponent {
}