diff --git a/apps/maarch_entreprise/Views/about-us.component.html b/apps/maarch_entreprise/Views/about-us.component.html
index 054c0cb60eb148871543d5989067b42bbcb302fe..3bf4aebeef8388c61905e8e76f34b5e5684b8796 100755
--- a/apps/maarch_entreprise/Views/about-us.component.html
+++ b/apps/maarch_entreprise/Views/about-us.component.html
@@ -1,18 +1,4 @@
<div class="admin-container" [class.admin-is-mobile]="mobileQuery.matches">
- <mat-toolbar color="primary" class="admin-toolbar">
- <button mat-icon-button (click)="snav.toggle()" *ngIf="mobileMode">
- <mat-icon class="fa fa-bars fa-2x"></mat-icon>
- </button>
- <button mat-button (click)="snav.toggle()" *ngIf="!mobileMode">
- <mat-icon class="maarchLogo" [svgIcon]="mobileQuery.matches ? 'maarchLogoOnly' : 'maarchLogo'"></mat-icon>
- </button>
- <h1 class="admin-toolbar-title">{{lang.aboutUs}}
- <!-- <small [class.hide-for-mobile]="mobileQuery.matches">{{user.firstname}} {{user.lastname}}</small> -->
- </h1>
- <span style="flex: 1 1 auto;"></span>
- <search-home></search-home>
- <menu-top></menu-top>
- </mat-toolbar>
<mat-sidenav-container class="admin-sidenav-container" [style.marginTop.px]="mobileMode ? 56 : 0">
<mat-sidenav #snav [mode]="mobileMode ? 'over' : 'side'" [fixedInViewport]="mobileMode" fixedTopGap="56" [opened]="mobileMode ? false : true"
autoFocus="false">
diff --git a/apps/maarch_entreprise/Views/home.component.html b/apps/maarch_entreprise/Views/home.component.html
index c9272c51fdc4e1b540bc91c299430c8732055ea1..c81fa23e8c27c0f1c51b5e84a39bcc2a30bdbf2e 100755
--- a/apps/maarch_entreprise/Views/home.component.html
+++ b/apps/maarch_entreprise/Views/home.component.html
@@ -13,12 +13,17 @@
</div>
<mat-card class="card-app-content">
<mat-card id="viewThumbnail" style="display:none;position: absolute;z-index: 2;height: 600px;width: 400px;"></mat-card>
- <mat-card style="display: flex">
- <div *ngIf="!mobileMode" style="text-align:center;flex: 1;background: url(static.php?filename=logo_only.svg);background-size: auto auto;height: 70px;background-size: 100%;background-repeat: no-repeat;background-position: center;">
+ <mat-card>
+ <div style="display: flex">
+ <div *ngIf="!mobileMode" style="text-align:center;flex: 1;background: url(static.php?filename=logo_only.svg);background-size: auto auto;height: 70px;background-size: 100%;background-repeat: no-repeat;background-position: center;">
+ </div>
+ <div style="flex:10;padding-left: 10px;">
+ <span [innerHTML]="lang.welcomeInGEC"></span>
+ <b>{{currentDate}}</b>.
+ </div>
</div>
- <div style="flex:10;padding-left: 10px;">
- <span [innerHTML]="lang.welcomeInGEC"></span>
- <b>{{currentDate}}</b>.
+ <div style="text-align: right;opacity: 0.5;">
+ <button mat-button routerLink="/about-us" style="position:absolute;font-size:10px;right: 0px;bottom: 0px;">{{lang.aboutUs}}</button>
</div>
</mat-card>
@@ -32,7 +37,8 @@
<i class="fa fa-calendar" title="date d'enregistrement"></i> {{row.creation_date | timeAgo}}
</div>
<div style="overflow: hidden;text-overflow: ellipsis;">
- <mat-icon [ngStyle]="{'color': row.priority_color}" color="primary" class="{{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}} {{row.status_icon}} {{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}}-2x" title="{{row.status_label}}"></mat-icon>
+ <mat-icon [ngStyle]="{'color': row.priority_color}" color="primary" class="{{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}} {{row.status_icon}} {{row.status_icon.charAt(0)}}{{row.status_icon.charAt(1)}}-2x"
+ title="{{row.status_label}}"></mat-icon>
</div>
<div style="padding-top: 5px;color: rgba(0,0,0,0.4);font-size: 90%;overflow: hidden;text-overflow: ellipsis;">
{{row.alt_identifier}}
@@ -85,7 +91,7 @@
</div>
<div>
<button mat-icon-button (click)="$event.stopPropagation();goTo(row);" (mouseenter)="viewThumbnail(row);" (mouseleave)="closeThumbnail();">
- <mat-icon color="primary" class="fa fa-eye" ></mat-icon>
+ <mat-icon color="primary" class="fa fa-eye"></mat-icon>
</button>
</div>
</td>
diff --git a/apps/maarch_entreprise/Views/menuNav.component.html b/apps/maarch_entreprise/Views/menuNav.component.html
index 6417e57094cf82aef2ab326d2b94945e35848b90..70c8263a70e13cd2157a44fc925595ce5abd9f0b 100644
--- a/apps/maarch_entreprise/Views/menuNav.component.html
+++ b/apps/maarch_entreprise/Views/menuNav.component.html
@@ -1,4 +1,4 @@
-<mat-nav-list *ngIf="router.url != '/home' && router.url != '/administration' && router.url.indexOf('/basketList') == -1">
+<mat-nav-list *ngIf="router.url != '/home' && router.url != '/about-us' && router.url != '/administration' && router.url.indexOf('/basketList') == -1">
<a mat-list-item (click)="backClicked()">
<mat-icon color="primary" mat-list-icon class="fa fa-chevron-left"></mat-icon>
<p mat-line>
@@ -6,4 +6,4 @@
</p>
</a>
</mat-nav-list>
-<mat-divider *ngIf="router.url != '/home' && router.url != '/administration' && router.url.indexOf('/basketList') == -1"></mat-divider>
\ No newline at end of file
+<mat-divider *ngIf="router.url != '/home' && router.url != '/about-us' && router.url != '/administration' && router.url.indexOf('/basketList') == -1"></mat-divider>
\ No newline at end of file
diff --git a/apps/maarch_entreprise/js/angular/app/about-us.component.ts b/apps/maarch_entreprise/js/angular/app/about-us.component.ts
index 07ec8275ad6afbd332432dad8463d39eacfb8239..e185ceed6c0031cce6a9f733522cb207eb7fefd5 100755
--- a/apps/maarch_entreprise/js/angular/app/about-us.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/about-us.component.ts
@@ -17,7 +17,12 @@ declare var angularGlobals: any;
styleUrls: ['../../../css/profile.component.css'],
providers: [NotificationService]
})
-export class AboutUsComponent extends AutoCompletePlugin implements OnInit {
+export class AboutUsComponent implements OnInit {
+
+ /*HEADER*/
+ titleHeader : string;
+ @ViewChild('snav') public sidenavLeft : MatSidenav;
+ @ViewChild('snav2') public sidenavRight : MatSidenav;
private _mobileQueryListener: () => void;
mobileQuery: MediaQueryList;
@@ -28,12 +33,8 @@ export class AboutUsComponent extends AutoCompletePlugin implements OnInit {
loading: boolean = false;
- @ViewChild('snav2') sidenav: MatSidenav;
-
- @ViewChildren(MatExpansionPanel) viewPanels: QueryList<MatExpansionPanel>;
constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher, public http: HttpClient, public dialog: MatDialog) {
- super(http, ['users']);
this.mobileMode = angularGlobals.mobileMode;
$j("link[href='merged_css.php']").remove();
this.mobileQuery = media.matchMedia('(max-width: 768px)');
@@ -41,23 +42,11 @@ export class AboutUsComponent extends AutoCompletePlugin implements OnInit {
this.mobileQuery.addListener(this._mobileQueryListener);
}
- prepareProfile() {
- $j('#inner_content').remove();
- $j('#inner_content_contact').parent('div').remove();
- $j('#inner_content_contact').remove();
- $j('#menunav').hide();
- $j('#divList').remove();
- $j('#magicContactsTable').remove();
- $j('#manageBasketsOrderTable').remove();
- $j('#controlParamTechnicTable').remove();
- $j('#container').width("99%");
- if ($j('#content h1')[0] && $j('#content h1')[0] != $j('my-app h1')[0]) {
- $j('#content h1')[0].remove();
- }
- }
-
ngOnInit(): void {
- this.prepareProfile();
+ window['MainHeaderComponent'].refreshTitle(this.lang.aboutUs);
+ window['MainHeaderComponent'].setSnav(this.sidenavLeft);
+ window['MainHeaderComponent'].setSnavRight(null);
+
this.coreUrl = angularGlobals.coreUrl;
this.applicationMinorVersion = angularGlobals.applicationMinorVersion;
this.loading = false;