diff --git a/src/app/components/admin/admin-container/admin-container.component.html b/src/app/components/admin/admin-container/admin-container.component.html
index 8f5d6dce..f3172600 100755
--- a/src/app/components/admin/admin-container/admin-container.component.html
+++ b/src/app/components/admin/admin-container/admin-container.component.html
@@ -110,7 +110,7 @@
Administration
[src]="
(theme$ | async) === 'light-theme'
? '/assets/img/cmu-red-gray.png'
- : '/assets/img/cmu-red-gray.png'
+ : '/assets/img/sei-logo-gray.png'
"
/>
diff --git a/src/app/components/msel/msel.component.html b/src/app/components/msel/msel.component.html
index afe6828b..58b04026 100755
--- a/src/app/components/msel/msel.component.html
+++ b/src/app/components/msel/msel.component.html
@@ -28,11 +28,11 @@
-
@@ -75,7 +75,7 @@
-
+
+
+
@@ -167,3 +176,15 @@
+
+
+
+
+
diff --git a/src/app/components/msel/msel.component.scss b/src/app/components/msel/msel.component.scss
index a6a70abb..580a3fa0 100755
--- a/src/app/components/msel/msel.component.scss
+++ b/src/app/components/msel/msel.component.scss
@@ -95,3 +95,14 @@
.full-width {
width: 100%;
}
+
+.cmu-logo {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ width: 100%;
+}
+
+.small-logo {
+ width: 300px;
+}
diff --git a/src/app/components/msel/msel.component.ts b/src/app/components/msel/msel.component.ts
index 9e9ece73..44a2641f 100755
--- a/src/app/components/msel/msel.component.ts
+++ b/src/app/components/msel/msel.component.ts
@@ -7,6 +7,7 @@ import { Subject, Observable } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import {
Theme,
+ ComnAuthQuery
} from '@cmusei/crucible-common';
import {
Msel
@@ -60,7 +61,7 @@ export class MselComponent implements OnDestroy {
selectedMselId = '';
sideNavExpanded = true;
fontIconList = new Map([
- ['Info', 'mdi-information-outline'],
+ ['Info', 'mdi-note-outline'],
['Teams', 'mdi-account-group-outline'],
['Data Fields', 'mdi-view-column-outline'],
['Organizations', 'mdi-office-building-outline'],
@@ -71,6 +72,7 @@ export class MselComponent implements OnDestroy {
['Events', 'mdi-chart-timeline'],
['Exercise View', 'mdi-eye-outline'],
]);
+ theme$: Observable;
constructor(
private activatedRoute: ActivatedRoute,
@@ -90,8 +92,10 @@ export class MselComponent implements OnDestroy {
private scenarioEventDataService: ScenarioEventDataService,
private teamDataService: TeamDataService,
private uiDataService: UIDataService,
- private userMselRoleDataService: UserMselRoleDataService
+ private userMselRoleDataService: UserMselRoleDataService,
+ private authQuery: ComnAuthQuery
) {
+ this.theme$ = this.authQuery.userTheme$;
// subscribe to route changes
this.activatedRoute.queryParamMap.pipe(takeUntil(this.unsubscribe$)).subscribe(params => {
// load the selected MSEL data
@@ -138,7 +142,7 @@ export class MselComponent implements OnDestroy {
}
tabChange(tabName: string) {
- if (tabName === '<< Back') {
+ if (tabName === 'Back') {
this.uiDataService.setMselTab(this.defaultTab);
this.router.navigate([], {
queryParams: { }
diff --git a/src/assets/img/sei-logo-gray.png b/src/assets/img/sei-logo-gray.png
new file mode 100644
index 00000000..bb346f2a
Binary files /dev/null and b/src/assets/img/sei-logo-gray.png differ