Commit 8159eace authored by Jean-François LOTHEAL's avatar Jean-François LOTHEAL
Browse files

Merge branch 'DOS0141194' into 'master'

CSS modification

See merge request !139
parents d4924ac4 4322d0b2
Pipeline #16153 passed with stage
in 7 minutes and 12 seconds
This diff is collapsed.
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p *ngIf="intro">{{ intro }}</p>
<p *ngIf="intro" class="chapo">{{ intro }}</p>
</div>
<div class="main-content">
<div class="filter-button-touch column is-hidden-desktop"
......
......@@ -22,10 +22,6 @@ $sticky-distance: $header-bar-height + 32px;
margin-bottom: 0rem;
border-radius: 8px;
box-shadow: 0px 6px 12px rgb(129 128 128 / 10%);
p {
padding-bottom:2em;
}
}
@media (max-width: $tablet) {
......
......@@ -2,7 +2,7 @@
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p class="description">
<p class="chapo">
<ng-container i18n="@@changelog.description">
Your recommendations to improve this portal are regularly integrated.
Here is the list of the last evolutions of the portal. If you wish to contribute to the optimization of the
......
......@@ -10,10 +10,6 @@ $line: 2px;
/* Base */
.description {
font-size: 1rem;
font-weight: 600;
padding-bottom: 1.875rem;
line-height: normal;
@media screen and (min-width: $desktop) {
margin-left: 6rem;
......
......@@ -2,7 +2,7 @@
<div class="page-container is-fullwidth">
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p *ngIf="intro">{{ intro }}</p>
<p *ngIf="intro" class="chapo">{{ intro }}</p>
</div>
<div class="posts">
<div class="post-container">
......
......@@ -9,10 +9,6 @@
.page-header-container {
background-color: white;
padding: 0 1.25rem 0 1.25rem;
p {
padding-bottom:2em;
}
}
.posts {
......
......@@ -6,19 +6,21 @@
<img src="./assets/img/illu-contributions.svg" alt="Illustrationde la contribution">
</div>
<p class="section-title" i18n="@@contribution.title">Do you want to contribute ?</p>
<div class="chapo">
<p class="section-title" i18n="@@contribution.title">Do you want to contribute ?</p>
<p i18n="@@contribution.mainText">The Métropole de Lyon encourages all players in the area
(citizens, companies, associations, research laboratories, schools, etc.) to make available all the data they
produce.</p>
<br />
<p>
<span i18n="@@contribution.text2">
To publish data on the data.grandlyon.com platform,
</span>
<a [routerLink]="['/', AppRoutes.contact.uri]" [queryParams]="{ subject: contactTrad.contributionSubject }"
i18n="@@contribution.contactUs">contact us</a>.
</p>
<p i18n="@@contribution.mainText">The Métropole de Lyon encourages all players in the area
(citizens, companies, associations, research laboratories, schools, etc.) to make available all the data they
produce.</p>
<br />
<p>
<span i18n="@@contribution.text2">
To publish data on the data.grandlyon.com platform,
</span>
<a [routerLink]="['/', AppRoutes.contact.uri]" [queryParams]="{ subject: contactTrad.contributionSubject }"
i18n="@@contribution.contactUs">contact us</a>.
</p>
</div>
</div>
</section>
\ No newline at end of file
@import '../../../../../node_modules/bulma/sass/utilities/_all.sass';
p,
span {
font-size: 1.125rem;
}
.feature-image {
margin-top: 2rem;
margin-bottom: 2rem;
......
<div class="page-container is-fullwidth">
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p class="description" i18n="@@credits.description">
<p class="chapo" i18n="@@credits.description">
Here are the open source tools used by data.grandlyon.com.
</p>
</div>
......
......@@ -7,13 +7,6 @@
margin-bottom: 1rem;
}
.description {
font-size: 17px;
font-weight: 600;
padding-bottom: 1.875rem;
line-height: normal;
}
img {
max-height: 100px;
}
......
<div class="page-container is-fullwidth">
<div class="page-header-container">
<div class="page-header-container ghost-style">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p class="description">
<ng-container i18n="@@organizations.description">The Lyon Metropolitan Area has opened its portal to all
stakeholders in the region who wish to distribute their data, in open data or restricted access. If you wish to
make your data available on this shared platform, do not hesitate to </ng-container>
<a [routerLink]="['/', AppRoutes.contact.uri]" i18n="@@organizations.contactus">contact us</a>.
</p>
<div class="chapo">
<p>
<ng-container i18n="@@organizations.description_first">
They have chosen to make their data available on data.grandlyon.com: Welcome to the partners of the Métropole de Lyon!
</ng-container>&nbsp;
<ng-container i18n="@@organizations.description_middle">
For the players in the territory who wish to distribute their data, in open access or in exclusive sharing,
the data team of the Métropole de Lyon is at your disposal and offers you two types of partnership framework:
</ng-container>
</p>
<ul>
<p>
<li>
<a href="{{ opendata_url }}" i18n="@@organizations.opendata_conv">An open data distribution agreement</a>
</li>
<li>
<a href="{{ privatedata_url }}" i18n="@@organizations.privatedata_conv">A private access data distribution agreement</a>
</li>
</p>
</ul>
<p>
<ng-container i18n="@@organizations.description_last">
Together, let's make data the catalyst for responsible development in Greater Lyon!
</ng-container>
</p>
</div>
</div>
<div class="masonry">
......@@ -48,4 +68,4 @@
</div>
</div>
</div>
\ No newline at end of file
</div>
......@@ -7,11 +7,10 @@
margin-bottom: 1rem;
}
.description {
font-size: 17px;
font-weight: 600;
padding-bottom: 1.875rem;
line-height: normal;
.ghost-style {
ul p {
padding-top:0px;
}
}
img {
......
......@@ -8,6 +8,7 @@ import { DatasetResearchService } from '../../../datasets/services';
import { Aggregation } from '../../../elasticsearch/models';
import { ElasticsearchService } from '../../../elasticsearch/services/elasticsearch.service';
import { AppRoutes } from '../../../routes';
import { environment } from '../../../../environments/environment';
import { IPageHeaderInfo } from '../../../shared/models';
import { scopesResearch } from '../../../shared/variables';
import { Organization } from '../../models';
......@@ -25,6 +26,10 @@ export class OrganizationsComponent implements OnInit {
title: pageTitles.partners,
};
organizations: Organization[];
opendata_url: string = '';
privatedata_url: string ='';
constructor(
private _organizationsService: OrganizationsService,
private _elasticSearchService: ElasticsearchService,
......@@ -32,9 +37,20 @@ export class OrganizationsComponent implements OnInit {
private _notificationService: NotificationService,
private _router: Router,
private _location: Location
) { }
ngOnInit() {
this.opendata_url = AppRoutes.contribution.opendata_url.fr;
this.privatedata_url = AppRoutes.contribution.privatedata_url.fr;
if (window.location.href.includes(environment.angularAppHost.en)) {
this.opendata_url = AppRoutes.contribution.opendata_url.en;
this.privatedata_url = AppRoutes.contribution.privatedata_url.en;
}
this._organizationsService.getOrganizations().pipe(
tap((organizations) => {
this.organizations = organizations;
......
<div class="page-container is-fullwidth">
<div class="page-header-container">
<app-page-header [pageInfo]="pageHeaderInfo"></app-page-header>
<p class="description">
<p class="chapo">
<span i18n="@@reuses.description.part1">
The Métropole de Lyon promotes the reuse of territorial data: analysis, map, site, service, application...
</span>
......
......@@ -7,14 +7,6 @@
margin-bottom: 1rem;
}
.description,
.description span {
font-size: 17px;
font-weight: 600;
padding-bottom: 1.875rem;
line-height: normal;
}
a:hover {
text-decoration: none;
}
......
......@@ -230,6 +230,14 @@ export const AppRoutes = {
fr: 'Contribution',
en: 'Contribution',
},
opendata_url: {
en: 'https://download.data.grandlyon.com/conventions/Version_EN_Convention_Cadre_Data_Partenaire_MetropoledeLyon_Donnees_Ouvertes_avec_Annexe.docx',
fr: 'https://download.data.grandlyon.com/conventions/Convention_Cadre_Data_Partenaire_MetropoledeLyon_Donnees_Ouvertes_avec_Annexe.docx'
},
privatedata_url: {
en: 'https://download.data.grandlyon.com/conventions/Version_EN_Convention_Cadre_Data_Partenaire_MetropoledeLyon_Donnees_Privees_avec_Annexe.docx',
fr: 'https://download.data.grandlyon.com/conventions/Convention_Cadre_Data_Partenaire_MetropoledeLyon_Donnees_Privees_avec_Annexe.docx'
},
},
reuses: {
uri: 'reutilisations',
......
......@@ -671,6 +671,26 @@ Here is the list of the last evolutions of the portal. If you wish to contribute
<source>Visit the website</source>
<target>Visit the website</target>
</trans-unit>
<trans-unit id="organizations.description_first" datatype="html">
<source>They have chosen to make their data available on data.grandlyon.com: Welcome to the partners of the Métropole de Lyon!</source>
<target>They have chosen to make their data available on data.grandlyon.com: Welcome to the partners of the Métropole de Lyon!</target>
</trans-unit>
<trans-unit id="organizations.description_middle" datatype="html">
<source>For the players in the territory who wish to distribute their data, in open access or in exclusive sharing, the data team of the Métropole de Lyon is at your disposal and offers you two types of partnership framework:</source>
<target>For the players in the territory who wish to distribute their data, in open access or in exclusive sharing, the data team of the Métropole de Lyon is at your disposal and offers you two types of partnership framework:</target>
</trans-unit>
<trans-unit id="organizations.description_last" datatype="html">
<source>Together, let's make data the catalyst for responsible development in Greater Lyon!</source>
<target>Together, let's make data the catalyst for responsible development in Greater Lyon!</target>
</trans-unit>
<trans-unit id="organizations.opendata_conv" datatype="html">
<source>An open data distribution agreement</source>
<target>An open data distribution agreement</target>
</trans-unit>
<trans-unit id="organizations.privatedata_conv" datatype="html">
<source>A private access data distribution agreement</source>
<target>A private access data distribution agreement</target>
</trans-unit>
<trans-unit id="organizations.description" datatype="html">
<source>The Lyon Metropolitan Area has opened its portal to all stakeholders in the region who wish to distribute their data, in open data or restricted access. If you wish to make your data available on this shared platform, do not hesitate to </source>
<target>The Lyon Metropolitan Area has opened its portal to all stakeholders in the region who wish to distribute their data, in open data or restricted access. If you wish to make your data available on this shared platform, do not hesitate to </target>
......
......@@ -679,6 +679,26 @@ Voici la liste des dernières évolutions du portail. Si vous souhaitez contribu
<source>Visit the website</source>
<target>Voir le site web</target>
</trans-unit>
<trans-unit id="organizations.description_first" datatype="html">
<source>They have chosen to make their data available on data.grandlyon.com: Welcome to the partners of the Métropole de Lyon!</source>
<target>Ils ont choisi de mettre à disposition leurs données sur data.grandlyon.com : Bienvenue aux partenaires de la Métropole de Lyon !</target>
</trans-unit>
<trans-unit id="organizations.description_middle" datatype="html">
<source>For the players in the territory who wish to distribute their data, in open access or in exclusive sharing, the data team of the Métropole de Lyon is at your disposal and offers you two types of partnership framework:</source>
<target>Pour les acteurs du territoire qui souhaitent diffuser leurs données, en accès ouvert ou en partage exclusif, l'équipe data de la Métropole de Lyon est à votre écoute et vous propose deux types de cadre partenarial :</target>
</trans-unit>
<trans-unit id="organizations.description_last" datatype="html">
<source>Together, let's make data the catalyst for responsible development in Greater Lyon!</source>
<target>Faisons ensemble de la donnée, le catalyseur du développement responsable du Grand Lyon ! </target>
</trans-unit>
<trans-unit id="organizations.opendata_conv" datatype="html">
<source>An open data distribution agreement</source>
<target>Une convention de diffusion de données ouvertes</target>
</trans-unit>
<trans-unit id="organizations.privatedata_conv" datatype="html">
<source>A private access data distribution agreement</source>
<target>Une convention de diffusion de données en accès privé</target>
</trans-unit>
<trans-unit id="organizations.description" datatype="html">
<source>The Lyon Metropolitan Area has opened its portal to all stakeholders in the region who wish to distribute their data, in open data or restricted access. If you wish to make your data available on this shared platform, do not hesitate to </source>
<target>La Métropole de Lyon a ouvert son portail à tous les acteurs du territoire qui souhaitent diffuser leurs données,
......
......@@ -4,7 +4,7 @@
p.excerpt {
margin-top: 1.4375rem;
margin-bottom: 1.4375rem;
font-size: 1.125rem;
font-size: 1.0625rem;
font-weight: bold;
}
......@@ -20,9 +20,13 @@
span,
li {
word-break: break-word;
font-size: 1.125rem;
font-size: 1.0625rem;
color: $brand-color;
line-height: 1.5;
a{
font-weight: bold;
}
}
p {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment