Skip to content

Commit

Permalink
start fresh for 2024
Browse files Browse the repository at this point in the history
  • Loading branch information
tyrasd committed Nov 17, 2023
1 parent 39f83e4 commit 943a094
Show file tree
Hide file tree
Showing 125 changed files with 405 additions and 4,309 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# State of the Map 2022 Website
# State of the Map 2024 Website

This repo is the Jekyll configuration, styles and content powering https://2022.stateofthemap.org
This repo is the Jekyll configuration, styles and content powering https://2024.stateofthemap.org

Note that the SotM program is managed through our submission system at https://pretalx.com/sotm2022. If you change it on the submission system, it will be updated on the website automatically. Do that rather than making pull requests on the "session" files here.
<!--Note that the SotM program is managed through our submission system at https://pretalx.com/sotm2024. If you change it on the submission system, it will be updated on the website automatically. Do that rather than making pull requests on the "session" files here.-->

## Local installation

Expand All @@ -12,8 +12,8 @@ See https://jekyllrb.com/docs/installation/

### View locally

* `git clone [email protected]:openstreetmap/stateofthemap-2022.git`
* `cd stateofthemap-2022`
* `git clone [email protected]:openstreetmap/stateofthemap-2024.git`
* `cd stateofthemap-2024`
* `jekyll serve -wl`
* Point your browser to `http://localhost:4000/`

Expand All @@ -24,8 +24,8 @@ Alternatively you can use Docker to install Jekyll and to serve the site within
### Using docker-compose

* [Install docker-compose](https://docs.docker.com/compose/install/)
* `git clone [email protected]:openstreetmap/stateofthemap-2022.git`
* `cd stateofthemap-2022`
* `git clone [email protected]:openstreetmap/stateofthemap-2024.git`
* `cd stateofthemap-2024`
* `docker-compose up --build`
* Point your browser to `http://localhost:4000/`

Expand Down
Binary file added Sponsorship_SotM2024.pdf
Binary file not shown.
16 changes: 8 additions & 8 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Site settings
title: State of the Map 2022
title: "State of the Map 2024 – Nairobi, Kenya"
email: [email protected]
description: "The global OpenStreetMap conference. August 19 - 21, 2022 in Florence, Italy & online."
url: "http://2022.stateofthemap.org" # the base hostname & protocol for your site
description: "The global OpenStreetMap conference. September 6 - 8, 2024 in Nairobi, Kenya & online."
url: "http://2024.stateofthemap.org" # the base hostname & protocol for your site
twitter_username: state
github_username: jekyll

Expand All @@ -11,11 +11,11 @@ markdown: kramdown

# Color settings (hex-codes without the leading hash-tag)
color:
primary-dark: '#ffd97e' # yellow
primary-light: '#e23e36' # red
background-light: '#ffd97e'
links: '#e23e36'
links-light: '#b7d7e1'
primary-dark: '#3cb9f7' # main: blue
primary-light: '#f2bb40' # secondary: yellow
background-light: '#3cb9f7' # (main: blue)
links: '#04065e' # dark blue
links-light: '#2464aa' # light-ish blue???
links-white: '#fff'
text: '#030304'
text-light: '#fff'
Expand Down
29 changes: 11 additions & 18 deletions _includes/about.html
Original file line number Diff line number Diff line change
@@ -1,47 +1,40 @@
<!-- About Section -->
<section id="about" class="pad8y contain page">
<section id="about" class="contain page">
<div class="limiter clearfix pad4y">
<div class="col8 clearfix space-bottom2 contain">
<div class="col10 margin2r space-bottom2">
<h1 class="space-bottom2">State of the Map 2022</h1>
<p>State of the Map is the annual event for all mappers and OpenStreetMap users. In 2022 the State of the Map conference will be a three day hybrid conference taking place in Florence, Italy and online. Please consider signing up for updates via our <a href="https://2022.stateofthemap.org#newsletter">newsletter</a>, join our <a href="https://t.me/sotm2018">telegram group chat</a> and follow us on <a href="https://twitter.com/sotm">Twitter</a>.</p>
<p>The conference will take place before the <a href="https://2022.foss4g.org">FOSS4G 2022 conference</a>, which is also in Firenze on August 22 to 28, 2022. The local team is committed to providing participants with a safe conference environment in accordance with the latest safety and health guidelines set by authorities.</p>
<h1 class="space-bottom2">State of the Map 2024</h1>
<p>State of the Map is the annual event for all mappers and OpenStreetMap users. In 2024 the State of the Map conference will be a taking place in Nairobi, Kenya and online. It will be a three day conference packed with talks, workshops, discussion rounds and more.</p>
<p>Your organising team.</p>
<p class="logo">
<img src="img/logo/sotm_2022.svg" style="width:50%;">
<img src="img/logo/sotm_2024.svg" style="width:50%;">
</p>
</div>
</div>
<div class="col4 clearfix contain">
<h3 class="small-title uppercase">Where?</h3>
<p>
<a href="venue">Florence, Italy.</a>
<a href="venue">Nairobi, Kenya.</a>
</p>

<h3 class="small-title uppercase">When?</h3>
<p>
August 19 - 21, 2022
September 6 - 8, 2024
</p>

<h3 class="small-title uppercase"><a href="events">Social Event</a></h3>
<!--<h3 class="small-title uppercase"><a href="events">Social Event</a></h3>
<p>
On Saturday, August 20 at <a href="https://www.mercatocentrale.com/florence/">Mercato&nbsp;Centrale</a> (<a href="https://www.openstreetmap.org/?mlat=43.7766&mlon=11.2532#map=16/43.7766/11.2532">location</a>)
</p>
TBD
</p>-->

<h3 class="small-title uppercase">Additional Events</h3>
<!--<h3 class="small-title uppercase">Additional Events</h3>
<ul>
<li>Friday, August 19: <a href="https://unsummit.hotosm.org/">HOT unSummit at SotM</a></li>
<li>Friday, August 19 (evening): <a href="https://forms.gle/MK89amh4zG5hKFdy7">HOT unSummit Social at SotM</a></li>
<li>Monday, August 22: <a href="https://mobilizon.it/events/5a84127d-120c-4a83-a563-5721260c862b">YouthMappers Documentary Premiere</a></li>
</ul>
</ul>-->

<h3 class="small-title uppercase" style="height:0">&nbsp;</h3>
<p>
<a href="https://openstreetmap.org"><img src="img/osm.svg" style="height:85px; margin-top:20px;" /></a>
</p>
<p>
<a href="https://wiki.wikimedia.it/"><img src="img/wikimedia-italia.png" style="height:85px; margin-top:20px;" /></a>
</p>
</div>
</div>
</section>
22 changes: 10 additions & 12 deletions _includes/css/sotm.css
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ a:focus {
}

footer a {
color: {{ site.color.links-white }};
color: {{ site.color.links-light }};
}

footer a:hover,
Expand Down Expand Up @@ -183,7 +183,7 @@ footer a:focus,
background-position-x: center;
background-position-y: top;
background-size: cover;
border-bottom: 0.5px solid {{ site.color.primary-light }};
border-bottom: 2px solid {{ site.color.links }};
}

.navbar a, .navbar a:hover {
Expand Down Expand Up @@ -213,7 +213,7 @@ footer a:focus,
text-align: center;
color: #fff;
position: relative;
background-image: url(./img/header.jpg);
background-image: url(./img/giraffes.jpg);
-webkit-background-size: cover;
-moz-background-size: cover;
background-size: cover;
Expand All @@ -234,14 +234,14 @@ footer a:focus,
text-align: center;
display: inline-block;
width: auto;
margin-top: 40px;
margin-top: 50px;
background-color: rgba(255, 255, 255, 0.4);
padding: 40px;
border-radius: 40px 0;
border-radius: 0;
}

.intro .intro-body .logo > img {
width: 150px;
width: 200px;
display: block;
}

Expand Down Expand Up @@ -326,7 +326,7 @@ header.intro .credits {
font-size: 100px;
padding-bottom: 60px;
margin-left: 8%;
float: left;
float: right;
/*margin-top: 100px;*/
margin-bottom: 100px;
}
Expand Down Expand Up @@ -493,7 +493,7 @@ ul.banner-social-buttons li {

footer {
padding: 50px 0;
color: {{ site.color.links-white }};
color: {{ site.color.links-light }};
}

footer p {
Expand Down Expand Up @@ -527,7 +527,6 @@ footer img::-moz-selection,
footer img.logo {
width: auto;
height: 200px;
filter: brightness(100);
margin-top: -30px;
margin-bottom: -10px;
}
Expand Down Expand Up @@ -558,6 +557,7 @@ body {
}

#about .logo {
margin-top: 40px;
text-align: center;
}

Expand Down Expand Up @@ -806,8 +806,7 @@ nav .navbar-brand {
height: 70px;
}

#sponsors .supporter a.sponsor,
#sponsors .platinum a.sponsor {
#sponsors .supporter a.sponsor {
width: auto;
height: auto;
}
Expand All @@ -825,7 +824,6 @@ nav .navbar-brand {
}

#sponsors div.platinum img {
filter: grayscale(0);
}

#sponsors div.platinum h4 {
Expand Down
34 changes: 18 additions & 16 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,37 @@
<div class="col3 pad4x hide-mobile">
</div>
<nav class="col3 pad2x">
<a class="block" href="{{site.baseurl}}/calls/general"block>Call for Participation</a>
<!--<a class="block" href="{{site.baseurl}}/calls/general"block>Call for Participation</a>-->
<!--<a class="block" href="https://lists.openstreetmap.org/pipermail/science/2021-February/000093.html">Call for applications for the Scientific Committee</a>-->
<a class="block" href="{{site.baseurl}}/calls/academic">Call for Academic Abstracts</a>
<a class="block" href="{{site.baseurl}}/calls/posters">Call for Posters</a>
<a class="block" href="https://wiki.openstreetmap.org/wiki/State_of_the_Map_2022/registration_lightning_talks">Call for Lightning Talks</a>
<!--<a class="block" href="{{site.baseurl}}/calls/academic">Call for Academic Abstracts</a>-->
<!--<a class="block" href="{{site.baseurl}}/calls/posters">Call for Posters</a>-->
<!--<a class="block" href="https://wiki.openstreetmap.org/wiki/State_of_the_Map_2022/registration_lightning_talks">Call for Lightning Talks</a>-->
<!--<a class="block" href="{{site.baseurl}}/calls/translators">Call for Translation Volunteers</a>-->
<!--<a class="block" href="https://wiki.openstreetmap.org/wiki/State_of_the_Map_2021/registration_lightning_talks">Call for Lightning Talks</a>-->
<a class="block" href="{{site.baseurl}}/travel_grant_programme">Travel Grant Programme</a>
<!--<a class="block" href="{{site.baseurl}}/travel_grant_programme">Travel Grant Programme</a>-->
<a class="block" href="{{site.baseurl}}/codeofconduct/">Code of conduct</a>
</nav>
<nav class="col3 pad2x">
<a class="block" href="{{site.baseurl}}/programme/">Programme</a>
<a class="block" href="{{site.baseurl}}/posters/">Posters</a>
<a class="block" href="https://zenodo.org/record/7004791">Proceedings of the Academic&nbsp;Track</a>
<!--<a class="block" href="{{site.baseurl}}/programme/">Programme</a>-->
<!--<a class="block" href="{{site.baseurl}}/posters/">Posters</a>-->
<!--<a class="block" href="https://zenodo.org/record/7004791">Proceedings of the Academic&nbsp;Track</a>-->
<!--<a class="block" href="{{site.baseurl}}/artwork/">Artwork</a>-->
<a class="block" href="{{site.baseurl}}/tickets/">Tickets</a>
<a class="block" href="{{site.baseurl}}/venue/">Venue</a>
<a class="block" href="{{site.baseurl}}/events/">Social Event</a>
</nav>
<nav class="col3 pad2x">
<!--<a class="block" href="{{site.baseurl}}/tickets/">Tickets</a>-->
<!--<a class="block" href="{{site.baseurl}}/venue/">Venue</a>-->
<!--<a class="block" href="{{site.baseurl}}/events/">Social Event</a>-->
<!--</nav>
<nav class="col3 pad2x">-->
<a class="block" href="https://twitter.com/sotm">Twitter&nbsp;<span class="icon twitter"></span></a>
<a class="block" href="https://www.youtube.com/channel/UCLqJsr_5PfdvDFbgv1qp2aQ">Youtube&nbsp;<span class="icon video"></span></a>
<a class="block" href="https://t.me/sotm2018">Telegram<span class="icon compass"></span></a>
<a class="block" href="https://github.com/openstreetmap/stateofthemap-2022">GitHub&nbsp;<span class="icon github"></span></a>
</nav>
<nav class="col3 pad2x">
<a class="block" href="https://github.com/openstreetmap/stateofthemap-2024">GitHub&nbsp;<span class="icon github"></span></a>
<a class="block" href="https://blog.openstreetmap.org/">OSM blog</a>
<a class="block" href="https://wiki.openstreetmap.org/wiki/State_of_the_Map_2022">Wiki page</a>
<a class="block" href="https://wiki.openstreetmap.org/wiki/State_of_the_Map_2024">Wiki page</a>
</nav>
<nav class="col3">
<img src="{{site.baseurl}}/img/logo/sotm_2022-logo.svg" class="logo" />
<img src="{{site.baseurl}}/img/logo/sotm_2024-secondary.svg" class="logo" />
</nav>
</div>
</div>
Expand Down
12 changes: 8 additions & 4 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,20 @@
<meta name="viewport" content="width=device-width">
<meta name="description" content="{{ site.description }}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">

<link rel="apple-touch-icon" sizes="180x180" href="{{ "/img/icons/apple-touch-icon.png" | prepend: site.baseurl }}">
<link rel="icon" type="image/png" sizes="32x32" href="{{ "/img/icons/favicon-32x32.png" | prepend: site.baseurl }}">
<link rel="icon" type="image/png" sizes="16x16" href="{{ "/img/icons/favicon-16x16.png" | prepend: site.baseurl }}">
<link rel="manifest" href="{{ "/img/icons/site.webmanifest" | prepend: site.baseurl }}">
<link rel="mask-icon" href="{{ "/img/icons/safari-pinned-tab.svg" | prepend: site.baseurl }}" color="#e23e36">
<link rel="mask-icon" href="{{ "/img/icons/safari-pinned-tab.svg" | prepend: site.baseurl }}" color="{{ color.primary-dark }}">
<link rel="shortcut icon" href="{{ "/img/icons/favicon.ico" | prepend: site.baseurl }}">
<meta name="msapplication-TileColor" content="#ffd97e">
<meta name="apple-mobile-web-app-title" content="{{ page.title }}">
<meta name="application-name" content="{{ page.title }}">
<meta name="msapplication-TileColor" content="{{ color.primary-dark }}">
<meta name="msapplication-config" content="{{ "/img/icons/browserconfig.xml" | prepend: site.baseurl }}">
<meta name="theme-color" content="#ffd97e">
<meta property="og:image" content="{{ "/img/logo/sotm_2022-logo.png" | prepend: site.baseurl }}">
<meta name="theme-color" content="{{ color.primary-dark }}">

<meta property="og:image" content="{{ "/img/logo/sotm_2024.svg" | prepend: site.baseurl }}">
<meta property="og:image:height" content="300">
<meta property="og:image:width" content="300">
{% if page.layout == "session" or page.layout == "session_academic" %}
Expand Down
35 changes: 4 additions & 31 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,15 @@
<header class="intro">
<div class="intro-body">
<div class="limiter">
<!--<div class="logo">
<img src="img/logo/sotm_2022.svg">
<div class="logo">
<img src="img/logo/sotm_2024.svg">
<a href="#about" class="btn btn-circle page-scroll page-scroll-silent">
<i class="icon big down animated"></i>
</a>
</div>-->

<div class="attending">
<img src="img/logo/sotm_2022.svg">
<h1>State of the Map 2022</h1>
<p>Thank you for attending!</p>
<!--<h1>Attending State of the Map 2022</h1>
<p>Attending in person in Florence? You can here find more information about the <a href="/venue">venue</a>, the <a href="/events">social event</a> and the <a href="/programme">programme</a>.</p>
<p>Attending remotely? Head over to the <a href="https://sotm2022.venueless.events/">online conference platform</a> if you bought the Venueless ticket.</p>
<p>Or watch the free live <a href="/stream">stream</a> here on the website.</p>
<h2>What's more?</h2>-->
<p>
<ul>
<li>🎓 Proceedings of Academic Track are <a href="https://zenodo.org/record/7004791">published on Zenodo</a>.</li>
<li>🖼️ Posters are published <a href="/posters/">on the website</a>.</li>
<li>🎥 Session videos are on <a href="https://media.ccc.de/c/sotm2022">media.ccc.de</a> as well as on our <a href="https://www.youtube.com/watch?v=t6PmaShD0f8&list=PLQNy8KsDknCo4Hpk5_trylRC8FD2ge9ns">youtube channel</a></li>
<li>Follow <a href="https://twitter.com/sotm">@SotM</a> on Twitter and use the hashtag <a href="https://twitter.com/hashtag/sotm2022">#sotm2022</a>.</li>
<li>Connect with others in our <a href="https://t.me/sotm2018">telegram group chat</a> and share your State of the Map experience.</li>
<li>Read Ilya's and Gregory's <a href="https://t.me/sotm2022_live/3">State of the Map 2022 Live</a> blog which they wrote during and around the confrence.</li>
</ul>
</p>
<p>Thanks to our <a href="/#sponsors">sponsors</a> for supporting SotM 2022!</p>
<h2>And next year?</h2>
<p style="text-align:left">
Your community can propose to host SotM 2023!
Submit your proposal by August 27, 2022 on the <a href="https://wiki.openstreetmap.org/wiki/State_of_the_Map_2023/Call_for_venues">OSM wiki</a>.
</p>
</div>
</div>
</div>
</div>
<div class="credits">
Logo: Feye Andal &mdash; Background: © Petar Milošević <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.en">CC BY-SA 4.0</a>
Logo: Paul H. Bushoki &mdash; <a href="https://commons.wikimedia.org/wiki/File:Three_giraffes_01.jpg">Background</a>: © Byrdyak <a href="https://creativecommons.org/licenses/by-sa/4.0/deed.en">CC BY-SA 4.0</a>
</div>
</header>
17 changes: 17 additions & 0 deletions _includes/map.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<div id="map" style="height:420px; width:100%"></div>
<script>
document.addEventListener('DOMContentLoaded', function() {
var map = L.map('map').setView([-1.27903, 36.81649], {{ include.zoom }});
L.control.scale().addTo(map);
L.tileLayer('{{ site.map_tiles.url}}', {
attribution: '{{ site.map_tiles.attribution }}',
maxZoom: {{ site.map_tiles.maxZoom}}
}).addTo(map);
map.scrollWheelZoom.disable();
L.marker([-1.27903550863266, 36.81655079126358], {icon: L.icon({
iconUrl: "{{ "/img/logo/sotm_2024-pin.svg" | prepend: site.baseurl }}",
iconSize: [60, 60],
iconAnchor: [30, 60]
})}).bindPopup("<h3>University of Nairobi Towers</h3><p>Conference Venue.<br><a href='https://osm.org/go/l9wM~Burm?m' target='_blank'>Open location on osm.org</a>.</p>").addTo(map);
}, false);
</script>
Loading

0 comments on commit 943a094

Please sign in to comment.