Skip to content

Commit

Permalink
Merge pull request #4 from bastaille/banners
Browse files Browse the repository at this point in the history
Addition of the speaker's banner and sponsor's banner.
  • Loading branch information
FroMage authored Jun 24, 2024
2 parents d72c6a7 + 029b799 commit a0851f7
Show file tree
Hide file tree
Showing 16 changed files with 270 additions and 1 deletion.
19 changes: 18 additions & 1 deletion src/main/java/rest/Application.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@ public static native TemplateInstance speakers(List<Speaker> speakers, List<Spea
boolean displayPreviousSpeakers);

public static native TemplateInstance speaker(Speaker speaker);
public static native TemplateInstance speakerBanner(Speaker speaker);

public static native TemplateInstance sponsor(Sponsor sponsor);
public static native TemplateInstance sponsorBanner(Sponsor sponsor);

public static native TemplateInstance talk(Talk talk, boolean displayFullSchedule);

Expand Down Expand Up @@ -500,5 +502,20 @@ public TemplateInstance schools() {
List<Sponsor> sponsors = Sponsor.list("level", sponsorShip);
return Templates.schools(sponsorShip, sponsors);
}


@Path("/speaker-banner")
public TemplateInstance speakerBanner(@RestPath Long id) {
Speaker speaker = Speaker.findById(id);
notFoundIfNull(speaker);
return Templates.speakerBanner(speaker);
}


@Path("/sponsor-banner")
public TemplateInstance sponsorBanner(@RestPath Long id) {
Sponsor sponsor = Sponsor.findById(id);
notFoundIfNull(sponsor);
return Templates.sponsorBanner(sponsor);
}

}
5 changes: 5 additions & 0 deletions src/main/resources/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,11 @@ views.application.cfp.motivation.1=On top of the great conference, make sure to
views.application.cfp.motivation.2=Don't miss the <strong>speaker dinner</strong> on Friday evening, with a great
views.application.cfp.motivation.3=dinner on the beach.

views.application.banner.speaker.date.1=July 08 <span id="citation_1">|</span> 09 <span id="citation_1">|</span> 10
views.application.banner.speaker.date.2=2024
views.application.banner.speaker.date.3=They'll be here in 2024
views.application.banner.sponsor.date.1=Our 2024 sponsors

tags.sponsorsPreviousYears.title=They trusted us the previous years
tags.previousSpeakers.title=They were at Riviera DEV
tags.newsletter.placeholder=Your email address
Expand Down
5 changes: 5 additions & 0 deletions src/main/resources/messages_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,11 @@ views.application.cfp.motivation.1=En plus de la super conf, profitez de votre p
views.application.cfp.motivation.2=Venez également profiter du <strong>dîner orateur</strong> le vendredi soir, avec traditionnellement un super
views.application.cfp.motivation.3=repas sur la plage.

views.application.banner.speaker.date.1=08 <span id="citation_1">|</span> 09 <span id="citation_1">|</span> 10
views.application.banner.speaker.date.2=Juillet 2024
views.application.banner.speaker.date.3=Ils seront là en 2024
views.application.banner.sponsor.date.1=Nos sponsors 2024

tags.sponsorsPreviousYears.title=Ils nous ont fait confiance les années précédentes
tags.previousSpeakers.title=Ils sont venus à Riviera DEV
tags.newsletter.placeholder=Votre adresse email
Expand Down
140 changes: 140 additions & 0 deletions src/main/resources/templates/Application/speakerBanner.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
<html>
<head>
<style>
@font-face {
font-family: 'Interstate Regular';
font-style: normal;
font-weight: normal;
src: local('Interstate Regular'), url('/static/fonts/InterstateRegular.woff') format('woff');
}
@font-face {
font-family: 'Interstate Light';
font-style: normal;
font-weight: normal;
src: local('Interstate Light'), url('/static/fonts/InterstateLight.woff') format('woff');
}
@font-face {
font-family: 'Interstate Bold';
font-style: normal;
font-weight: normal;
src: local('Interstate Bold'), url('/static/fonts/InterstateBold.woff') format('woff');
}

#name, #compagny {
position: absolute;
z-index: 1;
}
#name {
color: #474743;
top: 322px;
left: 250px;
font-family: "Interstate Regular";
font-size: 21;
text-align: center;
width: 400px;
}
#compagny {
color: #474743;
top: 345px;
left: 250px;
font-family: "Interstate bold";
text-align: center;
font-size: 16;
width: 400px;
}
#permanent_text_1 {
position: absolute;
z-index: 1;
color: white;
top: 123px;
left: 55px;
font-size: 23;
font-family: "Interstate light";
width: 400;
text-align: center;
}
#permanent_text_2 {
position: absolute;
z-index: 1;
color: white;
top: 183px;
left: 721px;
font-size: 20;
font-family: "Interstate bold";
}
#orange {
color: #fdc43f;
}
#location {
position: absolute;
z-index: 1;
color: white;
top: 229px;
left: 721px;
font-size: 21;
font-family: "Interstate light";
}
#site_name {
position: absolute;
z-index: 1;
color: white;
top: 322px;
left: 721px;
font-size: 23;
font-family: "Interstate bold";
}
.personSummary__photo {
width: 130;
height: 133;
border-radius: 150px;
background-size: cover;
position: absolute;
top: 179px;
left: 387px;
}
.talks_type {
z-index: 1;
font-family: 'Interstate bold';
color: #fdc43f;
text-align: center;
width: 400px;
}
#program {
position: absolute;
z-index: 1;
font-family: 'Interstate light';
color: #474743;
top: 366px;
left: 250;
text-align: center;
width: 400px;
}
#citation_1,#citation_2 {
color:#fdc43f;
z-index: 1;
font-family: 'Interstate bold';
}
</style>
</head>
<body>
<div
class="personSummary__photo personDetails__header--photo"
style="background-image: url('{uri:Application.speakerPhoto(speaker.id)}')"
></div>

<div id="name">{speaker.firstName} {speaker.lastName}</div>
<div id="compagny"><strong>{speaker.company}</strong></div>
<div id="permanent_text_1">{m:views.application.banner.speaker.date.3.raw}</div>
<div id="permanent_text_2">{m:views.application.banner.speaker.date.1.raw}<br/>{m:views.application.banner.speaker.date.2.raw}</div>
<div id="location">Sophia Antipolis</div>
<div id="site_name">rivieradev.fr</div>
<div id="program">
{#for talk in speaker.talks}
<div class="talks_type">{talk.type}: </div>
<div><span id="citation_1">« </span> {talk.title} <span id="citation_2">»</span></div>
{/for}
</div>
<img src="/static/images/Speakers-banner-notext.png"/>

</body>
</html>
102 changes: 102 additions & 0 deletions src/main/resources/templates/Application/sponsorBanner.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<html>
<head>
<style>
@font-face {
font-family: 'Interstate Regular';
font-style: normal;
font-weight: normal;
src: local('Interstate Regular'), url('/static/fonts/InterstateRegular.woff') format('woff');
}
@font-face {
font-family: 'Interstate Light';
font-style: normal;
font-weight: normal;
src: local('Interstate Light'), url('/static/fonts/InterstateLight.woff') format('woff');
}
@font-face {
font-family: 'Interstate Bold';
font-style: normal;
font-weight: normal;
src: local('Interstate Bold'), url('/static/fonts/InterstateBold.woff') format('woff');
}


#permanent_text_1 {
position: absolute;
z-index: 1;
color: white;
top: 123px;
left: 55px;
font-size: 23;
font-family: "Interstate light";
width: 400;
text-align: center;
}
#permanent_text_2 {
position: absolute;
z-index: 1;
color: white;
top: 183px;
left: 721px;
font-size: 20;
font-family: "Interstate bold";
}
#location {
position: absolute;
z-index: 1;
color: white;
top: 229px;
left: 721px;
font-size: 21;
font-family: "Interstate light";
}
#site_name {
position: absolute;
z-index: 1;
color: white;
top: 322px;
left: 721px;
font-size: 23;
font-family: "Interstate bold";
}
#personSummary__photo {
max-width: 330px;
top: 225px;
left: 226px;
max-height: 100px;
margin: auto;
}
#image_box {
text-align: center;
width: 400px;
position: absolute;
height: 100px;
left: 184px;
top: 209px;
}
#sponsorRank {
position: absolute;
z-index: 1;
top: 339px;
left: 287px;
}
</style>
</head>
<body>


<div id="image_box"><img
id="personSummary__photo"
src="{uri:Application.sponsorLogo(sponsor.id)}"
/></div>


<div id="permanent_text_1">{m:views.application.banner.sponsor.date.1.raw}</div>
<div id="permanent_text_2">{m:views.application.banner.speaker.date.1.raw}<br/>{m:views.application.banner.speaker.date.2.raw}</div>
<div id="location">Sophia Antipolis</div>
<div id="site_name">rivieradev.fr</div>
<img src="/static/images/Sponsors-banner-notext.png"/>
<img src="/static/images/Sponsors-{sponsor.level}.png" id="sponsorRank"/>

</body>
</html>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit a0851f7

Please sign in to comment.