Skip to content

Commit

Permalink
HTML updates (#263)
Browse files Browse the repository at this point in the history 
This PR:

    Fixes most broken HTML
    Adds some semantic HTML (more to come if this is accepted)
    Makes phone numbers clickable
    Better support for mobile devices (front page still needs work)
    Corrects broken links
    Minor CSS improvements (more to come)
    Spelling corrections
    Alt text fixes
    Removes link to Twitter (hasn't been updated in years)

I've run nanoc and all the files compile and pass validation (nanoc likes putting stray /> at the end of some elements - but that doesn't break anything).

Visually, most pages stay the same. A few minor tweeks to allow pages to work on narrow screens.

Happy to make any changes.

Addresses #261

---------

Co-authored-by: Terence Eden <[email protected]>
  • Loading branch information
@edent
edent and Terence Eden authored Nov 17, 2024
1 parent 86effa2 commit 8ae6f94
Show file tree
Hide file tree
Showing 21 changed files with 244 additions and 261 deletions.
10 changes: 5 additions & 5 deletions content/about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
---
<div class="about-us">
<div class="image-block">
<a href="#"><%= img '/assets/style/logo-big/' %></a>
<img src="asset:style/logo-big" alt="">
</div>
<div class="text-block">
<h3>
Expand All @@ -20,7 +20,7 @@ <h3>

<div class="developers-block">
<div class="text-block">
<h2>What is FOSDEM?<a name="what">&nbsp;</a></h2>
<h2 id="what">What is FOSDEM?</h2>
<p>
FOSDEM is a free and non-commercial event organised by the community for
the community. The goal is to provide free and open source software developers
Expand Down Expand Up @@ -52,7 +52,7 @@ <h2>What is FOSDEM?<a name="what">&nbsp;</a></h2>
</p>
</div>
<div class="text-block">
<h2>Developer rooms</h2>
<h2 id="rooms">Developer rooms</h2>
<p>
The FOSDEM team feels it is very important for free and open source software
developers around the world to be able to meet in “real life”.
Expand All @@ -67,7 +67,7 @@ <h2>Developer rooms</h2>
</p>
</div>
<div class="text-block">
<h2>A bit of history</h2>
<h2 id="history">A bit of history</h2>
<p>
In 2000, Raphael Bauduin, a fan of the Linux movement in Belgium, decided
to organise a small meeting for developers of Open Source software. He
Expand Down Expand Up @@ -98,7 +98,7 @@ <h2>A bit of history</h2>
</p>
</div>
<div class="text-block">
<a name="team"></a><h2>The team</h2>
<h2 id="team">The team</h2>
<small>in alphabetical order</small>
<ul>
<li>Klaus Aigner</li>
Expand Down
9 changes: 4 additions & 5 deletions content/about/sponsors.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<%= l('/support/donate/', 'donations') %> page for more information.
</p>

<div id="s-quick-links"><br />
<div id="s-quick-links"><br>
<% cornerstone, other = sponsors.select{|s| s.include_in_toplevel?}.partition{|s| s.cornerstone?} %>

<% unless cornerstone.empty? %>
Expand All @@ -39,7 +39,7 @@
<% end %>
</div>

<hr />
<hr>

<% [
{ title: 'Cornerstone sponsor', plural: true, alpha: true, id: 'cornerstone', section: '', selector: lambda{|s| s.cornerstone?} },
Expand All @@ -49,13 +49,12 @@
%>
<% unless index == 0 %><hr /><% end %>
<% list = sponsors.select{|s| section[:section] == s.section }.select(&section[:selector]) %>
<a name="<%= section[:id] %>"></a><h2><%= section[:title] %><% if section[:plural] and list.size > 1 %>s<% end %></h2>
<h2 id="<%= section[:id] %>"><%= section[:title] %><% if section[:plural] and list.size > 1 %>s<% end %></h2>
<% if section[:alpha] and list.size > 1 %>
<span class="muted">(in alphabetical order)</span>
<% end %>
<% list.each_with_index do |s, i| %>
<a name="<%= s.id %>"></a>
<h2><a href="<%= s.url %>" title="<%= s.name %> website"><%= s.name %></a></h2>
<h2 id="<%= s.id %>"><a href="<%= s.url %>" title="<%= s.name %> website"><%= s.name %></a></h2>
<div class="s-unit<% if (i+1) == list.size %> s-unit-last<% end %>">
<% if s.logo? %>
<% if s.url? %><a href="<%= s.url %>" title="<%= s.name %> website"><% end %>
Expand Down
11 changes: 8 additions & 3 deletions content/assets/style/parts/010_design.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ body{
font:14px/16px "DejaVu Sans", Arial, Helvetica, sans-serif;
background:#fff;
}
h1, h2, h3, #footer, #header, .visual,

h1 {
text-transform: capitalize;
text-align: center;
}

h1, h2, h3, footer, #header, .visual,
#main .s-block .text-block p,
.news-list .date .frame,
thead h4,
Expand Down Expand Up @@ -202,7 +208,6 @@ fieldset{
background: #1e1e1e;
}
.info-box span{
color:#3b3b3b;
padding:0 9px 0 8px;
text-shadow:0 1px 0 #646464;
}
Expand Down Expand Up @@ -598,7 +603,7 @@ a.btn-purple:hover {
line-height:30px;
}
.developers-block .text-block p{margin:0 0 17px;}
#footer{
footer{
background:#efefef;
color:#5f5f5f;
}
Expand Down
7 changes: 1 addition & 6 deletions content/assets/style/parts/020_local.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,17 +402,12 @@ ul.side-box {
#all-news li.news-item {
border-bottom: 1px solid #ddd;
margin-bottom: 2em;
list-style-type: none;
}
#all-news .date {
font-family: Lato, "DejaVu Sans", Arial, Helvetica, sans-serif;
font-size: 125%;
font-weight: bold;
padding: 0;
margin-top: 0.3em;
width: 6.5em;
text-align: left;
margin-left: -6.5em;
float: left;
line-height: 1.6;
}
#all-news .date-separator {
Expand Down
6 changes: 3 additions & 3 deletions content/contact.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ <h3>Get in touch</h3>

<p>
During the event, the Infodesk is reachable by phone using the number
<span class="tel">+32 2 7887474</span> (for <u><b>urgent</b></u> matters only, please).
<a class="tel" hef="tel:+3227887474">+32 2 788 74 74</a> (for <u><strong>urgent</strong></u> matters only, please).
</p>

<p>
For press inquiries <u><b>only</b></u>, please contact Mark Van den Borre,
<span class="tel">+32 486 961726</span>,
<a class="tel" href="tel:+32486961726">+32 486 96 17 26</a>,
<a href="mailto:[email protected]">[email protected]</a> (NL, EN).
</p>


<h3>Sponsor</h3>

<p>
For sponsorship inquiries <u><b>only</b></u>, please contact
For sponsorship inquiries <u><strong>only</strung></u>, please contact
<a href="mailto:[email protected]">[email protected]</a>.
</p>

Expand Down
41 changes: 18 additions & 23 deletions content/faq.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
---
<div class="developers-block">
<div class="text-block">
<h4>Contents</h4>
<h2>Contents</h2>
<ul>
<li><a href=#cfp">CFP</a></li>
<li><a href="#cfp">CFP</a></li>
<li><a href="#video">Visiting and videos</a></li>
<li><a href="#video-recordings">Recordings</li>
<li><a href="#registration">Registration</a></li>
Expand All @@ -16,19 +16,17 @@ <h4>Contents</h4>
</div>
<div class="developers-block">
<div class="text-block">
<a name="cfp"></a>
<h4>CFP</h4>
<h5><span class="label label-info">Q:</span> When will the CFP open?</h5>
<h3 id="cfp">CFP</h3>
<h4><span class="label label-info">Q:</span> When will the CFP open?</h4>
<p>
The CFP has closed. Please keep an eye on our <a href="page:news">news</a> page or subscribe to our <a href="https://fosdem.org/rss.xml">rss feed</a>.
The CFP has closed. Please keep an eye on our <a href="page:news">news</a> page or subscribe to our <a href="https://fosdem.org/rss.xml">RSS feed</a>.
</p>
<a name="video"></a>
<h4>Visiting and videos</h4>
<h5><span class="label label-info">Q:</span> In what timezone are you?</h5>
<h3 id="video">Visiting and videos</h3>
<h4><span class="label label-info">Q:</span> In what timezone are you?</h4>
<p>
The conference is in Brussels time, which is CET (UTC + 1).
</p>
<h5><span class="label label-info">Q:</span> I need a formal invitation for a VISA request</h5>
<h4><span class="label label-info">Q:</span> I need a formal invitation for a VISA request</h4>
<p>
For legal reasons, the FOSDEM organization can only issue such letters of invitation to “main track” speakers for whom we also make
travel and hotel arrangements.
Expand All @@ -40,13 +38,12 @@ <h5><span class="label label-info">Q:</span> I need a formal invitation for a VI

<p>For information regarding Belgian visa requirements, we refer you to <a href="https://diplomatie.belgium.be/en/travel-belgium/visa-belgium">the website of the Belgian ministry of foreign affairs</a>.
</p>
<h5><span class="label label-info">Q:</span> Where can I watch the talks?</h5>
<h4><span class="label label-info">Q:</span> Where can I watch the talks?</h4>
<p>
All talks can be watched from our website. Go to <a href="page:schedule">schedule</a>, find the topic you are interested in, click on the
<i>Watch the live stream</i>-link and enjoy the presentation.
</p>
<a name="video-recordings"></a>
<h5><span class="label label-info">Q:</span> Are talk recordings available?</h5>
<h4 id="video-recordings"><span class="label label-info">Q:</span> Are talk recordings available?</h4>
<p>
All talk recordings will be made available on
<a href="https://video.fosdem.org/2025/">video.fosdem.org/2025</a> as soon as the presenter reviewed the contents to
Expand All @@ -56,26 +53,24 @@ <h5><span class="label label-info">Q:</span> Are talk recordings available?</h5>
This will usually take a few days to a few weeks, check <a href="https://video.fosdem.org/2025">video.fosdem.org/2025</a>
for updates!
</p>
<h5><span class="label label-info">Q:</span> Is there a job corner?</h5>
<h4><span class="label label-info">Q:</span> Is there a job corner?</h4>
<p>
Yes! Visit the H building to see the job corner.
</p>
<a name="registration"></a>
<h4>Registration</h4>
<h5><span class="label label-info">Q:</span> I plan on visiting FOSDEM, where can I register?</h5>
<h3 id="registration">Registration</h3>
<h4><span class="label label-info">Q:</span> I plan on visiting FOSDEM, where can I register?</h4>
<p>No registration is required.</p>

<h5><span class="label label-info">Q:</span> How much does a entry ticket for FOSDEM cost?</h5>
<h4><span class="label label-info">Q:</span> How much does a entry ticket for FOSDEM cost?</h4>
<p>Attendance is free, including access to all talks and facilities.</p>

<h5><span class="label label-info">Q:</span> If entrance to FOSDEM is free, who pays the expenses?</h5>
<h4><span class="label label-info">Q:</span> If entrance to FOSDEM is free, who pays the expenses?</h4>
<p>We have two sources of income: <a href="page:/support/donate/">donations</a> from our visitors and <a href="page:/about/sponsors/">sponsorship</a>.</p>

<h5><span class="label label-info">Q:</span> My company loves FOSDEM, what are the sponsoring possibilities?</h5>
<h4><span class="label label-info">Q:</span> My company loves FOSDEM, what are the sponsoring possibilities?</h4>
<p>Have a look at the <a href="page:/about/sponsors/">sponsor</a> page.</p>
<a name="fosdem"></a>
<h4>FOSDEM in general</h4>
<h5><span class="label label-info">Q:</span> There is a mistake on the website, where do I report it?</h5>
<h3 id="fosdem">FOSDEM in general</h3>
<h4><span class="label label-info">Q:</span> There is a mistake on the website, where do I report it?</h4>
<p>
You can talk to us at the Infodesk (K or H), in the <a href="https://matrix.to/#/#infodesk:fosdem.org?web-instance[element.io]=chat.fosdem.org">Infodesk</a> channel on <i>chat.fosdem.org</i> or open an issue on our
<a href="https://github.com/FOSDEM/website">Github repository</a>. Pull requests welcome!
Expand Down
4 changes: 2 additions & 2 deletions content/fringe.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<tr>
<td><a href="<%= meta[:website] %>"><%= event_name.to_s %></a></td>
<td><%= meta[:location] %></td>
<td><%= meta[:start] %></td>
<td><%= meta[:end] %></td>
<td><time><%= meta[:start] %></time></td>
<td><time><%= meta[:end] %></time></td>
<td><%= meta[:cost] %></td>
<td><%= meta[:registration] %></td>
<td><a href="mailto:<%= meta[:contact] %>"><%= meta[:contact] %></a></td>
Expand Down
22 changes: 10 additions & 12 deletions content/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="s-block">

<div class="text-block">
<center><h1>WELCOME TO FOSDEM 2025</h1></center>
<h1>Welcome to FOSDEM 2025</h1>
<p>FOSDEM is a free event for software developers to meet, share ideas and collaborate. Every year, thousands of developers of free and open source software from all over the world gather at the event in Brussels. You don't need to register. Just turn up and join in!</p>
</div>

Expand All @@ -23,13 +23,13 @@
# "s-block" div. pph 20141210
%>
<div class="news-block">
<h2>NEWS</h2>
<h2>News</h2>
<ul class="news-list">
<% newsitems = @items.select {|item| item.identifier =~ %r{/headlines/}}.sort_by {|item| item[:created_at]}.reverse; newsitems[0,maxnews].each do |hl| %>
<li class="news">
<div class="date">
<div class="holder">
<div class="frame"><%= hl[:created_at].strftime '%Y-%m-%d' %></div>
<time class="frame"><%= hl[:created_at].strftime '%Y-%m-%d' %></time>
</div>
</div>
<h3><a href="page:<%= hl[:fullpost] %>"><%= hl[:title] %></a></h3>
Expand Down Expand Up @@ -69,24 +69,22 @@ <h2><a href="page:/about/sponsors/">SPONSORS</a></h2>
</div>

<div class="location-block">
<h2>LOCATION</h2>
<h2>Location</h2>
<p>FOSDEM takes place at the ULB Solbosch Campus, <strong>Brussels, Belgium</strong>, Europe, Earth. If you aren't there, you may watch the <a href="https://live.fosdem.org/">live streams</a> from the main tracks and developer rooms. Note that talks in rooms beginning with D are pre-recorded and only accessible online.</p>
<div class="location-info">
<div class="map">
<img style="float: right; text-align: right" src="asset:campusmap" alt="ULB Solbosch Campus map: Location of FOSDEM" title="ULB Solbosch Campus map: Location of FOSDEM"/>
</div>
<div class="location-text">
<img class="map" src="asset:campusmap" alt="ULB Solbosch Campus map: Location of FOSDEM" title="ULB Solbosch Campus map: Location of FOSDEM">
<address class="location-text">
<a class="logo-ulb-big" href="#">Université libre de bruxelles</a>
<ul class="location-list">
<li>ULB</li>
<li>ULB</li>
<li>Campus du Solbosch</li>
<li>Av. F. D. Roosevelt 50</li>
<li>1050 Bruxelles</li>
<li>Belgium</li>
</ul>
<div class="btn-location">
<a class="btn-purple" href="<%= pathof '/practical/transportation/' %>">venue &amp; travel</a>
</div>
</address>
<div class="btn-location">
<a class="btn-purple" href="<%= pathof '/practical/transportation/' %>">venue &amp; travel</a>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion content/practical/conduct.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h3>Contact details</h3>

<ul>
<li>E-mail: <a href="mailto:[email protected]">[email protected]</a>
<li>Phone (during the event only): +32 2 788 74 73
<li>Phone (during the event only): <a href="tel:+3227887473">+32 2 788 74 73</a>
<li>Or ask any staff member during the event to help you locate a team member.
</ul>

8 changes: 4 additions & 4 deletions content/practical/covid.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
<li>Make it easy to follow government COVID-19 recommendations</li>
</ul>

<p>In practice, this tranlates to:</p>
<p>In practice, this translates to:</p>
<ul>
<li>No mandatory COVID-19 measures at FOSDEM 2025</li>
<li>Open/full rooms api</li>
<li>Open/full rooms API</li>
<li>No official FOSDEM beer event</li>
<li>Encouraging ventilation of developer rooms</li>
</ul>

<p>Relevant Belgian federal and Brussels regional government policy can be consulted at the links below:</p>
<ul>
<li><a href='https://www.info-coronavirus.be/en/faq/'>https://www.info-coronavirus.be/en/faq/</a></li>
<li><a href='https://coronavirus.brussels/en/'>https://coronavirus.brussels/en/</a></li>
<li><a href='https://www.health.belgium.be/en/covid-19'>https://www.health.belgium.be/en/covid-19</a></li>
<li><a href='https://www.vivalis.brussels/fr/covid-19'>https://www.vivalis.brussels/fr/covid-19</a></li>
</ul>
Loading

0 comments on commit 8ae6f94

Please sign in to comment.