Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Client
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
Resin
Client
Merge requests
!95
Feat/post tags
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Feat/post tags
feat/post-tags
into
dev
Overview
6
Commits
11
Pipelines
0
Changes
30
Merged
Hugo SUBTIL
requested to merge
feat/post-tags
into
dev
4 years ago
Overview
6
Commits
11
Pipelines
0
Changes
30
Expand
0
0
Merge request reports
Compare
dev
version 3
01e7ffdc
4 years ago
version 2
aa29472d
4 years ago
version 1
39c73b93
4 years ago
dev (base)
and
latest version
latest version
878348fd
11 commits,
4 years ago
version 3
01e7ffdc
10 commits,
4 years ago
version 2
aa29472d
8 commits,
4 years ago
version 1
39c73b93
7 commits,
4 years ago
30 files
+
888
−
54
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
30
Search (e.g. *.vue) (Ctrl+P)
src/app/header/header.component.html
+
4
−
8
Options
@@ -9,14 +9,10 @@
<app-svg-icon
(click)=
"openMenu()"
[type]=
"'ico'"
[icon]=
"'menu'"
[iconClass]=
"'icon-32'"
></app-svg-icon>
</div>
<div
fxLayout=
"row"
class=
"right-header"
fxLayoutAlign=
"center center"
fxLayoutGap=
"3vw"
>
<a
routerLink=
"/home"
[routerLinkActive]=
"'active'"
i18n
>
Les acteurs
</a>
<a
routerLink=
"/news"
[routerLinkActive]=
"'active'"
i18n
>
Actualités
</a>
<a
routerLink=
"/home"
[routerLinkActive]=
"'active'"
i18n
>
Cartographie de acteurs
</a>
<a
routerLink=
"/about"
[routerLinkActive]=
"'active'"
i18n
>
Qui sommes-nous ?
</a>
<!-- <a routerLink="/news" [routerLinkActive]="'active'" i18n>Actualités</a> -->
<!-- <a routerLink="/resources" [routerLinkActive]="'active'" i18n>Ressources</a> -->
<a
*ngIf=
"isAdmin"
routerLink=
"/admin"
[routerLinkActive]=
"'active'"
>
Administration
</a>
<!-- <a *ngIf="isLoggedIn" routerLink="/profile" [routerLinkActive]="'active'" fxLayout="row" fxLayoutGap="1.5vh">
<app-svg-icon [type]="'ico'" [iconClass]="'icon-32'" [icon]="'user'" [iconColor]="'currentColor'"></app-svg-icon>
</a> -->
<button
*ngIf=
"isLoggedIn"
class=
"red"
routerLink=
"/profile"
[routerLinkActive]=
"'active'"
>
{{ displayName }}
</button>
@@ -32,7 +28,8 @@
<div
(click)=
"closeMenu()"
class=
"ico-close-details"
></div>
</div>
<div
fxLayout=
"column"
class=
"right-header"
fxLayoutAlign=
"none baseline"
fxLayoutGap=
"5vw"
>
<a
routerLink=
"/home"
[routerLinkActive]=
"'active'"
(click)=
"closeMenu()"
i18n
>
Les acteurs
</a>
<a
routerLink=
"/news"
[routerLinkActive]=
"'active'"
(click)=
"closeMenu()"
i18n
>
Actualités
</a>
<a
routerLink=
"/home"
[routerLinkActive]=
"'active'"
(click)=
"closeMenu()"
i18n
>
Cartographie de acteurs
</a>
<a
routerLink=
"/about"
[routerLinkActive]=
"'active'"
i18n
>
Qui sommes-nous ?
</a>
<a
*ngIf=
"isAdmin"
routerLink=
"/admin"
[routerLinkActive]=
"'active'"
(click)=
"closeMenu()"
>
Administration
</a>
</div>
@@ -47,7 +44,6 @@
</div>
<app-signup-modal
*ngIf=
"displaySignUp"
[openned]=
"isPopUpOpen"
(closed)=
"closeSignUpModal($event)"
></app-signup-modal>
<!-- <app-signin-modal *ngIf="!displaySignUp" [openned]="isPopUpOpen" (closed)="closeSignInModal()"></app-signin-modal> -->
<ng-template
#customTitle
>
<img
class=
"desktop-show logo-grand-lyon"
src=
"/assets/logos/resin.svg"
alt
/>
Loading