Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tickets #22

Merged
merged 2 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions src/main/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,16 @@ views.application.subscribe.title=Tickets
views.application.subscribe.subtitle=Deep Dive pass, Conference pass or even Combi pass, you choose!
views.application.subscribe.title.pack=Choose your option
views.application.subscribe.title.training=Ask your employer to attend the conference
views.application.subscribe.pass.pass=Pass
views.application.subscribe.pass.buy=Buy ticket
views.application.subscribe.pass.saleover=The sale is over
views.application.subscribe.pass.salenotyet=The sale is not yet open
views.application.subscribe.pass.sold.out=Sold-out
views.application.subscribe.pass.student=Students: %d€
views.application.subscribe.pass.deepdive.title=Monday:
views.application.subscribe.pass.deepdive.name=Deep Dive
views.application.subscribe.pass.deepdive.days=1 day : 7th July, 2025
views.application.subscribe.pass.conference.name=Conference
views.application.subscribe.pass.conference.title=Tuesday & Wednesday:
views.application.subscribe.pass.conference.name=Conferences
views.application.subscribe.pass.conference.days=2 days : 8th & 9th July, 2025
views.application.subscribe.pass.combi.name=Combi
views.application.subscribe.pass.training.name=Training
Expand All @@ -160,14 +161,14 @@ views.application.subscribe.pass.training.text3=To do so, you can request a trai
views.application.subscribe.pass.training.text4=Beware: This is available only to people employed under a French work contract.
views.application.subscribe.pass.training.button=Make the step
views.application.subscribe.pass.combi.days=3 days : 7th, 8th & 9th July, 2025
views.application.subscribe.pass.include.deepdive.conferences=Deep Dive sessions
views.application.subscribe.pass.include.deepdive.workshops=Deep Dive workshops
views.application.subscribe.pass.include.conference.conferences=Conferences sessions
views.application.subscribe.pass.include.conference.snorkeling=Snorkeling sessions
views.application.subscribe.pass.include.deepdive.conferences=3-hour conferences
views.application.subscribe.pass.include.deepdive.workshops=3-hour workshops
views.application.subscribe.pass.include.conference.keynotes=Keynotes
views.application.subscribe.pass.include.conference.conferences=50 and 25-minute conferences
views.application.subscribe.pass.include.conference.notjustcoders="We're not just coders" workshops
views.application.subscribe.pass.include.buffet=Breakfast and buffet
views.application.subscribe.pass.include.buffets=Breakfasts and buffets
views.application.subscribe.pass.include.party=Evening social event with buffet and concert
views.application.subscribe.pass.include.party=Evening social event with a buffet and concert
views.application.subscribe.pass.include.lake=A day you will never forget: feet in the water, head full of stars
views.application.subscribe.pass.period.blindBird=Blind bird
views.application.subscribe.pass.period.earlyBird=Early bird
Expand Down
15 changes: 8 additions & 7 deletions src/main/resources/messages_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,16 @@ views.application.subscribe.title=Billetterie
views.application.subscribe.subtitle=Pass Deep Dive, Pass Conférence ou encore Pass Combi, à vous de choisir !
views.application.subscribe.title.pack=Choisissez votre pass
views.application.subscribe.title.training=Demandez à votre employeur d'assister à la conférence
views.application.subscribe.pass.pass=Pass
views.application.subscribe.pass.buy=Acheter
views.application.subscribe.pass.saleover=Vente terminée
views.application.subscribe.pass.salenotyet=Vente pas encore ouverte
views.application.subscribe.pass.sold.out=Complet
views.application.subscribe.pass.student=Etudiants : %d€
views.application.subscribe.pass.deepdive.title=Lundi :
views.application.subscribe.pass.deepdive.name=Deep Dive
views.application.subscribe.pass.deepdive.days=1 jour : 7 juillet 2025
views.application.subscribe.pass.conference.name=Conférence
views.application.subscribe.pass.conference.title=Mardi et Mercredi :
views.application.subscribe.pass.conference.name=Conférences
views.application.subscribe.pass.conference.days=2 jours : 8 et 9 juillet 2025
views.application.subscribe.pass.combi.name=Combi
views.application.subscribe.pass.training.name=Formation
Expand All @@ -163,14 +164,14 @@ views.application.subscribe.pass.training.text3=A cet effet, vous pourrez demand
views.application.subscribe.pass.training.text4=
views.application.subscribe.pass.training.button=Faire la demande
views.application.subscribe.pass.combi.days=3 jours : 7, 8 et 9 juillet 2025
views.application.subscribe.pass.include.deepdive.conferences=Conférences Deep Dive
views.application.subscribe.pass.include.deepdive.workshops=Workshops Deep Dive
views.application.subscribe.pass.include.conference.conferences=Conférences
views.application.subscribe.pass.include.conference.snorkeling=Snorkeling
views.application.subscribe.pass.include.deepdive.conferences=Conférences de 3h
views.application.subscribe.pass.include.deepdive.workshops=Workshops de 3h
views.application.subscribe.pass.include.conference.keynotes=Keynotes
views.application.subscribe.pass.include.conference.conferences=Conférences de 50 et 25 minutes
views.application.subscribe.pass.include.conference.notjustcoders=Ateliers "On n'est pas que des codeurs"
views.application.subscribe.pass.include.buffet=Petit-déjeuner et buffet
views.application.subscribe.pass.include.buffets=Petits-déjeuners et buffets
views.application.subscribe.pass.include.party=Soirée networking du mardi avec buffet et concert
views.application.subscribe.pass.include.party=Soirée networking avec buffet et concert
views.application.subscribe.pass.include.lake=Une journée inoubliable les pieds dans l'eau, la tête dans les étoiles
views.application.subscribe.pass.period.blindBird=Blind bird
views.application.subscribe.pass.period.earlyBird=Early bird
Expand Down
7 changes: 4 additions & 3 deletions src/main/resources/templates/Application/subscribe.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ <h2 class="page__title">
<div class="pass__main">
<h3 class="pass__name">
<span class="pass__pass pass__pass--{pricePack.type.code}">
{m:views.application.subscribe.pass.pass}
{m:'views.application.subscribe.pass.' + pricePack.type.code +
'.title'}
</span>
{m:'views.application.subscribe.pass.' + pricePack.type.code +
'.name'}
Expand Down Expand Up @@ -87,10 +88,10 @@ <h3 class="pass__name">
{/if}
{#if pricePack.type.code == 'conference' || pricePack.type.code == 'combi'}
<li class="pass__descriptionItem">
{m:views.application.subscribe.pass.include.conference.conferences}
{m:views.application.subscribe.pass.include.conference.keynotes}
</li>
<li class="pass__descriptionItem">
{m:views.application.subscribe.pass.include.conference.snorkeling}
{m:views.application.subscribe.pass.include.conference.conferences}
</li>
<li class="pass__descriptionItem">
{m:views.application.subscribe.pass.include.conference.notjustcoders}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ $soldout-hoverlay: rgba(256, 256, 256, 0.5);
}

.passes {
@media (min-width: $screen-lg-min) {
max-width: 80%;
}
@media (min-width: $screen-md-min) {
margin: 0 auto;
display: grid;
grid-template-columns: 1fr 1fr 1fr;
grid-template-columns: 1fr 1fr;
grid-template-areas:
'deepdiveMain conferenceMain combiMain'
'deepdiveDesc conferenceDesc combiDesc';
Expand Down Expand Up @@ -105,6 +109,8 @@ $bullet-size: 0.6rem; // 6px
}

&__pass {
display: block;

&--deepdive {
color: $color-deepDive-label;
}
Expand Down